Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(250)

Side by Side Diff: webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng.h

Issue 1696853004: Replace scoped_ptr with unique_ptr in webrtc/modules/audio_coding/codecs/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_CNG_AUDIO_ENCODER_CNG_H_ 11 #ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_CNG_AUDIO_ENCODER_CNG_H_
12 #define WEBRTC_MODULES_AUDIO_CODING_CODECS_CNG_AUDIO_ENCODER_CNG_H_ 12 #define WEBRTC_MODULES_AUDIO_CODING_CODECS_CNG_AUDIO_ENCODER_CNG_H_
13 13
14 #include <memory>
14 #include <vector> 15 #include <vector>
15 16
16 #include "webrtc/base/scoped_ptr.h" 17 #include "webrtc/base/constructormagic.h"
17 #include "webrtc/common_audio/vad/include/vad.h" 18 #include "webrtc/common_audio/vad/include/vad.h"
18 #include "webrtc/modules/audio_coding/codecs/audio_encoder.h" 19 #include "webrtc/modules/audio_coding/codecs/audio_encoder.h"
19 #include "webrtc/modules/audio_coding/codecs/cng/webrtc_cng.h" 20 #include "webrtc/modules/audio_coding/codecs/cng/webrtc_cng.h"
20 21
21 namespace webrtc { 22 namespace webrtc {
22 23
23 // Deleter for use with scoped_ptr. 24 // Deleter for use with unique_ptr.
24 struct CngInstDeleter { 25 struct CngInstDeleter {
25 void operator()(CNG_enc_inst* ptr) const { WebRtcCng_FreeEnc(ptr); } 26 void operator()(CNG_enc_inst* ptr) const { WebRtcCng_FreeEnc(ptr); }
26 }; 27 };
27 28
28 class Vad; 29 class Vad;
29 30
30 class AudioEncoderCng final : public AudioEncoder { 31 class AudioEncoderCng final : public AudioEncoder {
31 public: 32 public:
32 struct Config { 33 struct Config {
33 bool IsOk() const; 34 bool IsOk() const;
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 uint8_t* encoded); 78 uint8_t* encoded);
78 size_t SamplesPer10msFrame() const; 79 size_t SamplesPer10msFrame() const;
79 80
80 AudioEncoder* speech_encoder_; 81 AudioEncoder* speech_encoder_;
81 const int cng_payload_type_; 82 const int cng_payload_type_;
82 const int num_cng_coefficients_; 83 const int num_cng_coefficients_;
83 const int sid_frame_interval_ms_; 84 const int sid_frame_interval_ms_;
84 std::vector<int16_t> speech_buffer_; 85 std::vector<int16_t> speech_buffer_;
85 std::vector<uint32_t> rtp_timestamps_; 86 std::vector<uint32_t> rtp_timestamps_;
86 bool last_frame_active_; 87 bool last_frame_active_;
87 rtc::scoped_ptr<Vad> vad_; 88 std::unique_ptr<Vad> vad_;
88 rtc::scoped_ptr<CNG_enc_inst, CngInstDeleter> cng_inst_; 89 std::unique_ptr<CNG_enc_inst, CngInstDeleter> cng_inst_;
89 90
90 RTC_DISALLOW_COPY_AND_ASSIGN(AudioEncoderCng); 91 RTC_DISALLOW_COPY_AND_ASSIGN(AudioEncoderCng);
91 }; 92 };
92 93
93 } // namespace webrtc 94 } // namespace webrtc
94 95
95 #endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_CNG_AUDIO_ENCODER_CNG_H_ 96 #endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_CNG_AUDIO_ENCODER_CNG_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698