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

Side by Side Diff: webrtc/common_audio/signal_processing/auto_correlation.c

Issue 1305983003: Convert some more things to size_t. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Support Android's C89 mode 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
« no previous file with comments | « no previous file | webrtc/common_audio/signal_processing/include/signal_processing_library.h » ('j') | 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) 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/common_audio/signal_processing/include/signal_processing_librar y.h" 11 #include "webrtc/common_audio/signal_processing/include/signal_processing_librar y.h"
12 12
13 int WebRtcSpl_AutoCorrelation(const int16_t* in_vector, 13 #include <assert.h>
14 size_t in_vector_length, 14
15 size_t order, 15 size_t WebRtcSpl_AutoCorrelation(const int16_t* in_vector,
16 int32_t* result, 16 size_t in_vector_length,
17 int* scale) { 17 size_t order,
18 int32_t* result,
19 int* scale) {
18 int32_t sum = 0; 20 int32_t sum = 0;
19 size_t i = 0, j = 0; 21 size_t i = 0, j = 0;
20 int16_t smax = 0; 22 int16_t smax = 0;
21 int scaling = 0; 23 int scaling = 0;
22 24
23 if (order > in_vector_length) { 25 assert(order <= in_vector_length);
24 /* Undefined */
25 return -1;
26 }
27 26
28 // Find the maximum absolute value of the samples. 27 // Find the maximum absolute value of the samples.
29 smax = WebRtcSpl_MaxAbsValueW16(in_vector, in_vector_length); 28 smax = WebRtcSpl_MaxAbsValueW16(in_vector, in_vector_length);
30 29
31 // In order to avoid overflow when computing the sum we should scale the 30 // In order to avoid overflow when computing the sum we should scale the
32 // samples so that (in_vector_length * smax * smax) will not overflow. 31 // samples so that (in_vector_length * smax * smax) will not overflow.
33 if (smax == 0) { 32 if (smax == 0) {
34 scaling = 0; 33 scaling = 0;
35 } else { 34 } else {
36 // Number of bits in the sum loop. 35 // Number of bits in the sum loop.
(...skipping 18 matching lines...) Expand all
55 sum += (in_vector[j + 2] * in_vector[i + j + 2]) >> scaling; 54 sum += (in_vector[j + 2] * in_vector[i + j + 2]) >> scaling;
56 sum += (in_vector[j + 3] * in_vector[i + j + 3]) >> scaling; 55 sum += (in_vector[j + 3] * in_vector[i + j + 3]) >> scaling;
57 } 56 }
58 for (; j < in_vector_length - i; j++) { 57 for (; j < in_vector_length - i; j++) {
59 sum += (in_vector[j] * in_vector[i + j]) >> scaling; 58 sum += (in_vector[j] * in_vector[i + j]) >> scaling;
60 } 59 }
61 *result++ = sum; 60 *result++ = sum;
62 } 61 }
63 62
64 *scale = scaling; 63 *scale = scaling;
65 return (int)(order + 1); 64 return order + 1;
66 } 65 }
OLDNEW
« no previous file with comments | « no previous file | webrtc/common_audio/signal_processing/include/signal_processing_library.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698