Move the Rent-A-Codec™ from CodecOwner to CodecManager

webrtc/modules/audio_coding/main/acm2/codec_manager.cc

 /*
  *  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.
  */
 
@@ skipping 246 matching lines @@
 
   encoder_is_opus_ = IsOpus(send_codec);
 
   if (new_codec) {
     // This is a new codec. Register it and return.
     RTC_DCHECK(CodecSupported(send_codec));
     if (IsOpus(send_codec)) {
       // VAD/DTX not supported.
       dtx_enabled_ = false;
     }
-    if (!codec_owner_.SetEncoders(
-            send_codec, dtx_enabled_ ? CngPayloadType(send_codec.plfreq) : -1,
-            vad_mode_, red_enabled_ ? RedPayloadType(send_codec.plfreq) : -1))
+    AudioEncoder* enc = rent_a_codec_.RentEncoder(send_codec);
+    if (!enc)
       return -1;
+    codec_owner_.SetEncoders(
+        enc, dtx_enabled_ ? CngPayloadType(send_codec.plfreq) : -1,
+        vad_mode_, red_enabled_ ? RedPayloadType(send_codec.plfreq) : -1);
     RTC_DCHECK(codec_owner_.Encoder());
 
     codec_fec_enabled_ = codec_fec_enabled_ &&
-                         codec_owner_.Encoder()->SetFec(codec_fec_enabled_);
+                         enc->SetFec(codec_fec_enabled_);
 
     send_codec_inst_ = send_codec;
     return 0;
   }
 
   // This is an existing codec; re-create it if any parameters have changed.
   if (send_codec_inst_.plfreq != send_codec.plfreq ||
       send_codec_inst_.pacsize != send_codec.pacsize ||
       send_codec_inst_.channels != send_codec.channels) {
-    if (!codec_owner_.SetEncoders(
-            send_codec, dtx_enabled_ ? CngPayloadType(send_codec.plfreq) : -1,
-            vad_mode_, red_enabled_ ? RedPayloadType(send_codec.plfreq) : -1))
+    AudioEncoder* enc = rent_a_codec_.RentEncoder(send_codec);
+    if (!enc)
       return -1;
+    codec_owner_.SetEncoders(
+        enc, dtx_enabled_ ? CngPayloadType(send_codec.plfreq) : -1,
+        vad_mode_, red_enabled_ ? RedPayloadType(send_codec.plfreq) : -1);
     RTC_DCHECK(codec_owner_.Encoder());
   }
   send_codec_inst_.plfreq = send_codec.plfreq;
   send_codec_inst_.pacsize = send_codec.pacsize;
   send_codec_inst_.channels = send_codec.channels;
   send_codec_inst_.pltype = send_codec.pltype;
 
   // Check if a change in Rate is required.
   if (send_codec.rate != send_codec_inst_.rate) {
     codec_owner_.Encoder()->SetTargetBitrate(send_codec.rate);
@@ skipping 113 matching lines @@
     return -1;
   }
 
   RTC_CHECK(codec_owner_.Encoder());
   codec_fec_enabled_ =
       codec_owner_.Encoder()->SetFec(enable_codec_fec) && enable_codec_fec;
   return codec_fec_enabled_ == enable_codec_fec ? 0 : -1;
 }
 
 AudioDecoder* CodecManager::GetAudioDecoder(const CodecInst& codec) {
-  return IsIsac(codec) ? codec_owner_.GetIsacDecoder() : nullptr;
+  return IsIsac(codec) ? rent_a_codec_.RentIsacDecoder() : nullptr;
 }
 
 int CodecManager::CngPayloadType(int sample_rate_hz) const {
   switch (sample_rate_hz) {
     case 8000:
       return cng_nb_pltype_;
     case 16000:
       return cng_wb_pltype_;
     case 32000:
       return cng_swb_pltype_;
@@ skipping 14 matching lines @@
     case 48000:
       return -1;
     default:
       FATAL() << sample_rate_hz << " Hz is not supported";
       return -1;
   }
 }
 
 }  // namespace acm2
 }  // namespace webrtc