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

Side by Side Diff: webrtc/modules/audio_processing/vad/voice_activity_detector.cc

Issue 1228803003: Update audio code to use size_t more correctly, (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Review comments Created 5 years, 5 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
« no previous file with comments | « webrtc/modules/audio_processing/vad/voice_activity_detector.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 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/vad/voice_activity_detector.h" 11 #include "webrtc/modules/audio_processing/vad/voice_activity_detector.h"
12 12
13 #include <algorithm> 13 #include <algorithm>
14 14
15 #include "webrtc/base/checks.h" 15 #include "webrtc/base/checks.h"
16 16
17 namespace webrtc { 17 namespace webrtc {
18 namespace { 18 namespace {
19 19
20 const int kMaxLength = 320; 20 const size_t kMaxLength = 320;
21 const int kNumChannels = 1; 21 const int kNumChannels = 1;
22 22
23 const double kDefaultVoiceValue = 1.0; 23 const double kDefaultVoiceValue = 1.0;
24 const double kNeutralProbability = 0.5; 24 const double kNeutralProbability = 0.5;
25 const double kLowProbability = 0.01; 25 const double kLowProbability = 0.01;
26 26
27 } // namespace 27 } // namespace
28 28
29 VoiceActivityDetector::VoiceActivityDetector() 29 VoiceActivityDetector::VoiceActivityDetector()
30 : last_voice_probability_(kDefaultVoiceValue), 30 : last_voice_probability_(kDefaultVoiceValue),
31 standalone_vad_(StandaloneVad::Create()) { 31 standalone_vad_(StandaloneVad::Create()) {
32 } 32 }
33 33
34 // Because ISAC has a different chunk length, it updates 34 // Because ISAC has a different chunk length, it updates
35 // |chunkwise_voice_probabilities_| and |chunkwise_rms_| when there is new data. 35 // |chunkwise_voice_probabilities_| and |chunkwise_rms_| when there is new data.
36 // Otherwise it clears them. 36 // Otherwise it clears them.
37 void VoiceActivityDetector::ProcessChunk(const int16_t* audio, 37 void VoiceActivityDetector::ProcessChunk(const int16_t* audio,
38 int length, 38 size_t length,
39 int sample_rate_hz) { 39 int sample_rate_hz) {
40 DCHECK_EQ(length, sample_rate_hz / 100); 40 DCHECK_EQ(static_cast<int>(length), sample_rate_hz / 100);
41 DCHECK_LE(length, kMaxLength); 41 DCHECK_LE(length, kMaxLength);
42 // Resample to the required rate. 42 // Resample to the required rate.
43 const int16_t* resampled_ptr = audio; 43 const int16_t* resampled_ptr = audio;
44 if (sample_rate_hz != kSampleRateHz) { 44 if (sample_rate_hz != kSampleRateHz) {
45 CHECK_EQ( 45 CHECK_EQ(
46 resampler_.ResetIfNeeded(sample_rate_hz, kSampleRateHz, kNumChannels), 46 resampler_.ResetIfNeeded(sample_rate_hz, kSampleRateHz, kNumChannels),
47 0); 47 0);
48 resampler_.Push(audio, length, resampled_, kLength10Ms, length); 48 resampler_.Push(audio, length, resampled_, kLength10Ms, length);
49 resampled_ptr = resampled_; 49 resampled_ptr = resampled_;
50 } 50 }
(...skipping 25 matching lines...) Expand all
76 0); 76 0);
77 CHECK_GE(pitch_based_vad_.VoicingProbability( 77 CHECK_GE(pitch_based_vad_.VoicingProbability(
78 features_, &chunkwise_voice_probabilities_[0]), 78 features_, &chunkwise_voice_probabilities_[0]),
79 0); 79 0);
80 } 80 }
81 last_voice_probability_ = chunkwise_voice_probabilities_.back(); 81 last_voice_probability_ = chunkwise_voice_probabilities_.back();
82 } 82 }
83 } 83 }
84 84
85 } // namespace webrtc 85 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/audio_processing/vad/voice_activity_detector.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698