Switch to using new ACM methods for encoder management

webrtc/modules/utility/source/coder.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 11 matching lines @@
       _decodeTimestamp(0)
 {
     _acm->InitializeReceiver();
     _acm->RegisterTransportCallback(this);
 }
 
 AudioCoder::~AudioCoder()
 {
 }
 
-int32_t AudioCoder::SetEncodeCodec(const CodecInst& codecInst)
-{
-    if(_acm->RegisterSendCodec((CodecInst&)codecInst) == -1)
-    {
-        return -1;
-    }
-    return 0;
+int32_t AudioCoder::SetEncodeCodec(const CodecInst& codecInst) {
+  const bool success =
+      codec_manager_.RegisterEncoder(codecInst) &&
+      codec_manager_.MakeEncoder(&rent_a_codec_,
+                                 [&](std::unique_ptr<AudioEncoder> new_enc) {
+                                   _acm->SetEncoder(std::move(new_enc));
+                                 });
+  return success ? 0 : -1;
 }
 
-int32_t AudioCoder::SetDecodeCodec(const CodecInst& codecInst)
-{
-    if(_acm->RegisterReceiveCodec((CodecInst&)codecInst) == -1)
-    {
-        return -1;
-    }
-    memcpy(&_receiveCodec,&codecInst,sizeof(CodecInst));
-    return 0;
+int32_t AudioCoder::SetDecodeCodec(const CodecInst& codecInst) {
+  if (_acm->RegisterReceiveCodec(
+          codecInst, [&] { return rent_a_codec_.RentIsacDecoder(); }) == -1) {
+    return -1;
+  }
+  memcpy(&_receiveCodec, &codecInst, sizeof(CodecInst));
+  return 0;
 }
 
 int32_t AudioCoder::Decode(AudioFrame& decodedAudio,
                            uint32_t sampFreqHz,
                            const int8_t*  incomingPayload,
                            size_t  payloadLength)
 {
     if (payloadLength > 0)
     {
         const uint8_t payloadType = _receiveCodec.pltype;
@@ skipping 44 matching lines @@
     uint32_t  /* timeStamp */,
     const uint8_t*  payloadData,
     size_t  payloadSize,
     const RTPFragmentationHeader* /* fragmentation*/)
 {
     memcpy(_encodedData,payloadData,sizeof(uint8_t) * payloadSize);
     _encodedLengthInBytes = payloadSize;
     return 0;
 }
 }  // namespace webrtc