WebRtcVoiceMediaChannel::AddRecvStream: Don't call SetRecPayloadType

webrtc/voice_engine/channel.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 1305 matching lines @@
 int32_t Channel::GetVADStatus(bool& enabledVAD,
                               ACMVADMode& mode,
                               bool& disabledDTX) {
   const auto* params = codec_manager_.GetStackParams();
   enabledVAD = params->use_cng;
   mode = params->vad_mode;
   disabledDTX = !params->use_cng;
   return 0;
 }
 
+bool Channel::SetReceiveCodecs(const std::map<int, SdpAudioFormat>& codecs) {
+  if (!rtp_payload_registry_->SetAudioReceivePayloads(codecs)) {

[the sun, 2017/03/14 20:07:01]

If you remove the return value from the above call, we don't need it in
Channel::SetReceiveCodecs(), or the ChannelProxy either.

[kwiberg-webrtc, 2017/03/16 10:24:12]

Acknowledged. I'll remove as many of them as I can.

+    return false;
+  }
+  audio_coding_->SetReceiveCodecs(codecs);
+  return true;
+}
+
 int32_t Channel::SetRecPayloadType(const CodecInst& codec) {
   return SetRecPayloadType(codec.pltype, CodecInstToSdp(codec));
 }
 
 int32_t Channel::SetRecPayloadType(int payload_type,
                                    const SdpAudioFormat& format) {
   WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId, _channelId),
                "Channel::SetRecPayloadType()");
 
   if (channel_state_.Get().playing) {
@@ skipping 1656 matching lines @@
   int64_t min_rtt = 0;
   if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt) !=
       0) {
     return 0;
   }
   return rtt;
 }
 
 }  // namespace voe
 }  // namespace webrtc