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

Side by Side Diff: webrtc/modules/audio_coding/codecs/isac/fix/source/encode.c

Issue 1168753002: Match existing type usage better. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Resync Created 5 years, 6 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 480 matching lines...) Expand 10 before | Expand all | Expand 10 after
491 /* This function is used to create a new bitstream with new BWE. 491 /* This function is used to create a new bitstream with new BWE.
492 The same data as previously encoded with the fucntion WebRtcIsacfix_EncodeImp l() 492 The same data as previously encoded with the fucntion WebRtcIsacfix_EncodeImp l()
493 is used. The data needed is taken from the struct, where it was stored 493 is used. The data needed is taken from the struct, where it was stored
494 when calling the encoder. */ 494 when calling the encoder. */
495 int WebRtcIsacfix_EncodeStoredData(IsacFixEncoderInstance *ISACenc_obj, 495 int WebRtcIsacfix_EncodeStoredData(IsacFixEncoderInstance *ISACenc_obj,
496 int BWnumber, 496 int BWnumber,
497 float scale) 497 float scale)
498 { 498 {
499 int ii; 499 int ii;
500 int status; 500 int status;
501 int16_t BWno = BWnumber; 501 int16_t BWno = (int16_t)BWnumber;
502 int stream_length = 0; 502 int stream_length = 0;
503 503
504 int16_t model; 504 int16_t model;
505 const uint16_t *Q_PitchGain_cdf_ptr[1]; 505 const uint16_t *Q_PitchGain_cdf_ptr[1];
506 const uint16_t **cdf; 506 const uint16_t **cdf;
507 const IsacSaveEncoderData *SaveEnc_str; 507 const IsacSaveEncoderData *SaveEnc_str;
508 int32_t tmpLPCcoeffs_g[KLT_ORDER_GAIN<<1]; 508 int32_t tmpLPCcoeffs_g[KLT_ORDER_GAIN<<1];
509 int16_t tmpLPCindex_g[KLT_ORDER_GAIN<<1]; 509 int16_t tmpLPCindex_g[KLT_ORDER_GAIN<<1];
510 int16_t tmp_fre[FRAMESAMPLES]; 510 int16_t tmp_fre[FRAMESAMPLES];
511 int16_t tmp_fim[FRAMESAMPLES]; 511 int16_t tmp_fim[FRAMESAMPLES];
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
626 if (status < 0) { 626 if (status < 0) {
627 return status; 627 return status;
628 } 628 }
629 } 629 }
630 630
631 /* complete arithmetic coding */ 631 /* complete arithmetic coding */
632 stream_length = WebRtcIsacfix_EncTerminate(&ISACenc_obj->bitstr_obj); 632 stream_length = WebRtcIsacfix_EncTerminate(&ISACenc_obj->bitstr_obj);
633 633
634 return stream_length; 634 return stream_length;
635 } 635 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698