From 50048d67d79680f1abbaae8dd18064ca66889459 Mon Sep 17 00:00:00 2001 From: Arash Azizi Date: Thu, 5 Feb 2026 09:08:59 +0000 Subject: [PATCH] Revert "Merge branch..." This reverts merge request !2791 --- lib_com/options.h | 2 +- lib_com/parameter_bitmaping_fx.c | 7 -- lib_com/prot_fx.h | 30 ++------ lib_dec/dec_prm_fx.c | 17 +---- lib_dec/dec_tcx_fx.c | 2 +- lib_dec/tns_base_dec_fx.c | 117 ------------------------------- 6 files changed, 10 insertions(+), 165 deletions(-) diff --git a/lib_com/options.h b/lib_com/options.h index 400b3fa16..0ea316a82 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -109,7 +109,7 @@ #define FIX_2391_INIT_HQ_GENERIC_OFFSET /* FhG/Eri: basop issue 2391: make sure hq_generic_offset is initialized inside hq_hr_dec_fx() */ #define FIX_2397_COPY_AQ_MDCT_CORE_BFI /* FhG: prevent copying of uninit memory in MDCT stereo core if bfi is set */ #define HARMONIZE_TBE /* VA: harmonize core-coder TBE function duplications */ -#define HARMONIZE_READ_DECODE_TNS /* FhG: issue 2389: Harmonization of two pairs ReadTnsData() and DecodeTnsData()*/ + /* #################### End BE switches ################################## */ /* #################### Start NON-BE switches ############################ */ diff --git a/lib_com/parameter_bitmaping_fx.c b/lib_com/parameter_bitmaping_fx.c index 5a2f8ccfe..4225879e6 100644 --- a/lib_com/parameter_bitmaping_fx.c +++ b/lib_com/parameter_bitmaping_fx.c @@ -228,15 +228,8 @@ void SetParameters_fx( IF( s_and( param->pSubParamBitMap != NULL, value > 0 ) ) { pTmp = pParameter; -#ifdef HARMONIZE_READ_DECODE_TNS if ( pSubStruct != NULL ) - { pTmp = pSubStruct; - } -#else - if ( pSubStruct != NULL ) - pTmp = pSubStruct; -#endif SetParameters( param->pSubParamBitMap, value, pTmp, pStream, pnSize ); } } diff --git a/lib_com/prot_fx.h b/lib_com/prot_fx.h index baa38d4cf..c45c2a749 100644 --- a/lib_com/prot_fx.h +++ b/lib_com/prot_fx.h @@ -8375,21 +8375,7 @@ void tcx_hm_modify_envelope( Word32 env[], /* i/o: envelope Q16 */ Word16 L_frame /* i: number of spectral lines Q0 */ ); -#ifdef HARMONIZE_READ_DECODE_TNS -Word16 ReadTnsData( - STnsConfig const *pTnsConfig, - Decoder_State *st, - Word16 *pnBits, - Word16 *stream, - Word16 *pnSize ); -Word16 DecodeTnsData( - STnsConfig const *pTnsConfig, - Word16 const *stream, /*Q0*/ - Word16 *pnSize, /*Q0*/ - STnsData *pTnsData ); - -#else Word16 ReadTnsData( STnsConfig const *pTnsConfig, Decoder_State *st, @@ -8416,7 +8402,6 @@ Word16 DecodeTnsData_ivas_fx( Word16 *pnSize, STnsData *pTnsData ); -#endif void GetParameters( ParamsBitMap const *paramsBitMap, const Word16 nParams, @@ -11077,6 +11062,12 @@ void EncodeTnsData( Word16 *pnBits /* o : number of written bits */ ); +Word16 DecodeTnsData_ivas( + STnsConfig const *pTnsConfig, + const Word16 *stream, + Word16 *pnSize, + STnsData *pTnsData ); + void WriteTnsData( const STnsConfig *pTnsConfig, /* i : TNS Configuration struct */ const Word16 *stream, /* i : internal data stream */ @@ -11084,7 +11075,7 @@ void WriteTnsData( BSTR_ENC_HANDLE hBstr, /* o : bitstream */ Word16 *pnBits /* o : number of written bits */ ); -#ifndef HARMONIZE_READ_DECODE_TNS + void ReadTnsData_ivas( STnsConfig const *pTnsConfig, Decoder_State *st, @@ -11092,13 +11083,6 @@ void ReadTnsData_ivas( Word16 *stream, Word16 *pnSize ); -Word16 DecodeTnsData_ivas( - STnsConfig const *pTnsConfig, - const Word16 *stream, - Word16 *pnSize, - STnsData *pTnsData ); - -#endif // HARMONIZE_READ_DECODE_TNS void analysisCldfbEncoder_ivas_fx( Encoder_State *st, /* i/o: encoder state structure */ Word32 *timeIn, /*q11*/ diff --git a/lib_dec/dec_prm_fx.c b/lib_dec/dec_prm_fx.c index 853ac4222..41a2e9842 100644 --- a/lib_dec/dec_prm_fx.c +++ b/lib_dec/dec_prm_fx.c @@ -394,13 +394,7 @@ void getTCXparam_fx( } ELSE { -#ifdef HARMONIZE_READ_DECODE_TNS - - (void) ReadTnsData( st->hTcxCfg->pCurrentTnsConfig, st0, &nTnsBits, prm + j, &nTnsParams ); -#else - ReadTnsData_ivas_fx( st->hTcxCfg->pCurrentTnsConfig, st0, &nTnsBits, prm + j, &nTnsParams ); -#endif // HARMONIZE_READ_DECODE_TNS } hTcxDec->tnsActive[k] = 0; // Q0 move16(); @@ -1357,11 +1351,7 @@ void dec_prm_fx( IF( st->hTcxCfg->fIsTNSAllowed ) { 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 ); -#else ReadTnsData( st->hTcxCfg->pCurrentTnsConfig, st, &nTnsBits, prm + j, &nTnsParams ); -#endif // HARMONIZE_READ_DECODE_TNS j = add( j, nTnsParams ); // Q0 } @@ -1685,13 +1675,8 @@ void dec_prm_fx( test(); 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 ); -#else - ReadTnsData( st->hTcxCfg->pCurrentTnsConfig, st, &nTnsBits, prm + j, &nTnsParams ); -#endif // DEBUG - + ReadTnsData( st->hTcxCfg->pCurrentTnsConfig, st, &nTnsBits, prm + j, &nTnsParams ); j = add( j, nTnsParams ); } diff --git a/lib_dec/dec_tcx_fx.c b/lib_dec/dec_tcx_fx.c index 534d34275..ed170d598 100644 --- a/lib_dec/dec_tcx_fx.c +++ b/lib_dec/dec_tcx_fx.c @@ -4204,7 +4204,7 @@ void decoder_tcx_invQ_fx( test(); IF( !bfi && hTcxCfg->fIsTNSAllowed ) { - *fUseTns = DecodeTnsData( hTcxCfg->pCurrentTnsConfig, prm_tns, &tnsSize, tnsData ); + *fUseTns = DecodeTnsData_ivas_fx( hTcxCfg->pCurrentTnsConfig, prm_tns, &tnsSize, tnsData ); move16(); } ELSE diff --git a/lib_dec/tns_base_dec_fx.c b/lib_dec/tns_base_dec_fx.c index 42fd51df7..e245a4674 100644 --- a/lib_dec/tns_base_dec_fx.c +++ b/lib_dec/tns_base_dec_fx.c @@ -21,120 +21,6 @@ typedef Word32 ( *TLinearPredictionFilter )( Word16 order, Word16 const parCoeff /********************************/ /* Interface functions */ /********************************/ - - -#ifdef HARMONIZE_READ_DECODE_TNS -/*---------------------------------------------------------------------* - * ReadTnsData() - * - * - *---------------------------------------------------------------------*/ -Word16 ReadTnsData( - STnsConfig const *pTnsConfig, - Decoder_State *st, - Word16 *pnBits, /*Q0*/ - Word16 *stream, /*Q0*/ - Word16 *pnSize /*Q0*/ -) -{ - Word16 start_bit_pos; - - move16(); - start_bit_pos = st->next_bit_pos; - - IF( GT_16( pTnsConfig->nMaxFilters, 1 ) ) - { - IF( pTnsConfig->allowTnsOnWhite ) - { - IF( LT_16( pTnsConfig->iFilterBorders[0], 512 ) ) - { - ReadFromBitstream_fx( &tnsEnabledOnWhiteSWBTCX10BitMap, 1, st, &stream, pnSize ); - } - ELSE - { - ReadFromBitstream_fx( &tnsEnabledOnWhiteSWBTCX20BitMap, 1, st, &stream, pnSize ); - } - } - ELSE - { - - IF( LT_16( pTnsConfig->iFilterBorders[0], 512 ) ) - { - ReadFromBitstream_fx( &tnsEnabledSWBTCX10BitMap, 1, st, &stream, pnSize ); - } - ELSE - { - ReadFromBitstream_fx( &tnsEnabledSWBTCX20BitMap, 1, st, &stream, pnSize ); - } - } - } - ELSE - { - ReadFromBitstream_fx( &tnsEnabledWBTCX20BitMap, 1, st, &stream, pnSize ); - } - - move16(); - *pnBits = sub( st->next_bit_pos, start_bit_pos ); - - return TNS_NO_ERROR; -} -/*---------------------------------------------------------------------* - * DecodeTnsData() - * - * - *---------------------------------------------------------------------*/ -Word16 DecodeTnsData( - STnsConfig const *pTnsConfig, - Word16 const *stream, /*Q0*/ - Word16 *pnSize, /*Q0*/ - STnsData *pTnsData ) -{ - Word16 result; - - ResetTnsData( pTnsData ); - - IF( GT_16( pTnsConfig->nMaxFilters, 1 ) ) - { - - IF( pTnsConfig->allowTnsOnWhite ) - { - IF( LT_16( pTnsConfig->iFilterBorders[0], 512 ) ) - { - SetParameters_fx( &tnsEnabledOnWhiteSWBTCX10BitMap, 1, pTnsData, &stream, pnSize ); - } - ELSE - { - SetParameters_fx( &tnsEnabledOnWhiteSWBTCX20BitMap, 1, pTnsData, &stream, pnSize ); - } - } - ELSE - { - - IF( LT_16( pTnsConfig->iFilterBorders[0], 512 ) ) - { - SetParameters_fx( &tnsEnabledSWBTCX10BitMap, 1, pTnsData, &stream, pnSize ); - } - ELSE - { - SetParameters_fx( &tnsEnabledSWBTCX20BitMap, 1, pTnsData, &stream, pnSize ); - } - } - } - ELSE - { - SetParameters_fx( &tnsEnabledWBTCX20BitMap, 1, pTnsData, &stream, pnSize ); - } - - move16(); - result = FALSE; - if ( pTnsData->nFilters > 0 ) - { - move16(); - result = TRUE; - } - return result; -} -#else /*---------------------------------------------------------------------* * ReadTnsData() * @@ -330,6 +216,3 @@ Word16 DecodeTnsData_ivas_fx( return result; } - - -#endif // HARMONIZE_READ_DECODE_TNS -- GitLab