Updated AudioDecoderFactory to list AudioCodecSpecs instead of SdpAudioFormats.

webrtc/media/engine/webrtcvoiceengine.cc

 /*
  *  Copyright (c) 2004 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 1065 matching lines @@
 
 webrtc::AudioDeviceModule* WebRtcVoiceEngine::adm() {
   RTC_DCHECK(worker_thread_checker_.CalledOnValidThread());
   RTC_DCHECK(adm_);
   return adm_;
 }
 
 AudioCodecs WebRtcVoiceEngine::CollectRecvCodecs() const {
   PayloadTypeMapper mapper;
   AudioCodecs out;
-  const std::vector<webrtc::SdpAudioFormat>& formats =
-      decoder_factory_->GetSupportedFormats();
+  const std::vector<webrtc::AudioCodecSpec>& specs =
+      decoder_factory_->GetSupportedDecoders();
 
   // Only generate CN payload types for these clockrates
   std::vector<int> cn_clockrates = { 8000, 16000, 32000 };
 
   auto map_format = [&mapper, &out] (const webrtc::SdpAudioFormat& format) {
     rtc::Optional<AudioCodec> opt_codec = mapper.ToAudioCodec(format);
     if (opt_codec) {
       out.push_back(*opt_codec);
     } else {
       LOG(LS_ERROR) << "Unable to assign payload type to format: " << format;
     }
   };
 
-  for (const auto& format : formats) {
-    rtc::Optional<AudioCodec> opt_codec = mapper.ToAudioCodec(format);
+  for (const auto& spec : specs) {
+    rtc::Optional<AudioCodec> opt_codec = mapper.ToAudioCodec(spec.format);
     if (opt_codec) {
       auto& codec = *opt_codec;
 
       if (IsCodec(codec, kOpusCodecName)) {
-        // TODO(ossu): Should we set this specifically for just this codec?
-        // If not, this can be replaced with a call to map_format.
+        // TODO(ossu): Investigate if this can be replaced by a wildcard rtcp-fb
+        // param.
         codec.AddFeedbackParam(
             FeedbackParam(kRtcpFbParamTransportCc, kParamValueEmpty));
       }
       out.push_back(codec);
 
-      // TODO(ossu): We should get more than just a format from the factory, so
-      // we can determine if a format should be used with CN or not. For now,
-      // generate a CN entry for each supported clock rate also used by a format
-      // supported by the factory.
-      auto cn = std::find(cn_clockrates.begin(), cn_clockrates.end(),
-                          format.clockrate_hz);
-      if (cn != cn_clockrates.end() /* && format.allow_comfort_noise */) {
-        map_format({kCnCodecName, format.clockrate_hz, 1});
-        *cn = cn_clockrates.back();
-        cn_clockrates.pop_back();
+      if (spec.allow_comfort_noise) {
+        auto cn = std::find(cn_clockrates.begin(), cn_clockrates.end(),
+                            spec.format.clockrate_hz);
+        if (cn != cn_clockrates.end()) {
+          map_format({kCnCodecName, spec.format.clockrate_hz, 1});
+          *cn = cn_clockrates.back();
+          cn_clockrates.pop_back();
+        }
       }
     } else {
-      LOG(LS_ERROR) << "Unable to assign payload type to format: " << format;
+      LOG(LS_ERROR) << "Unable to assign payload type to format: "
+                    << spec.format;
     }
   }
 
   // Add telephone-event codec
   map_format({kDtmfCodecName, 8000, 1});
 
   return out;
 }
 
 class WebRtcVoiceMediaChannel::WebRtcAudioSendStream
@@ skipping 1531 matching lines @@
     }
   } else {
     LOG(LS_INFO) << "Stopping playout for channel #" << channel;
     engine()->voe()->base()->StopPlayout(channel);
   }
   return true;
 }
 }  // namespace cricket
 
 #endif  // HAVE_WEBRTC_VOICE