Switch to using new ACM methods for encoder management

webrtc/modules/utility/source/coder.h

 /*
  *  Copyright (c) 2011 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_UTILITY_SOURCE_CODER_H_
 #define WEBRTC_MODULES_UTILITY_SOURCE_CODER_H_
 
 #include <memory>
 
 #include "webrtc/common_types.h"
+#include "webrtc/modules/audio_coding/acm2/codec_manager.h"
+#include "webrtc/modules/audio_coding/acm2/rent_a_codec.h"
 #include "webrtc/modules/audio_coding/include/audio_coding_module.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
 class AudioFrame;
 
 class AudioCoder : public AudioPacketizationCallback
 {
 public:
     AudioCoder(uint32_t instanceID);
@@ skipping 14 matching lines @@
 protected:
  int32_t SendData(FrameType frameType,
                   uint8_t payloadType,
                   uint32_t timeStamp,
                   const uint8_t* payloadData,
                   size_t payloadSize,
                   const RTPFragmentationHeader* fragmentation) override;
 
 private:
  std::unique_ptr<AudioCodingModule> _acm;
+ acm2::CodecManager codec_manager_;
+ acm2::RentACodec rent_a_codec_;
 
     CodecInst _receiveCodec;
 
     uint32_t _encodeTimestamp;
     int8_t*  _encodedData;
     size_t _encodedLengthInBytes;
 
     uint32_t _decodeTimestamp;
 };
 }  // namespace webrtc
 
 #endif // WEBRTC_MODULES_UTILITY_SOURCE_CODER_H_