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

Side by Side Diff: webrtc/modules/audio_coding/codecs/isac/fix/source/structs.h

Issue 1227163003: 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, 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
(...skipping 16 matching lines...) Expand all
27 /* Bitstream struct for decoder */ 27 /* Bitstream struct for decoder */
28 typedef struct Bitstreamstruct_dec { 28 typedef struct Bitstreamstruct_dec {
29 29
30 uint16_t stream[INTERNAL_STREAM_SIZE_W16]; /* Array bytestream to decode */ 30 uint16_t stream[INTERNAL_STREAM_SIZE_W16]; /* Array bytestream to decode */
31 uint32_t W_upper; /* Upper boundary of interval W */ 31 uint32_t W_upper; /* Upper boundary of interval W */
32 uint32_t streamval; 32 uint32_t streamval;
33 uint16_t stream_index; /* Index to the current position in bytestream */ 33 uint16_t stream_index; /* Index to the current position in bytestream */
34 int16_t full; /* 0 - first byte in memory filled, second empty*/ 34 int16_t full; /* 0 - first byte in memory filled, second empty*/
35 /* 1 - both bytes are empty (we just filled the previous memory */ 35 /* 1 - both bytes are empty (we just filled the previous memory */
36 36
37 int stream_size; /* The size of stream. */ 37 size_t stream_size; /* The size of stream in bytes. */
38 } Bitstr_dec; 38 } Bitstr_dec;
39 39
40 /* Bitstream struct for encoder */ 40 /* Bitstream struct for encoder */
41 typedef struct Bitstreamstruct_enc { 41 typedef struct Bitstreamstruct_enc {
42 42
43 uint16_t stream[STREAM_MAXW16_60MS]; /* Vector for adding encoded bytestrea m */ 43 uint16_t stream[STREAM_MAXW16_60MS]; /* Vector for adding encoded bytestrea m */
44 uint32_t W_upper; /* Upper boundary of interval W */ 44 uint32_t W_upper; /* Upper boundary of interval W */
45 uint32_t streamval; 45 uint32_t streamval;
46 uint16_t stream_index; /* Index to the current position in bytestream */ 46 uint16_t stream_index; /* Index to the current position in bytestream */
47 int16_t full; /* 0 - first byte in memory filled, second empty*/ 47 int16_t full; /* 0 - first byte in memory filled, second empty*/
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 int16_t AvgPitchGain_Q12; 171 int16_t AvgPitchGain_Q12;
172 int16_t lastPitchGain_Q12; 172 int16_t lastPitchGain_Q12;
173 int16_t lastPitchLag_Q7; 173 int16_t lastPitchLag_Q7;
174 174
175 /* --- Add-overlap in recovery packet --- */ 175 /* --- Add-overlap in recovery packet --- */
176 int16_t overlapLP[ RECOVERY_OVERLAP ]; // [FRAMESAMPLES/2]; sa ved 160 176 int16_t overlapLP[ RECOVERY_OVERLAP ]; // [FRAMESAMPLES/2]; sa ved 160
177 177
178 int16_t pitchCycles; 178 int16_t pitchCycles;
179 int16_t A; 179 int16_t A;
180 int16_t B; 180 int16_t B;
181 int16_t pitchIndex; 181 size_t pitchIndex;
182 int16_t stretchLag; 182 size_t stretchLag;
183 int16_t *prevPitchLP; // [ FRAMESAMPLES/2 ]; saved 240 183 int16_t *prevPitchLP; // [ FRAMESAMPLES/2 ]; saved 240
184 int16_t seed; 184 int16_t seed;
185 185
186 int16_t std; 186 int16_t std;
187 } PLCstr; 187 } PLCstr;
188 188
189 189
190 190
191 /* Have instance of struct together with other iSAC structs */ 191 /* Have instance of struct together with other iSAC structs */
192 typedef struct { 192 typedef struct {
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
373 int16_t full; /* 0 - first byte in memory filled, second empty*/ 373 int16_t full; /* 0 - first byte in memory filled, second empty*/
374 /* 1 - both bytes are empty (we just filled the previous memory */ 374 /* 1 - both bytes are empty (we just filled the previous memory */
375 uint16_t beforeLastWord; 375 uint16_t beforeLastWord;
376 uint16_t lastWord; 376 uint16_t lastWord;
377 } transcode_obj; 377 } transcode_obj;
378 378
379 379
380 //Bitstr_enc myBitStr; 380 //Bitstr_enc myBitStr;
381 381
382 #endif /* WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_STRUCTS_H_ */ 382 #endif /* WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_STRUCTS_H_ */
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698