Replace scoped_ptr with unique_ptr in webrtc/modules/audio_coding/

webrtc/modules/audio_coding/acm2/rent_a_codec.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.
  */
 
 #include "webrtc/modules/audio_coding/acm2/rent_a_codec.h"
 
+#include <memory>
 #include <utility>
 
 #include "webrtc/base/logging.h"
 #include "webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng.h"
 #include "webrtc/modules/audio_coding/codecs/g711/audio_encoder_pcm.h"
 #ifdef WEBRTC_CODEC_G722
 #include "webrtc/modules/audio_coding/codecs/g722/audio_encoder_g722.h"
 #endif
 #ifdef WEBRTC_CODEC_ILBC
 #include "webrtc/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.h"
@@ skipping 114 matching lines @@
       return RegistrationResult::kOk;
     default:
       return RegistrationResult::kBadFreq;
   }
 }
 
 namespace {
 
 // Returns a new speech encoder, or null on error.
 // TODO(kwiberg): Don't handle errors here (bug 5033)
-rtc::scoped_ptr<AudioEncoder> CreateEncoder(
-    const CodecInst& speech_inst,
-    LockedIsacBandwidthInfo* bwinfo) {
+std::unique_ptr<AudioEncoder> CreateEncoder(const CodecInst& speech_inst,
+                                            LockedIsacBandwidthInfo* bwinfo) {
 #if defined(WEBRTC_CODEC_ISACFX)
   if (STR_CASE_CMP(speech_inst.plname, "isac") == 0)
-    return rtc_make_scoped_ptr(new AudioEncoderIsacFix(speech_inst, bwinfo));
+    return std::unique_ptr<AudioEncoder>(
+        new AudioEncoderIsacFix(speech_inst, bwinfo));
 #endif
 #if defined(WEBRTC_CODEC_ISAC)
   if (STR_CASE_CMP(speech_inst.plname, "isac") == 0)
-    return rtc_make_scoped_ptr(new AudioEncoderIsac(speech_inst, bwinfo));
+    return std::unique_ptr<AudioEncoder>(
+        new AudioEncoderIsac(speech_inst, bwinfo));
 #endif
 #ifdef WEBRTC_CODEC_OPUS
   if (STR_CASE_CMP(speech_inst.plname, "opus") == 0)
-    return rtc_make_scoped_ptr(new AudioEncoderOpus(speech_inst));
+    return std::unique_ptr<AudioEncoder>(new AudioEncoderOpus(speech_inst));
 #endif
   if (STR_CASE_CMP(speech_inst.plname, "pcmu") == 0)
-    return rtc_make_scoped_ptr(new AudioEncoderPcmU(speech_inst));
+    return std::unique_ptr<AudioEncoder>(new AudioEncoderPcmU(speech_inst));
   if (STR_CASE_CMP(speech_inst.plname, "pcma") == 0)
-    return rtc_make_scoped_ptr(new AudioEncoderPcmA(speech_inst));
+    return std::unique_ptr<AudioEncoder>(new AudioEncoderPcmA(speech_inst));
   if (STR_CASE_CMP(speech_inst.plname, "l16") == 0)
-    return rtc_make_scoped_ptr(new AudioEncoderPcm16B(speech_inst));
+    return std::unique_ptr<AudioEncoder>(new AudioEncoderPcm16B(speech_inst));
 #ifdef WEBRTC_CODEC_ILBC
   if (STR_CASE_CMP(speech_inst.plname, "ilbc") == 0)
-    return rtc_make_scoped_ptr(new AudioEncoderIlbc(speech_inst));
+    return std::unique_ptr<AudioEncoder>(new AudioEncoderIlbc(speech_inst));
 #endif
 #ifdef WEBRTC_CODEC_G722
   if (STR_CASE_CMP(speech_inst.plname, "g722") == 0)
-    return rtc_make_scoped_ptr(new AudioEncoderG722(speech_inst));
+    return std::unique_ptr<AudioEncoder>(new AudioEncoderG722(speech_inst));
 #endif
   LOG_F(LS_ERROR) << "Could not create encoder of type " << speech_inst.plname;
-  return rtc::scoped_ptr<AudioEncoder>();
+  return std::unique_ptr<AudioEncoder>();
 }
 
-rtc::scoped_ptr<AudioEncoder> CreateRedEncoder(AudioEncoder* encoder,
+std::unique_ptr<AudioEncoder> CreateRedEncoder(AudioEncoder* encoder,
                                                int red_payload_type) {
 #ifdef WEBRTC_CODEC_RED
   AudioEncoderCopyRed::Config config;
   config.payload_type = red_payload_type;
   config.speech_encoder = encoder;
-  return rtc::scoped_ptr<AudioEncoder>(new AudioEncoderCopyRed(config));
+  return std::unique_ptr<AudioEncoder>(new AudioEncoderCopyRed(config));
 #else
-  return rtc::scoped_ptr<AudioEncoder>();
+  return std::unique_ptr<AudioEncoder>();
 #endif
 }
 
-rtc::scoped_ptr<AudioEncoder> CreateCngEncoder(AudioEncoder* encoder,
+std::unique_ptr<AudioEncoder> CreateCngEncoder(AudioEncoder* encoder,
                                                int payload_type,
                                                ACMVADMode vad_mode) {
   AudioEncoderCng::Config config;
   config.num_channels = encoder->NumChannels();
   config.payload_type = payload_type;
   config.speech_encoder = encoder;
   switch (vad_mode) {
     case VADNormal:
       config.vad_mode = Vad::kVadNormal;
       break;
     case VADLowBitrate:
       config.vad_mode = Vad::kVadLowBitrate;
       break;
     case VADAggr:
       config.vad_mode = Vad::kVadAggressive;
       break;
     case VADVeryAggr:
       config.vad_mode = Vad::kVadVeryAggressive;
       break;
     default:
       FATAL();
   }
-  return rtc::scoped_ptr<AudioEncoder>(new AudioEncoderCng(config));
+  return std::unique_ptr<AudioEncoder>(new AudioEncoderCng(config));
 }
 
-rtc::scoped_ptr<AudioDecoder> CreateIsacDecoder(
+std::unique_ptr<AudioDecoder> CreateIsacDecoder(
     LockedIsacBandwidthInfo* bwinfo) {
 #if defined(WEBRTC_CODEC_ISACFX)
-  return rtc_make_scoped_ptr(new AudioDecoderIsacFix(bwinfo));
+  return std::unique_ptr<AudioDecoder>(new AudioDecoderIsacFix(bwinfo));
 #elif defined(WEBRTC_CODEC_ISAC)
-  return rtc_make_scoped_ptr(new AudioDecoderIsac(bwinfo));
+  return std::unique_ptr<AudioDecoder>(new AudioDecoderIsac(bwinfo));
 #else
   FATAL() << "iSAC is not supported.";
-  return rtc::scoped_ptr<AudioDecoder>();
+  return std::unique_ptr<AudioDecoder>();
 #endif
 }
 
 }  // namespace
 
 RentACodec::RentACodec() = default;
 RentACodec::~RentACodec() = default;
 
 AudioEncoder* RentACodec::RentEncoder(const CodecInst& codec_inst) {
-  rtc::scoped_ptr<AudioEncoder> enc =
+  std::unique_ptr<AudioEncoder> enc =
       CreateEncoder(codec_inst, &isac_bandwidth_info_);
   if (!enc)
     return nullptr;
   speech_encoder_ = std::move(enc);
   return speech_encoder_.get();
 }
 
 RentACodec::StackParameters::StackParameters() {
   // Register the default payload types for RED and CNG.
   for (const CodecInst& ci : RentACodec::Database()) {
@@ skipping 51 matching lines @@
 }
 
 AudioDecoder* RentACodec::RentIsacDecoder() {
   if (!isac_decoder_)
     isac_decoder_ = CreateIsacDecoder(&isac_bandwidth_info_);
   return isac_decoder_.get();
 }
 
 }  // namespace acm2
 }  // namespace webrtc