| Index: webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.c
|
| diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.c b/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.c
|
| index f1e5cd0cf5cb092601663382c7befcd8070298f7..dcfee23b1f4989fef342776507bc200085d5f021 100644
|
| --- a/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.c
|
| +++ b/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.c
|
| @@ -619,9 +619,9 @@ int16_t WebRtcIsacfix_DecoderInit(ISACFIX_MainStruct *ISAC_main_inst)
|
|
|
| int16_t WebRtcIsacfix_UpdateBwEstimate1(ISACFIX_MainStruct *ISAC_main_inst,
|
| const uint8_t* encoded,
|
| - int32_t packet_size,
|
| - uint16_t rtp_seq_number,
|
| - uint32_t arr_ts)
|
| + int32_t packet_size,
|
| + uint16_t rtp_seq_number,
|
| + uint32_t arr_ts)
|
| {
|
| ISACFIX_SubStruct *ISAC_inst;
|
| Bitstr_dec streamdata;
|
| @@ -691,10 +691,10 @@ int16_t WebRtcIsacfix_UpdateBwEstimate1(ISACFIX_MainStruct *ISAC_main_inst,
|
|
|
| int16_t WebRtcIsacfix_UpdateBwEstimate(ISACFIX_MainStruct *ISAC_main_inst,
|
| const uint8_t* encoded,
|
| - int32_t packet_size,
|
| - uint16_t rtp_seq_number,
|
| - uint32_t send_ts,
|
| - uint32_t arr_ts)
|
| + int32_t packet_size,
|
| + uint16_t rtp_seq_number,
|
| + uint32_t send_ts,
|
| + uint32_t arr_ts)
|
| {
|
| ISACFIX_SubStruct *ISAC_inst;
|
| Bitstr_dec streamdata;
|
| @@ -766,11 +766,11 @@ int16_t WebRtcIsacfix_UpdateBwEstimate(ISACFIX_MainStruct *ISAC_main_inst,
|
| */
|
|
|
|
|
| -int WebRtcIsacfix_Decode(ISACFIX_MainStruct *ISAC_main_inst,
|
| +int WebRtcIsacfix_Decode(ISACFIX_MainStruct* ISAC_main_inst,
|
| const uint8_t* encoded,
|
| - int16_t len,
|
| - int16_t *decoded,
|
| - int16_t *speechType)
|
| + int16_t len,
|
| + int16_t* decoded,
|
| + int16_t* speechType)
|
| {
|
| ISACFIX_SubStruct *ISAC_inst;
|
| /* number of samples (480 or 960), output from decoder */
|
| @@ -980,9 +980,8 @@ int16_t WebRtcIsacfix_DecodePlcNb(ISACFIX_MainStruct *ISAC_main_inst,
|
| declen = 0;
|
| while( noOfLostFrames > 0 )
|
| {
|
| - ok = WebRtcIsacfix_DecodePlcImpl( outframeWB, &ISAC_inst->ISACdec_obj, &no_of_samples );
|
| - if(ok)
|
| - return -1;
|
| + WebRtcIsacfix_DecodePlcImpl(outframeWB, &ISAC_inst->ISACdec_obj,
|
| + &no_of_samples);
|
|
|
| WebRtcIsacfix_SplitAndFilter2(outframeWB, &(outframeNB[k*240]), dummy, &ISAC_inst->ISACdec_obj.decimatorstr_obj);
|
|
|
| @@ -1028,7 +1027,7 @@ int16_t WebRtcIsacfix_DecodePlc(ISACFIX_MainStruct *ISAC_main_inst,
|
| int16_t noOfLostFrames)
|
| {
|
|
|
| - int16_t no_of_samples, declen, k, ok;
|
| + int16_t no_of_samples, declen, k;
|
| int16_t outframe16[MAX_FRAMESAMPLES];
|
|
|
| ISACFIX_SubStruct *ISAC_inst;
|
| @@ -1043,9 +1042,8 @@ int16_t WebRtcIsacfix_DecodePlc(ISACFIX_MainStruct *ISAC_main_inst,
|
| declen = 0;
|
| while( noOfLostFrames > 0 )
|
| {
|
| - ok = WebRtcIsacfix_DecodePlcImpl( &(outframe16[k*480]), &ISAC_inst->ISACdec_obj, &no_of_samples );
|
| - if(ok)
|
| - return -1;
|
| + WebRtcIsacfix_DecodePlcImpl(&(outframe16[k*480]), &ISAC_inst->ISACdec_obj,
|
| + &no_of_samples);
|
| declen += no_of_samples;
|
| noOfLostFrames--;
|
| k++;
|
|
|