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 1075 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::map<int, bool, std::greater<int>> generate_cn = {{ 8000,  false },
                                                         { 16000, false },
                                                         { 32000, false }};
 
   auto map_format = [&mapper, &out] (const webrtc::SdpAudioFormat& format) {
     rtc::Optional<AudioCodec> opt_codec = mapper.ToAudioCodec(format);
     if (!opt_codec) {
       LOG(LS_ERROR) << "Unable to assign payload type to format: " << format;
       return false;
     }
 
     auto& codec = *opt_codec;
     if (IsCodec(codec, kOpusCodecName)) {
       // TODO(ossu): Set this specifically for Opus for now, until we have a
       // better way of dealing with rtcp-fb parameters.
       codec.AddFeedbackParam(
           FeedbackParam(kRtcpFbParamTransportCc, kParamValueEmpty));
     }
     out.push_back(codec);
     return true;
   };
 
-  for (const auto& format : formats) {
-    if (map_format(format)) {
-      // 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 = generate_cn.find(format.clockrate_hz);
-      if (cn != generate_cn.end() /* && format.allow_comfort_noise */) {
+  for (const auto& spec : specs) {
+    if (map_format(spec.format) && spec.allow_comfort_noise) {
+      // Generate a CN entry if the decoder allows it and we support the
+      // clockrate.
+      auto cn = generate_cn.find(spec.format.clockrate_hz);
+      if (cn != generate_cn.end()) {
         cn->second = true;
       }
     }
   }
 
   // Add CN codecs after "proper" audio codecs
   for (const auto& cn : generate_cn) {
     if (cn.second) {
       map_format({kCnCodecName, cn.first, 1});
     }
@@ skipping 1540 matching lines @@
     }
   } else {
     LOG(LS_INFO) << "Stopping playout for channel #" << channel;
     engine()->voe()->base()->StopPlayout(channel);
   }
   return true;
 }
 }  // namespace cricket
 
 #endif  // HAVE_WEBRTC_VOICE