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

Side by Side Diff: webrtc/modules/audio_coding/codecs/ilbc/cb_mem_energy_calc.c

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, 4 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) 2011 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2011 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 /****************************************************************** 11 /******************************************************************
12 12
13 iLBC Speech Coder ANSI-C Source Code 13 iLBC Speech Coder ANSI-C Source Code
14 14
15 WebRtcIlbcfix_CbMemEnergyCalc.c 15 WebRtcIlbcfix_CbMemEnergyCalc.c
16 16
17 ******************************************************************/ 17 ******************************************************************/
18 18
19 #include "defines.h" 19 #include "defines.h"
20 20
21 /* Compute the energy of the rest of the cb memory 21 /* Compute the energy of the rest of the cb memory
22 * by step wise adding and subtracting the next 22 * by step wise adding and subtracting the next
23 * sample and the last sample respectively */ 23 * sample and the last sample respectively */
24 void WebRtcIlbcfix_CbMemEnergyCalc( 24 void WebRtcIlbcfix_CbMemEnergyCalc(
25 int32_t energy, /* (i) input start energy */ 25 int32_t energy, /* (i) input start energy */
26 int16_t range, /* (i) number of iterations */ 26 size_t range, /* (i) number of iterations */
27 int16_t *ppi, /* (i) input pointer 1 */ 27 int16_t *ppi, /* (i) input pointer 1 */
28 int16_t *ppo, /* (i) input pointer 2 */ 28 int16_t *ppo, /* (i) input pointer 2 */
29 int16_t *energyW16, /* (o) Energy in the CB vectors */ 29 int16_t *energyW16, /* (o) Energy in the CB vectors */
30 int16_t *energyShifts, /* (o) Shift value of the energy */ 30 int16_t *energyShifts, /* (o) Shift value of the energy */
31 int scale, /* (i) The scaling of all energy values */ 31 int scale, /* (i) The scaling of all energy values */
32 int16_t base_size /* (i) Index to where energy values should be stored */ 32 size_t base_size /* (i) Index to where energy values should be stored */
33 ) 33 )
34 { 34 {
35 int16_t j,shft; 35 size_t j;
36 int16_t shft;
36 int32_t tmp; 37 int32_t tmp;
37 int16_t *eSh_ptr; 38 int16_t *eSh_ptr;
38 int16_t *eW16_ptr; 39 int16_t *eW16_ptr;
39 40
40 41
41 eSh_ptr = &energyShifts[1+base_size]; 42 eSh_ptr = &energyShifts[1+base_size];
42 eW16_ptr = &energyW16[1+base_size]; 43 eW16_ptr = &energyW16[1+base_size];
43 44
44 for (j = 0; j + 1 < range; j++) { 45 for (j = 0; j + 1 < range; j++) {
45 46
46 /* Calculate next energy by a +/- 47 /* Calculate next energy by a +/-
47 operation on the edge samples */ 48 operation on the edge samples */
48 tmp = (*ppi) * (*ppi) - (*ppo) * (*ppo); 49 tmp = (*ppi) * (*ppi) - (*ppo) * (*ppo);
49 energy += tmp >> scale; 50 energy += tmp >> scale;
50 energy = WEBRTC_SPL_MAX(energy, 0); 51 energy = WEBRTC_SPL_MAX(energy, 0);
51 52
52 ppi--; 53 ppi--;
53 ppo--; 54 ppo--;
54 55
55 /* Normalize the energy into a int16_t and store 56 /* Normalize the energy into a int16_t and store
56 the number of shifts */ 57 the number of shifts */
57 58
58 shft = (int16_t)WebRtcSpl_NormW32(energy); 59 shft = (int16_t)WebRtcSpl_NormW32(energy);
59 *eSh_ptr++ = shft; 60 *eSh_ptr++ = shft;
60 61
61 tmp = energy << shft; 62 tmp = energy << shft;
62 *eW16_ptr++ = (int16_t)(tmp >> 16); 63 *eW16_ptr++ = (int16_t)(tmp >> 16);
63 } 64 }
64 } 65 }
OLDNEW
« no previous file with comments | « webrtc/modules/audio_coding/codecs/ilbc/cb_mem_energy_calc.h ('k') | webrtc/modules/audio_coding/codecs/ilbc/cb_search.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698