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

webrtc/modules/audio_coding/acm2/rent_a_codec.h

 /*
  *  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.
  */
 
 #ifndef WEBRTC_MODULES_AUDIO_CODING_ACM2_RENT_A_CODEC_H_
 #define WEBRTC_MODULES_AUDIO_CODING_ACM2_RENT_A_CODEC_H_
 
 #include <stddef.h>
 #include <map>
 #include <memory>
 
 #include "webrtc/api/audio_codecs/audio_decoder.h"
-#include "webrtc/api/audio_codecs/audio_format.h"
 #include "webrtc/base/array_view.h"
 #include "webrtc/base/constructormagic.h"
 #include "webrtc/base/optional.h"
 #include "webrtc/base/scoped_ref_ptr.h"
 #include "webrtc/modules/audio_coding/codecs/audio_encoder.h"
 #include "webrtc/modules/audio_coding/include/audio_coding_module_typedefs.h"
+#include "webrtc/modules/audio_coding/neteq/neteq_decoder_enum.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
 
 struct CodecInst;
 class LockedIsacBandwidthInfo;
 
 namespace acm2 {
 
 class RentACodec {
@@ skipping 66 matching lines @@
 #ifndef WEBRTC_CODEC_RED
     kRED = -1,
 #endif
 #ifndef ENABLE_48000_HZ
     kCNFB = -1,
 #endif
 
     kNone = -1
   };
 
-  enum class NetEqDecoder {
-    kDecoderPCMu,
-    kDecoderPCMa,
-    kDecoderPCMu_2ch,
-    kDecoderPCMa_2ch,
-    kDecoderILBC,
-    kDecoderISAC,
-    kDecoderISACswb,
-    kDecoderPCM16B,
-    kDecoderPCM16Bwb,
-    kDecoderPCM16Bswb32kHz,
-    kDecoderPCM16Bswb48kHz,
-    kDecoderPCM16B_2ch,
-    kDecoderPCM16Bwb_2ch,
-    kDecoderPCM16Bswb32kHz_2ch,
-    kDecoderPCM16Bswb48kHz_2ch,
-    kDecoderPCM16B_5ch,
-    kDecoderG722,
-    kDecoderG722_2ch,
-    kDecoderRED,
-    kDecoderAVT,
-    kDecoderAVT16kHz,
-    kDecoderAVT32kHz,
-    kDecoderAVT48kHz,
-    kDecoderCNGnb,
-    kDecoderCNGwb,
-    kDecoderCNGswb32kHz,
-    kDecoderCNGswb48kHz,
-    kDecoderArbitrary,
-    kDecoderOpus,
-    kDecoderOpus_2ch,
-  };
-
-  static rtc::Optional<SdpAudioFormat> NetEqDecoderToSdpAudioFormat(
-      NetEqDecoder nd);
-
   static inline size_t NumberOfCodecs() {
     return static_cast<size_t>(CodecId::kNumCodecs);
   }
 
   static inline rtc::Optional<int> CodecIndexFromId(CodecId codec_id) {
     const int i = static_cast<int>(codec_id);
     return i >= 0 && i < static_cast<int>(NumberOfCodecs())
                ? rtc::Optional<int>(i)
                : rtc::Optional<int>();
   }
@@ skipping 76 matching lines @@
   std::unique_ptr<AudioEncoder> red_encoder_;
   rtc::scoped_refptr<LockedIsacBandwidthInfo> isac_bandwidth_info_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(RentACodec);
 };
 
 }  // namespace acm2
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_AUDIO_CODING_ACM2_RENT_A_CODEC_H_