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

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

Issue 1908623002: Avoiding overflow in cross correlation in NetEq. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: on comments Created 4 years, 8 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/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 #include <assert.h>
14
13 /* C version of WebRtcSpl_CrossCorrelation() for generic platforms. */ 15 /* C version of WebRtcSpl_CrossCorrelation() for generic platforms. */
14 void WebRtcSpl_CrossCorrelationC(int32_t* cross_correlation, 16 void WebRtcSpl_CrossCorrelationC(int32_t* cross_correlation,
15 const int16_t* seq1, 17 const int16_t* seq1,
16 const int16_t* seq2, 18 const int16_t* seq2,
17 size_t dim_seq, 19 size_t dim_seq,
18 size_t dim_cross_correlation, 20 size_t dim_cross_correlation,
19 int right_shifts, 21 int right_shifts,
20 int step_seq2) { 22 int step_seq2) {
21 size_t i = 0, j = 0; 23 size_t i = 0, j = 0;
22 24
23 for (i = 0; i < dim_cross_correlation; i++) { 25 for (i = 0; i < dim_cross_correlation; i++) {
24 int32_t corr = 0; 26 int32_t corr = 0;
25 for (j = 0; j < dim_seq; j++) 27 for (j = 0; j < dim_seq; j++) {
26 corr += (seq1[j] * seq2[j]) >> right_shifts; 28 int32_t old = corr;
29 int32_t add = seq1[j] * seq2[j];
30 corr += add >> right_shifts;
31 assert((add >= 0 && corr >= old) || (add < 0 && corr < old));
32 }
27 seq2 += step_seq2; 33 seq2 += step_seq2;
28 *cross_correlation++ = corr; 34 *cross_correlation++ = corr;
29 } 35 }
30 } 36 }
OLDNEW
« no previous file with comments | « no previous file | webrtc/modules/audio_coding/neteq/expand.h » ('j') | webrtc/modules/audio_coding/neteq/expand.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698