Fix cyclic deps: rent_a_codec<->audio_coding and rent_a_codec<->neteq

webrtc/modules/audio_coding/neteq/decoder_database.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 24 matching lines @@
       external_decoder_(nullptr),
       cng_decoder_(CngDecoder::Create(audio_format)),
       subtype_(SubtypeFromFormat(audio_format)) {}
 
 DecoderDatabase::DecoderInfo::DecoderInfo(const SdpAudioFormat& audio_format,
                                           AudioDecoderFactory* factory)
     : DecoderInfo(audio_format, factory, audio_format.name) {}
 
 DecoderDatabase::DecoderInfo::DecoderInfo(NetEqDecoder ct,
                                           AudioDecoderFactory* factory)
-    : DecoderInfo(*acm2::RentACodec::NetEqDecoderToSdpAudioFormat(ct),
-                  factory) {}
+    : DecoderInfo(*NetEqDecoderToSdpAudioFormat(ct), factory) {}
 
 DecoderDatabase::DecoderInfo::DecoderInfo(const SdpAudioFormat& audio_format,
                                           AudioDecoder* ext_dec,
                                           const std::string& codec_name)
     : name_(codec_name),
       audio_format_(audio_format),
       factory_(nullptr),
       external_decoder_(ext_dec),
       subtype_(Subtype::kNormal) {
   RTC_CHECK(ext_dec);
@@ skipping 71 matching lines @@
                                      NetEqDecoder codec_type,
                                      const std::string& name) {
   if (rtp_payload_type > 0x7F) {
     return kInvalidRtpPayloadType;
   }
   // kCodecArbitrary is only supported through InsertExternal.
   if (codec_type == NetEqDecoder::kDecoderArbitrary ||
       !CodecSupported(codec_type)) {
     return kCodecNotSupported;
   }
-  const auto opt_format =
-      acm2::RentACodec::NetEqDecoderToSdpAudioFormat(codec_type);
+  const auto opt_format = NetEqDecoderToSdpAudioFormat(codec_type);
   if (!opt_format) {
     return kCodecNotSupported;
   }
   DecoderInfo info(*opt_format, decoder_factory_, name);
   auto ret =
       decoders_.insert(std::make_pair(rtp_payload_type, std::move(info)));
   if (ret.second == false) {
     // Database already contains a decoder with type |rtp_payload_type|.
     return kDecoderExists;
   }
@@ skipping 18 matching lines @@
                                     NetEqDecoder codec_type,
                                     const std::string& codec_name,
                                     AudioDecoder* decoder) {
   if (rtp_payload_type > 0x7F) {
     return kInvalidRtpPayloadType;
   }
   if (!decoder) {
     return kInvalidPointer;
   }
 
-  const auto opt_db_format =
-      acm2::RentACodec::NetEqDecoderToSdpAudioFormat(codec_type);
+  const auto opt_db_format = NetEqDecoderToSdpAudioFormat(codec_type);
   const SdpAudioFormat format = opt_db_format.value_or({"arbitrary", 0, 0});
 
   std::pair<DecoderMap::iterator, bool> ret;
   DecoderInfo info(format, decoder, codec_name);
   ret = decoders_.insert(std::make_pair(rtp_payload_type, std::move(info)));
   if (ret.second == false) {
     // Database already contains a decoder with type |rtp_payload_type|.
     return kDecoderExists;
   }
   return kOK;
@@ skipping 127 matching lines @@
       // Payload type is not found.
       LOG(LS_WARNING) << "CheckPayloadTypes: unknown RTP payload type "
                       << static_cast<int>(it->payload_type);
       return kDecoderNotFound;
     }
   }
   return kOK;
 }
 
 }  // namespace webrtc