Replace scoped_ptr with unique_ptr in webrtc/modules/audio_coding/codecs/

webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng.cc

 /*
  *  Copyright (c) 2014 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/codecs/cng/audio_encoder_cng.h"
 
 #include <algorithm>
+#include <memory>
 #include <limits>
 
 namespace webrtc {
 
 namespace {
 
 const int kMaxFrameSizeMs = 60;
 
-rtc::scoped_ptr<CNG_enc_inst, CngInstDeleter> CreateCngInst(
+std::unique_ptr<CNG_enc_inst, CngInstDeleter> CreateCngInst(
     int sample_rate_hz,
     int sid_frame_interval_ms,
     int num_cng_coefficients) {
-  rtc::scoped_ptr<CNG_enc_inst, CngInstDeleter> cng_inst;
-  RTC_CHECK_EQ(0, WebRtcCng_CreateEnc(cng_inst.accept()));
+  CNG_enc_inst* ci;
+  RTC_CHECK_EQ(0, WebRtcCng_CreateEnc(&ci));

[tommi, 2016/02/14 09:08:37]

I wish unique_ptr had better support for accepting out arguments.

[kwiberg-webrtc, 2016/02/14 13:07:43]

Yes, but this may very well be deliberate: any place you convert a raw pointer
to a unique_ptr, you have to think carefully about exception safety etc., so it
might be inconvenient by design.

Note that unique_ptr out arguments are supported perfectly well. ;-)

+  std::unique_ptr<CNG_enc_inst, CngInstDeleter> cng_inst(ci);
   RTC_CHECK_EQ(0,
                WebRtcCng_InitEnc(cng_inst.get(), sample_rate_hz,
                                  sid_frame_interval_ms, num_cng_coefficients));
   return cng_inst;
 }
 
 }  // namespace
 
 bool AudioEncoderCng::Config::IsOk() const {
   if (num_channels != 1)
@@ skipping 10 matching lines @@
     return false;
   return true;
 }
 
 AudioEncoderCng::AudioEncoderCng(const Config& config)
     : speech_encoder_(config.speech_encoder),
       cng_payload_type_(config.payload_type),
       num_cng_coefficients_(config.num_cng_coefficients),
       sid_frame_interval_ms_(config.sid_frame_interval_ms),
       last_frame_active_(true),
-      vad_(config.vad ? rtc_make_scoped_ptr(config.vad)
+      vad_(config.vad ? std::unique_ptr<Vad>(config.vad)
                       : CreateVad(config.vad_mode)) {
   RTC_CHECK(config.IsOk()) << "Invalid configuration.";
   cng_inst_ = CreateCngInst(SampleRateHz(), sid_frame_interval_ms_,
                             num_cng_coefficients_);
 }
 
 AudioEncoderCng::~AudioEncoderCng() = default;
 
 size_t AudioEncoderCng::MaxEncodedBytes() const {
   const size_t max_encoded_bytes_active = speech_encoder_->MaxEncodedBytes();
@@ skipping 186 matching lines @@
     }
   }
   return info;
 }
 
 size_t AudioEncoderCng::SamplesPer10msFrame() const {
   return rtc::CheckedDivExact(10 * SampleRateHz(), 1000);
 }
 
 }  // namespace webrtc