Reland "WebRtcVoiceMediaChannel::AddRecvStream: Don't call SetRecPayloadType"

webrtc/voice_engine/channel_proxy.cc

Index: webrtc/voice_engine/channel_proxy.cc
diff --git a/webrtc/voice_engine/channel_proxy.cc b/webrtc/voice_engine/channel_proxy.cc
index 45cbf10819b29829684d148cc3cd062359d2c380..21c9e388ed6d7cbc0b8088505502d012da42c3f1 100644
--- a/webrtc/voice_engine/channel_proxy.cc
+++ b/webrtc/voice_engine/channel_proxy.cc
@@ -173,6 +173,12 @@ void ChannelProxy::SetRecPayloadType(int payload_type,
   RTC_DCHECK_EQ(0, result);
 }
 
+void ChannelProxy::SetReceiveCodecs(
+    const std::map<int, SdpAudioFormat>& codecs) {
+  RTC_DCHECK(worker_thread_checker_.CalledOnValidThread());
+  channel()->SetReceiveCodecs(codecs);
+}
+
 void ChannelProxy::SetSink(std::unique_ptr<AudioSinkInterface> sink) {
   RTC_DCHECK(worker_thread_checker_.CalledOnValidThread());
   channel()->SetSink(std::move(sink));
@@ -379,6 +385,11 @@ void ChannelProxy::OnRecoverableUplinkPacketLossRate(
   channel()->OnRecoverableUplinkPacketLossRate(recoverable_packet_loss_rate);
 }
 
+void ChannelProxy::RegisterLegacyReceiveCodecs() {
+  RTC_DCHECK(worker_thread_checker_.CalledOnValidThread());
+  channel()->RegisterLegacyReceiveCodecs();
+}
+
 Channel* ChannelProxy::channel() const {
   RTC_DCHECK(channel_owner_.channel());
   return channel_owner_.channel();