| Index: webrtc/modules/audio_coding/codecs/isac/main/source/codec.h
|
| diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/codec.h b/webrtc/modules/audio_coding/codecs/isac/main/source/codec.h
|
| index b7319b9ec3781ddb600f9976150bb35702f9122a..4b36fffed686b3154ebdd1c53ee7e9354b31150e 100644
|
| --- a/webrtc/modules/audio_coding/codecs/isac/main/source/codec.h
|
| +++ b/webrtc/modules/audio_coding/codecs/isac/main/source/codec.h
|
| @@ -31,16 +31,20 @@ int WebRtcIsac_EstimateBandwidth(BwEstimatorstr* bwest_str, Bitstr* streamdata,
|
| enum IsacSamplingRate encoderSampRate,
|
| enum IsacSamplingRate decoderSampRate);
|
|
|
| -int WebRtcIsac_DecodeLb(float* signal_out, ISACLBDecStruct* ISACdec_obj,
|
| +int WebRtcIsac_DecodeLb(const TransformTables* transform_tables,
|
| + float* signal_out,
|
| + ISACLBDecStruct* ISACdec_obj,
|
| int16_t* current_framesamples,
|
| int16_t isRCUPayload);
|
|
|
| int WebRtcIsac_DecodeRcuLb(float* signal_out, ISACLBDecStruct* ISACdec_obj,
|
| int16_t* current_framesamples);
|
|
|
| -int WebRtcIsac_EncodeLb(float* in, ISACLBEncStruct* ISACencLB_obj,
|
| - int16_t codingMode, int16_t
|
| - bottleneckIndex);
|
| +int WebRtcIsac_EncodeLb(const TransformTables* transform_tables,
|
| + float* in,
|
| + ISACLBEncStruct* ISACencLB_obj,
|
| + int16_t codingMode,
|
| + int16_t bottleneckIndex);
|
|
|
| int WebRtcIsac_EncodeStoredDataLb(const IsacSaveEncoderData* ISACSavedEnc_obj,
|
| Bitstr* ISACBitStr_obj, int BWnumber,
|
| @@ -93,10 +97,11 @@ int16_t WebRtcIsac_RateAllocation(int32_t inRateBitPerSec,
|
| * Return value : >0 number of decoded bytes.
|
| * <0 if an error occurred.
|
| */
|
| -int WebRtcIsac_DecodeUb16(float* signal_out, ISACUBDecStruct* ISACdec_obj,
|
| +int WebRtcIsac_DecodeUb16(const TransformTables* transform_tables,
|
| + float* signal_out,
|
| + ISACUBDecStruct* ISACdec_obj,
|
| int16_t isRCUPayload);
|
|
|
| -
|
| /******************************************************************************
|
| * WebRtcIsac_DecodeUb12()
|
| *
|
| @@ -112,10 +117,11 @@ int WebRtcIsac_DecodeUb16(float* signal_out, ISACUBDecStruct* ISACdec_obj,
|
| * Return value : >0 number of decoded bytes.
|
| * <0 if an error occurred.
|
| */
|
| -int WebRtcIsac_DecodeUb12(float* signal_out, ISACUBDecStruct* ISACdec_obj,
|
| +int WebRtcIsac_DecodeUb12(const TransformTables* transform_tables,
|
| + float* signal_out,
|
| + ISACUBDecStruct* ISACdec_obj,
|
| int16_t isRCUPayload);
|
|
|
| -
|
| /******************************************************************************
|
| * WebRtcIsac_EncodeUb16()
|
| *
|
| @@ -131,10 +137,11 @@ int WebRtcIsac_DecodeUb12(float* signal_out, ISACUBDecStruct* ISACdec_obj,
|
| * Return value : >0 number of encoded bytes.
|
| * <0 if an error occurred.
|
| */
|
| -int WebRtcIsac_EncodeUb16(float* in, ISACUBEncStruct* ISACenc_obj,
|
| +int WebRtcIsac_EncodeUb16(const TransformTables* transform_tables,
|
| + float* in,
|
| + ISACUBEncStruct* ISACenc_obj,
|
| int32_t jitterInfo);
|
|
|
| -
|
| /******************************************************************************
|
| * WebRtcIsac_EncodeUb12()
|
| *
|
| @@ -150,7 +157,9 @@ int WebRtcIsac_EncodeUb16(float* in, ISACUBEncStruct* ISACenc_obj,
|
| * Return value : >0 number of encoded bytes.
|
| * <0 if an error occurred.
|
| */
|
| -int WebRtcIsac_EncodeUb12(float* in, ISACUBEncStruct* ISACenc_obj,
|
| +int WebRtcIsac_EncodeUb12(const TransformTables* transform_tables,
|
| + float* in,
|
| + ISACUBEncStruct* ISACenc_obj,
|
| int32_t jitterInfo);
|
|
|
| /************************** initialization functions *************************/
|
| @@ -168,14 +177,21 @@ void WebRtcIsac_InitPitchAnalysis(PitchAnalysisStruct* State);
|
|
|
| /**************************** transform functions ****************************/
|
|
|
| -void WebRtcIsac_InitTransform();
|
| -
|
| -void WebRtcIsac_Time2Spec(double* inre1, double* inre2, int16_t* outre,
|
| - int16_t* outim, FFTstr* fftstr_obj);
|
| -
|
| -void WebRtcIsac_Spec2time(double* inre, double* inim, double* outre1,
|
| - double* outre2, FFTstr* fftstr_obj);
|
| -
|
| +void WebRtcIsac_InitTransform(TransformTables* tables);
|
| +
|
| +void WebRtcIsac_Time2Spec(const TransformTables* tables,
|
| + double* inre1,
|
| + double* inre2,
|
| + int16_t* outre,
|
| + int16_t* outim,
|
| + FFTstr* fftstr_obj);
|
| +
|
| +void WebRtcIsac_Spec2time(const TransformTables* tables,
|
| + double* inre,
|
| + double* inim,
|
| + double* outre1,
|
| + double* outre2,
|
| + FFTstr* fftstr_obj);
|
|
|
| /******************************* filter functions ****************************/
|
|
|
|
|