Pass SdpAudioFormat through Channel, without converting to CodecInst

webrtc/audio/audio_receive_stream.cc

 /*
  *  Copyright (c) 2015 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 83 matching lines @@
   // use. However, since it needs to be included when constructing Channel, we
   // cannot do that until we're able to move Channel ownership into the
   // Audio{Send,Receive}Streams.  The best we can do is check that we're not
   // trying to use two different factories using the different interfaces.
   RTC_CHECK(config.decoder_factory);
   RTC_CHECK_EQ(config.decoder_factory,
                channel_proxy_->GetAudioDecoderFactory());
 
   channel_proxy_->RegisterExternalTransport(config.rtcp_send_transport);
 
+  for (const auto& dec : config.decoder_map) {

[the sun, 2016/12/14 08:58:21]

nit: dec -> kv
dec makes it read like it's a decoder

[kwiberg-webrtc, 2016/12/14 13:09:36]

Done.

+    channel_proxy_->SetRecPayloadType(dec.first, dec.second);
+  }
+
   for (const auto& extension : config.rtp.extensions) {
     if (extension.uri == RtpExtension::kAudioLevelUri) {
       channel_proxy_->SetReceiveAudioLevelIndicationStatus(true, extension.id);
       bool registered = rtp_header_parser_->RegisterRtpHeaderExtension(
           kRtpExtensionAudioLevel, extension.id);
       RTC_DCHECK(registered);
     } else if (extension.uri == RtpExtension::kTransportSequenceNumberUri) {
       channel_proxy_->EnableReceiveTransportSequenceNumber(extension.id);
       bool registered = rtp_header_parser_->RegisterRtpHeaderExtension(
           kRtpExtensionTransportSequenceNumber, extension.id);
@@ skipping 198 matching lines @@
   ScopedVoEInterface<VoEBase> base(voice_engine());
   if (playout) {
     return base->StartPlayout(config_.voe_channel_id);
   } else {
     return base->StopPlayout(config_.voe_channel_id);
   }
 }
 
 }  // namespace internal
 }  // namespace webrtc