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

Side by Side Diff: webrtc/voice_engine/audio_level.cc

Issue 2731993002: Update formatting of AudioLevel class (Closed)
Patch Set: Change file names Created 3 years, 9 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
(Empty)
1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
3 *
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
6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree.
9 */
10
11 #include "webrtc/voice_engine/audio_level.h"
12
13 #include "webrtc/common_audio/signal_processing/include/signal_processing_librar y.h"
14 #include "webrtc/modules/include/module_common_types.h"
15
16 namespace webrtc {
17 namespace voe {
18
19 // Number of bars on the indicator.
20 // Note that the number of elements is specified because we are indexing it
21 // in the range of 0-32
22 constexpr int8_t kPermutation[33] = {0, 1, 2, 3, 4, 4, 5, 5, 5, 5, 6,
23 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8,
24 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9};
25
26 AudioLevel::AudioLevel()
27 : abs_max_(0), count_(0), current_level_(0), current_level_full_range_(0) {
28 WebRtcSpl_Init();
29 }
30
31 AudioLevel::~AudioLevel() {}
32
33 int8_t AudioLevel::Level() const {
34 rtc::CritScope cs(&crit_sect_);
35 return current_level_;
36 }
37
38 int16_t AudioLevel::LevelFullRange() const {
39 rtc::CritScope cs(&crit_sect_);
40 return current_level_full_range_;
41 }
42
43 void AudioLevel::Clear() {
44 rtc::CritScope cs(&crit_sect_);
45 abs_max_ = 0;
46 count_ = 0;
47 current_level_ = 0;
48 current_level_full_range_ = 0;
49 }
50
51 void AudioLevel::ComputeLevel(const AudioFrame& audioFrame) {
52 int16_t abs_value(0);
53
54 // Check speech level (works for 2 channels as well)
55 abs_value = WebRtcSpl_MaxAbsValueW16(
the sun 2017/03/06 15:53:45 declare the int16_t here instead
hlundin-webrtc 2017/03/07 09:35:57 Done.
56 audioFrame.data_,
57 audioFrame.samples_per_channel_ * audioFrame.num_channels_);
58
59 // Protect member access using a lock since this method is called on a
60 // dedicated audio thread in the RecordedDataIsAvailable() callback.
61 rtc::CritScope cs(&crit_sect_);
62
63 if (abs_value > abs_max_)
64 abs_max_ = abs_value;
65
66 // Update level approximately 10 times per second
67 if (count_++ == kUpdateFrequency) {
68 current_level_full_range_ = abs_max_;
69
70 count_ = 0;
71
72 // Highest value for a int16_t is 0x7fff = 32767
73 // Divide with 1000 to get in the range of 0-32 which is the range of the
74 // permutation vector
75 int32_t position = abs_max_ / 1000;
76
77 // Make it less likely that the bar stays at position 0. I.e. only if it's
78 // in the range 0-250 (instead of 0-1000)
79 if ((position == 0) && (abs_max_ > 250)) {
80 position = 1;
81 }
82 current_level_ = kPermutation[position];
83
84 // Decay the absolute maximum (divide by 4)
85 abs_max_ >>= 2;
86 }
87 }
88
89 } // namespace voe
90 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698