| Index: webrtc/voice_engine/channel.cc
|
| diff --git a/webrtc/voice_engine/channel.cc b/webrtc/voice_engine/channel.cc
|
| index 3b562f91561c83927ff973b13e51622ea10a1166..d2b30ca8f7d41c07b7ea406e6f26a84d59699ca5 100644
|
| --- a/webrtc/voice_engine/channel.cc
|
| +++ b/webrtc/voice_engine/channel.cc
|
| @@ -987,10 +987,9 @@
|
| return -1;
|
| }
|
|
|
| - return 0;
|
| -}
|
| -
|
| -void Channel::RegisterLegacyCodecs() {
|
| + // --- Register all supported codecs to the receiving side of the
|
| + // RTP/RTCP module
|
| +
|
| CodecInst codec;
|
| const uint8_t nSupportedCodecs = AudioCodingModule::NumberOfCodecs();
|
|
|
| @@ -1042,6 +1041,8 @@
|
| }
|
| }
|
| }
|
| +
|
| + return 0;
|
| }
|
|
|
| void Channel::Terminate() {
|
| @@ -1357,11 +1358,6 @@
|
| mode = params->vad_mode;
|
| disabledDTX = !params->use_cng;
|
| return 0;
|
| -}
|
| -
|
| -void Channel::SetReceiveCodecs(const std::map<int, SdpAudioFormat>& codecs) {
|
| - rtp_payload_registry_->SetAudioReceivePayloads(codecs);
|
| - audio_coding_->SetReceiveCodecs(codecs);
|
| }
|
|
|
| int32_t Channel::SetRecPayloadType(const CodecInst& codec) {
|
|
|