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

Side by Side Diff: webrtc/modules/audio_processing/level_estimator_impl.h

Issue 1710483002: Replace scoped_ptr with unique_ptr in webrtc/modules/audio_processing/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase 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) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 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_PROCESSING_LEVEL_ESTIMATOR_IMPL_H_ 11 #ifndef WEBRTC_MODULES_AUDIO_PROCESSING_LEVEL_ESTIMATOR_IMPL_H_
12 #define WEBRTC_MODULES_AUDIO_PROCESSING_LEVEL_ESTIMATOR_IMPL_H_ 12 #define WEBRTC_MODULES_AUDIO_PROCESSING_LEVEL_ESTIMATOR_IMPL_H_
13 13
14 #include <memory>
15
14 #include "webrtc/base/constructormagic.h" 16 #include "webrtc/base/constructormagic.h"
15 #include "webrtc/base/criticalsection.h" 17 #include "webrtc/base/criticalsection.h"
16 #include "webrtc/base/scoped_ptr.h"
17 #include "webrtc/modules/audio_processing/include/audio_processing.h" 18 #include "webrtc/modules/audio_processing/include/audio_processing.h"
18 19
19 namespace webrtc { 20 namespace webrtc {
20 21
21 class AudioBuffer; 22 class AudioBuffer;
22 class RMSLevel; 23 class RMSLevel;
23 24
24 class LevelEstimatorImpl : public LevelEstimator { 25 class LevelEstimatorImpl : public LevelEstimator {
25 public: 26 public:
26 explicit LevelEstimatorImpl(rtc::CriticalSection* crit); 27 explicit LevelEstimatorImpl(rtc::CriticalSection* crit);
27 ~LevelEstimatorImpl() override; 28 ~LevelEstimatorImpl() override;
28 29
29 // TODO(peah): Fold into ctor, once public API is removed. 30 // TODO(peah): Fold into ctor, once public API is removed.
30 void Initialize(); 31 void Initialize();
31 void ProcessStream(AudioBuffer* audio); 32 void ProcessStream(AudioBuffer* audio);
32 33
33 // LevelEstimator implementation. 34 // LevelEstimator implementation.
34 int Enable(bool enable) override; 35 int Enable(bool enable) override;
35 bool is_enabled() const override; 36 bool is_enabled() const override;
36 int RMS() override; 37 int RMS() override;
37 38
38 private: 39 private:
39 rtc::CriticalSection* const crit_ = nullptr; 40 rtc::CriticalSection* const crit_ = nullptr;
40 bool enabled_ GUARDED_BY(crit_) = false; 41 bool enabled_ GUARDED_BY(crit_) = false;
41 rtc::scoped_ptr<RMSLevel> rms_ GUARDED_BY(crit_); 42 std::unique_ptr<RMSLevel> rms_ GUARDED_BY(crit_);
42 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(LevelEstimatorImpl); 43 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(LevelEstimatorImpl);
43 }; 44 };
44 } // namespace webrtc 45 } // namespace webrtc
45 46
46 #endif // WEBRTC_MODULES_AUDIO_PROCESSING_LEVEL_ESTIMATOR_IMPL_H_ 47 #endif // WEBRTC_MODULES_AUDIO_PROCESSING_LEVEL_ESTIMATOR_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698