Loading lib_com/prot_fx.h +2 −2 Original line number Diff line number Diff line Loading @@ -8376,14 +8376,14 @@ void tcx_hm_modify_envelope( Word16 L_frame /* i: number of spectral lines Q0 */ ); #ifdef HARMONIZE_READ_DECODE_TNS Word16 ReadTnsData( Word16 ReadTnsData_fx( STnsConfig const *pTnsConfig, Decoder_State *st, Word16 *pnBits, Word16 *stream, Word16 *pnSize ); Word16 DecodeTnsData( Word16 DecodeTnsData_fx( STnsConfig const *pTnsConfig, Word16 const *stream, /*Q0*/ Word16 *pnSize, /*Q0*/ Loading lib_dec/dec_prm_fx.c +3 −3 Original line number Diff line number Diff line Loading @@ -396,7 +396,7 @@ void getTCXparam_fx( { #ifdef HARMONIZE_READ_DECODE_TNS (void) ReadTnsData( st->hTcxCfg->pCurrentTnsConfig, st0, &nTnsBits, prm + j, &nTnsParams ); (void) ReadTnsData_fx( st->hTcxCfg->pCurrentTnsConfig, st0, &nTnsBits, prm + j, &nTnsParams ); #else ReadTnsData_ivas_fx( st->hTcxCfg->pCurrentTnsConfig, st0, &nTnsBits, prm + j, &nTnsParams ); Loading Loading @@ -1358,7 +1358,7 @@ void dec_prm_fx( { SetTnsConfig( st->hTcxCfg, 1, (Word16) EQ_16( st->last_core_from_bs, ACELP_CORE ) ); #ifdef HARMONIZE_READ_DECODE_TNS (void) ReadTnsData( st->hTcxCfg->pCurrentTnsConfig, st, &nTnsBits, prm + j, &nTnsParams ); (void) ReadTnsData_fx( st->hTcxCfg->pCurrentTnsConfig, st, &nTnsBits, prm + j, &nTnsParams ); #else ReadTnsData( st->hTcxCfg->pCurrentTnsConfig, st, &nTnsBits, prm + j, &nTnsParams ); #endif // HARMONIZE_READ_DECODE_TNS Loading Loading @@ -1686,7 +1686,7 @@ void dec_prm_fx( test(); SetTnsConfig( st->hTcxCfg, 0, ( st->last_core_from_bs == ACELP_CORE ) && ( k == 0 ) ); #ifdef HARMONIZE_READ_DECODE_TNS (void) ReadTnsData( st->hTcxCfg->pCurrentTnsConfig, st, &nTnsBits, prm + j, &nTnsParams ); (void) ReadTnsData_fx( st->hTcxCfg->pCurrentTnsConfig, st, &nTnsBits, prm + j, &nTnsParams ); #else ReadTnsData( st->hTcxCfg->pCurrentTnsConfig, st, &nTnsBits, prm + j, &nTnsParams ); #endif // DEBUG Loading lib_dec/tns_base_dec_fx.c +2 −2 Original line number Diff line number Diff line Loading @@ -29,7 +29,7 @@ typedef Word32 ( *TLinearPredictionFilter )( Word16 order, Word16 const parCoeff * * *---------------------------------------------------------------------*/ Word16 ReadTnsData( Word16 ReadTnsData_fx( STnsConfig const *pTnsConfig, Decoder_State *st, Word16 *pnBits, /*Q0*/ Loading Loading @@ -83,7 +83,7 @@ Word16 ReadTnsData( * * *---------------------------------------------------------------------*/ Word16 DecodeTnsData( Word16 DecodeTnsData_fx( STnsConfig const *pTnsConfig, Word16 const *stream, /*Q0*/ Word16 *pnSize, /*Q0*/ Loading Loading
lib_com/prot_fx.h +2 −2 Original line number Diff line number Diff line Loading @@ -8376,14 +8376,14 @@ void tcx_hm_modify_envelope( Word16 L_frame /* i: number of spectral lines Q0 */ ); #ifdef HARMONIZE_READ_DECODE_TNS Word16 ReadTnsData( Word16 ReadTnsData_fx( STnsConfig const *pTnsConfig, Decoder_State *st, Word16 *pnBits, Word16 *stream, Word16 *pnSize ); Word16 DecodeTnsData( Word16 DecodeTnsData_fx( STnsConfig const *pTnsConfig, Word16 const *stream, /*Q0*/ Word16 *pnSize, /*Q0*/ Loading
lib_dec/dec_prm_fx.c +3 −3 Original line number Diff line number Diff line Loading @@ -396,7 +396,7 @@ void getTCXparam_fx( { #ifdef HARMONIZE_READ_DECODE_TNS (void) ReadTnsData( st->hTcxCfg->pCurrentTnsConfig, st0, &nTnsBits, prm + j, &nTnsParams ); (void) ReadTnsData_fx( st->hTcxCfg->pCurrentTnsConfig, st0, &nTnsBits, prm + j, &nTnsParams ); #else ReadTnsData_ivas_fx( st->hTcxCfg->pCurrentTnsConfig, st0, &nTnsBits, prm + j, &nTnsParams ); Loading Loading @@ -1358,7 +1358,7 @@ void dec_prm_fx( { SetTnsConfig( st->hTcxCfg, 1, (Word16) EQ_16( st->last_core_from_bs, ACELP_CORE ) ); #ifdef HARMONIZE_READ_DECODE_TNS (void) ReadTnsData( st->hTcxCfg->pCurrentTnsConfig, st, &nTnsBits, prm + j, &nTnsParams ); (void) ReadTnsData_fx( st->hTcxCfg->pCurrentTnsConfig, st, &nTnsBits, prm + j, &nTnsParams ); #else ReadTnsData( st->hTcxCfg->pCurrentTnsConfig, st, &nTnsBits, prm + j, &nTnsParams ); #endif // HARMONIZE_READ_DECODE_TNS Loading Loading @@ -1686,7 +1686,7 @@ void dec_prm_fx( test(); SetTnsConfig( st->hTcxCfg, 0, ( st->last_core_from_bs == ACELP_CORE ) && ( k == 0 ) ); #ifdef HARMONIZE_READ_DECODE_TNS (void) ReadTnsData( st->hTcxCfg->pCurrentTnsConfig, st, &nTnsBits, prm + j, &nTnsParams ); (void) ReadTnsData_fx( st->hTcxCfg->pCurrentTnsConfig, st, &nTnsBits, prm + j, &nTnsParams ); #else ReadTnsData( st->hTcxCfg->pCurrentTnsConfig, st, &nTnsBits, prm + j, &nTnsParams ); #endif // DEBUG Loading
lib_dec/tns_base_dec_fx.c +2 −2 Original line number Diff line number Diff line Loading @@ -29,7 +29,7 @@ typedef Word32 ( *TLinearPredictionFilter )( Word16 order, Word16 const parCoeff * * *---------------------------------------------------------------------*/ Word16 ReadTnsData( Word16 ReadTnsData_fx( STnsConfig const *pTnsConfig, Decoder_State *st, Word16 *pnBits, /*Q0*/ Loading Loading @@ -83,7 +83,7 @@ Word16 ReadTnsData( * * *---------------------------------------------------------------------*/ Word16 DecodeTnsData( Word16 DecodeTnsData_fx( STnsConfig const *pTnsConfig, Word16 const *stream, /*Q0*/ Word16 *pnSize, /*Q0*/ Loading