WebRtcVoiceMediaChannel::AddRecvStream: Don't call SetRecPayloadType

webrtc/voice_engine/channel.cc

Index: webrtc/voice_engine/channel.cc
diff --git a/webrtc/voice_engine/channel.cc b/webrtc/voice_engine/channel.cc
index d2b30ca8f7d41c07b7ea406e6f26a84d59699ca5..3b562f91561c83927ff973b13e51622ea10a1166 100644
--- a/webrtc/voice_engine/channel.cc
+++ b/webrtc/voice_engine/channel.cc
@@ -987,9 +987,10 @@ int32_t Channel::Init() {
     return -1;
   }
 
-  // --- Register all supported codecs to the receiving side of the
-  // RTP/RTCP module
+  return 0;
+}
 
+void Channel::RegisterLegacyCodecs() {
   CodecInst codec;
   const uint8_t nSupportedCodecs = AudioCodingModule::NumberOfCodecs();
 
@@ -1041,8 +1042,6 @@ int32_t Channel::Init() {
       }
     }
   }
-
-  return 0;
 }
 
 void Channel::Terminate() {
@@ -1360,6 +1359,11 @@ int32_t Channel::GetVADStatus(bool& enabledVAD,
   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) {
   return SetRecPayloadType(codec.pltype, CodecInstToSdp(codec));
 }