Chromium Code Reviews| Index: voice_engine/channel.h |
| diff --git a/voice_engine/channel.h b/voice_engine/channel.h |
| index 48aeafe17c080e289188330e5c520ac2e3d339e1..f4e47eeb83e21bd7e6545f2fdaada35ad56a0656 100644 |
| --- a/voice_engine/channel.h |
| +++ b/voice_engine/channel.h |
| @@ -16,6 +16,7 @@ |
| #include "api/audio/audio_mixer.h" |
| #include "api/audio_codecs/audio_encoder.h" |
| #include "api/call/audio_sink.h" |
| +#include "api/call/transport.h" |
| #include "api/optional.h" |
| #include "common_audio/resampler/include/push_resampler.h" |
| #include "common_types.h" // NOLINT(build/include) |
| @@ -33,7 +34,6 @@ |
| #include "rtc_base/thread_checker.h" |
| #include "voice_engine/audio_level.h" |
| #include "voice_engine/include/voe_base.h" |
| -#include "voice_engine/include/voe_network.h" |
| #include "voice_engine/shared_data.h" |
| #include "voice_engine/voice_engine_defines.h" |
| @@ -204,12 +204,9 @@ class Channel |
| void SetReceiverFrameLengthRange(int min_frame_length_ms, |
| int max_frame_length_ms); |
| - // VoENetwork |
| + // Network |
| int32_t RegisterExternalTransport(Transport* transport); |
| int32_t DeRegisterExternalTransport(); |
| - int32_t ReceivedRTPPacket(const uint8_t* received_packet, |
| - size_t length, |
| - const PacketTime& packet_time); |
| // TODO(nisse, solenberg): Delete when VoENetwork is deleted. |
|
kwiberg-webrtc
2017/09/21 10:33:13
Delete the stuff, or change the text of the TODO?
the sun
2017/09/21 10:35:47
It seems to require a little more work than just d
|
| int32_t ReceivedRTCPPacket(const uint8_t* data, size_t length); |
| void OnRtpPacket(const RtpPacketReceived& packet); |
| @@ -362,9 +359,6 @@ class Channel |
| int GetRemoteSSRC(unsigned int& ssrc); |
| void OnUplinkPacketLossRate(float packet_loss_rate); |
| bool InputMute() const; |
| - bool OnRtpPacketWithHeader(const uint8_t* received_packet, |
| - size_t length, |
| - RTPHeader *header); |
| bool OnRecoveredPacket(const uint8_t* packet, size_t packet_length); |
| bool ReceivePacket(const uint8_t* packet, |