OLD | NEW |
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 #include "webrtc/modules/audio_processing/level_estimator_impl.h" | 11 #include "webrtc/modules/audio_processing/level_estimator_impl.h" |
12 | 12 |
| 13 #include "webrtc/base/array_view.h" |
13 #include "webrtc/modules/audio_processing/audio_buffer.h" | 14 #include "webrtc/modules/audio_processing/audio_buffer.h" |
14 #include "webrtc/modules/audio_processing/rms_level.h" | 15 #include "webrtc/modules/audio_processing/rms_level.h" |
15 #include "webrtc/system_wrappers/include/critical_section_wrapper.h" | 16 #include "webrtc/system_wrappers/include/critical_section_wrapper.h" |
16 | 17 |
17 namespace webrtc { | 18 namespace webrtc { |
18 | 19 |
19 LevelEstimatorImpl::LevelEstimatorImpl(rtc::CriticalSection* crit) | 20 LevelEstimatorImpl::LevelEstimatorImpl(rtc::CriticalSection* crit) |
20 : crit_(crit), rms_(new RMSLevel()) { | 21 : crit_(crit), rms_(new RmsLevel()) { |
21 RTC_DCHECK(crit); | 22 RTC_DCHECK(crit); |
22 } | 23 } |
23 | 24 |
24 LevelEstimatorImpl::~LevelEstimatorImpl() {} | 25 LevelEstimatorImpl::~LevelEstimatorImpl() {} |
25 | 26 |
26 void LevelEstimatorImpl::Initialize() { | 27 void LevelEstimatorImpl::Initialize() { |
27 rtc::CritScope cs(crit_); | 28 rtc::CritScope cs(crit_); |
28 rms_->Reset(); | 29 rms_->Reset(); |
29 } | 30 } |
30 | 31 |
31 void LevelEstimatorImpl::ProcessStream(AudioBuffer* audio) { | 32 void LevelEstimatorImpl::ProcessStream(AudioBuffer* audio) { |
32 RTC_DCHECK(audio); | 33 RTC_DCHECK(audio); |
33 rtc::CritScope cs(crit_); | 34 rtc::CritScope cs(crit_); |
34 if (!enabled_) { | 35 if (!enabled_) { |
35 return; | 36 return; |
36 } | 37 } |
37 | 38 |
38 for (size_t i = 0; i < audio->num_channels(); i++) { | 39 for (size_t i = 0; i < audio->num_channels(); i++) { |
39 rms_->Process(audio->channels_const()[i], audio->num_frames()); | 40 rms_->Analyze(rtc::ArrayView<const int16_t>(audio->channels_const()[i], |
| 41 audio->num_frames())); |
40 } | 42 } |
41 } | 43 } |
42 | 44 |
43 int LevelEstimatorImpl::Enable(bool enable) { | 45 int LevelEstimatorImpl::Enable(bool enable) { |
44 rtc::CritScope cs(crit_); | 46 rtc::CritScope cs(crit_); |
45 if (enable && !enabled_) { | 47 if (enable && !enabled_) { |
46 rms_->Reset(); | 48 rms_->Reset(); |
47 } | 49 } |
48 enabled_ = enable; | 50 enabled_ = enable; |
49 return AudioProcessing::kNoError; | 51 return AudioProcessing::kNoError; |
50 } | 52 } |
51 | 53 |
52 bool LevelEstimatorImpl::is_enabled() const { | 54 bool LevelEstimatorImpl::is_enabled() const { |
53 rtc::CritScope cs(crit_); | 55 rtc::CritScope cs(crit_); |
54 return enabled_; | 56 return enabled_; |
55 } | 57 } |
56 | 58 |
57 int LevelEstimatorImpl::RMS() { | 59 int LevelEstimatorImpl::RMS() { |
58 rtc::CritScope cs(crit_); | 60 rtc::CritScope cs(crit_); |
59 if (!enabled_) { | 61 if (!enabled_) { |
60 return AudioProcessing::kNotEnabledError; | 62 return AudioProcessing::kNotEnabledError; |
61 } | 63 } |
62 | 64 |
63 return rms_->RMS(); | 65 return rms_->Average(); |
64 } | 66 } |
65 } // namespace webrtc | 67 } // namespace webrtc |
OLD | NEW |