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

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

Issue 1230503003: Update a ton of audio code to use size_t more correctly and in general reduce (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Resync Created 5 years, 3 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 #include "webrtc/modules/audio_processing/vad/pole_zero_filter.h" 11 #include "webrtc/modules/audio_processing/vad/pole_zero_filter.h"
12 12
13 #include <stdlib.h> 13 #include <stdlib.h>
14 #include <string.h> 14 #include <string.h>
15 #include <algorithm> 15 #include <algorithm>
16 16
17 namespace webrtc { 17 namespace webrtc {
18 18
19 PoleZeroFilter* PoleZeroFilter::Create(const float* numerator_coefficients, 19 PoleZeroFilter* PoleZeroFilter::Create(const float* numerator_coefficients,
20 int order_numerator, 20 size_t order_numerator,
21 const float* denominator_coefficients, 21 const float* denominator_coefficients,
22 int order_denominator) { 22 size_t order_denominator) {
23 if (order_numerator < 0 || order_denominator < 0 || 23 if (order_numerator > kMaxFilterOrder ||
24 order_numerator > kMaxFilterOrder ||
25 order_denominator > kMaxFilterOrder || denominator_coefficients[0] == 0 || 24 order_denominator > kMaxFilterOrder || denominator_coefficients[0] == 0 ||
26 numerator_coefficients == NULL || denominator_coefficients == NULL) 25 numerator_coefficients == NULL || denominator_coefficients == NULL)
27 return NULL; 26 return NULL;
28 return new PoleZeroFilter(numerator_coefficients, order_numerator, 27 return new PoleZeroFilter(numerator_coefficients, order_numerator,
29 denominator_coefficients, order_denominator); 28 denominator_coefficients, order_denominator);
30 } 29 }
31 30
32 PoleZeroFilter::PoleZeroFilter(const float* numerator_coefficients, 31 PoleZeroFilter::PoleZeroFilter(const float* numerator_coefficients,
33 int order_numerator, 32 size_t order_numerator,
34 const float* denominator_coefficients, 33 const float* denominator_coefficients,
35 int order_denominator) 34 size_t order_denominator)
36 : past_input_(), 35 : past_input_(),
37 past_output_(), 36 past_output_(),
38 numerator_coefficients_(), 37 numerator_coefficients_(),
39 denominator_coefficients_(), 38 denominator_coefficients_(),
40 order_numerator_(order_numerator), 39 order_numerator_(order_numerator),
41 order_denominator_(order_denominator), 40 order_denominator_(order_denominator),
42 highest_order_(std::max(order_denominator, order_numerator)) { 41 highest_order_(std::max(order_denominator, order_numerator)) {
43 memcpy(numerator_coefficients_, numerator_coefficients, 42 memcpy(numerator_coefficients_, numerator_coefficients,
44 sizeof(numerator_coefficients_[0]) * (order_numerator_ + 1)); 43 sizeof(numerator_coefficients_[0]) * (order_numerator_ + 1));
45 memcpy(denominator_coefficients_, denominator_coefficients, 44 memcpy(denominator_coefficients_, denominator_coefficients,
46 sizeof(denominator_coefficients_[0]) * (order_denominator_ + 1)); 45 sizeof(denominator_coefficients_[0]) * (order_denominator_ + 1));
47 46
48 if (denominator_coefficients_[0] != 1) { 47 if (denominator_coefficients_[0] != 1) {
49 for (int n = 0; n <= order_numerator_; n++) 48 for (size_t n = 0; n <= order_numerator_; n++)
50 numerator_coefficients_[n] /= denominator_coefficients_[0]; 49 numerator_coefficients_[n] /= denominator_coefficients_[0];
51 for (int n = 0; n <= order_denominator_; n++) 50 for (size_t n = 0; n <= order_denominator_; n++)
52 denominator_coefficients_[n] /= denominator_coefficients_[0]; 51 denominator_coefficients_[n] /= denominator_coefficients_[0];
53 } 52 }
54 } 53 }
55 54
56 template <typename T> 55 template <typename T>
57 static float FilterArPast(const T* past, int order, const float* coefficients) { 56 static float FilterArPast(const T* past, size_t order,
57 const float* coefficients) {
58 float sum = 0.0f; 58 float sum = 0.0f;
59 int past_index = order - 1; 59 size_t past_index = order - 1;
60 for (int k = 1; k <= order; k++, past_index--) 60 for (size_t k = 1; k <= order; k++, past_index--)
61 sum += coefficients[k] * past[past_index]; 61 sum += coefficients[k] * past[past_index];
62 return sum; 62 return sum;
63 } 63 }
64 64
65 int PoleZeroFilter::Filter(const int16_t* in, 65 int PoleZeroFilter::Filter(const int16_t* in,
66 int num_input_samples, 66 size_t num_input_samples,
67 float* output) { 67 float* output) {
68 if (in == NULL || num_input_samples < 0 || output == NULL) 68 if (in == NULL || output == NULL)
69 return -1; 69 return -1;
70 // This is the typical case, just a memcpy. 70 // This is the typical case, just a memcpy.
71 const int k = std::min(num_input_samples, highest_order_); 71 const size_t k = std::min(num_input_samples, highest_order_);
72 int n; 72 size_t n;
73 for (n = 0; n < k; n++) { 73 for (n = 0; n < k; n++) {
74 output[n] = in[n] * numerator_coefficients_[0]; 74 output[n] = in[n] * numerator_coefficients_[0];
75 output[n] += FilterArPast(&past_input_[n], order_numerator_, 75 output[n] += FilterArPast(&past_input_[n], order_numerator_,
76 numerator_coefficients_); 76 numerator_coefficients_);
77 output[n] -= FilterArPast(&past_output_[n], order_denominator_, 77 output[n] -= FilterArPast(&past_output_[n], order_denominator_,
78 denominator_coefficients_); 78 denominator_coefficients_);
79 79
80 past_input_[n + order_numerator_] = in[n]; 80 past_input_[n + order_numerator_] = in[n];
81 past_output_[n + order_denominator_] = output[n]; 81 past_output_[n + order_denominator_] = output[n];
82 } 82 }
83 if (highest_order_ < num_input_samples) { 83 if (highest_order_ < num_input_samples) {
84 for (int m = 0; n < num_input_samples; n++, m++) { 84 for (size_t m = 0; n < num_input_samples; n++, m++) {
85 output[n] = in[n] * numerator_coefficients_[0]; 85 output[n] = in[n] * numerator_coefficients_[0];
86 output[n] += 86 output[n] +=
87 FilterArPast(&in[m], order_numerator_, numerator_coefficients_); 87 FilterArPast(&in[m], order_numerator_, numerator_coefficients_);
88 output[n] -= FilterArPast(&output[m], order_denominator_, 88 output[n] -= FilterArPast(&output[m], order_denominator_,
89 denominator_coefficients_); 89 denominator_coefficients_);
90 } 90 }
91 // Record into the past signal. 91 // Record into the past signal.
92 memcpy(past_input_, &in[num_input_samples - order_numerator_], 92 memcpy(past_input_, &in[num_input_samples - order_numerator_],
93 sizeof(in[0]) * order_numerator_); 93 sizeof(in[0]) * order_numerator_);
94 memcpy(past_output_, &output[num_input_samples - order_denominator_], 94 memcpy(past_output_, &output[num_input_samples - order_denominator_],
95 sizeof(output[0]) * order_denominator_); 95 sizeof(output[0]) * order_denominator_);
96 } else { 96 } else {
97 // Odd case that the length of the input is shorter that filter order. 97 // Odd case that the length of the input is shorter that filter order.
98 memmove(past_input_, &past_input_[num_input_samples], 98 memmove(past_input_, &past_input_[num_input_samples],
99 order_numerator_ * sizeof(past_input_[0])); 99 order_numerator_ * sizeof(past_input_[0]));
100 memmove(past_output_, &past_output_[num_input_samples], 100 memmove(past_output_, &past_output_[num_input_samples],
101 order_denominator_ * sizeof(past_output_[0])); 101 order_denominator_ * sizeof(past_output_[0]));
102 } 102 }
103 return 0; 103 return 0;
104 } 104 }
105 105
106 } // namespace webrtc 106 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/audio_processing/vad/pole_zero_filter.h ('k') | webrtc/modules/audio_processing/vad/standalone_vad.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698