Commit 896c25a3 authored by multrus's avatar multrus
Browse files

[cleanup] accept HARMONIZE_ISSUE_2435_WRITETNSDATA

parent 05b3a000

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -83,7 +83,6 @@ 
#define FIX_1990_SANITIZER_IN_REVERB_LOAD               /* Nokia: Fix issue part of issue 1990 by introducing missing free of structure - keep until #2059 is addressed */

#define TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR      /* FhG: Temporary workaround for incorrect implementation of decoder flush with split rendering */

#define NONBE_1122_KEEP_EVS_MODE_UNCHANGED              /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR.  */

#define HARMONIZE_ISSUE_2435_WRITETNSDATA               /* FhG basop 2435: Harmonize WriteTnsData*_fx(), EncodeTnsData*_fx() */

#define HARM_2336_DOTP                                       /* VA: basop 2336; Harmonisation of some dot_product function + some BE optimisation */

#define FIX_2431_AVOID_CALLOC                           /* VA: basp issue 2431: avoid use of calloc() */

#define FIX_2424_REMOVE_GAUSS_L2_ENC                    /* VA: basop issue 2424: Remove duplicated code in gauss_L2_ivas_fx() */

lib_com/prot_fx.h

+0 −19
Original line number Diff line number Diff line
@@ -8052,7 +8052,6 @@ void GetParameters_fx( 
    Word16 *pnBits             // Q0

);



#ifndef HARMONIZE_ISSUE_2435_WRITETNSDATA

void EncodeTnsData_ivas_fx(

    STnsConfig const *pTnsConfig, /* i  : TNS Configuration struct          */

    STnsData const *pTnsData,     /* i  : TNS data struct (quantized param) */
@@ -8060,15 +8059,6 @@ void EncodeTnsData_ivas_fx( 
    Word16 *pnSize,               /* o  : number of written parameters   Q0 */

    Word16 *pnBits                /* o  : number of written bits         Q0 */

);

#else

void EncodeTnsData_ivas_fx(

    STnsConfig const *pTnsConfig, /* i  : TNS Configuration struct          */

    STnsData const *pTnsData,     /* i  : TNS data struct (quantized param) */

    Word16 *stream,               /* o  : internal data stream           Q0 */

    Word16 *pnSize,               /* o  : number of written parameters   Q0 */

    Word16 *pnBits                /* o  : number of written bits         Q0 */

);

#endif



void SetParameters(

    ParamsBitMap const *paramsBitMap,
@@ -10683,15 +10673,6 @@ void ResetTnsData_flt( 
void ClearTnsFilterCoefficients_flt(

    STnsFilter *pTnsFilter );



#ifndef HARMONIZE_ISSUE_2435_WRITETNSDATA

void EncodeTnsData(

    STnsConfig const *pTnsConfig, /* i  : TNS Configuration struct          */

    STnsData const *pTnsData,     /* i  : TNS data struct (quantized param) */

    Word16 *stream,               /* o  : internal data stream              */

    Word16 *pnSize,               /* o  : number of written parameters      */

    Word16 *pnBits                /* o  : number of written bits            */

);

#endif



void WriteTnsData(

    const STnsConfig *pTnsConfig, /* i  : TNS Configuration struct          */

lib_enc/cod_tcx_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -5416,11 +5416,7 @@ void TNSAnalysisStereo_fx( 


                st->hTcxEnc->tnsData[k].tnsOnWhitenedSpectra = st->hTcxEnc->bTnsOnWhithenedSpectra[k];

                move16();

#ifdef HARMONIZE_ISSUE_2435_WRITETNSDATA

                EncodeTnsData_fx( st->hTcxCfg->pCurrentTnsConfig, &st->hTcxEnc->tnsData[k], param_core[ch] + k * NPRM_DIV + 1 + NOISE_FILL_RANGES + LTPSIZE, tnsSize[ch] + k, tnsBits[ch] + k );

#else

                EncodeTnsData_ivas_fx( st->hTcxCfg->pCurrentTnsConfig, &st->hTcxEnc->tnsData[k], param_core[ch] + k * NPRM_DIV + 1 + NOISE_FILL_RANGES + LTPSIZE, tnsSize[ch] + k, tnsBits[ch] + k );

#endif

            }



            IF( EQ_16( st->hTcxEnc->transform_type[k], TCX_5 ) )

lib_enc/enc_prm_fx.c

+0 −13
Original line number Diff line number Diff line
@@ -745,12 +745,7 @@ void enc_prm_fx( 


        IF( st->hTcxCfg->fIsTNSAllowed )

        {

#ifndef HARMONIZE_ISSUE_2435_WRITETNSDATA



            WriteTnsData_fx( st->hTcxCfg->pCurrentTnsConfig, prm + j, &nTnsParams, st, &nTnsBits );

#else

            WriteTnsData_fx( st->hTcxCfg->pCurrentTnsConfig, prm + j, &nTnsParams, st->hBstr, &nTnsBits );

#endif // !HARMONIZE_ISSUE_2435_WRITETNSDATA



            j = add( j, nTnsParams ); /* Q0 */

        }
@@ -901,11 +896,7 @@ void enc_prm_fx( 
            {



                SetTnsConfig( st->hTcxCfg, 0, ( last_core == ACELP_CORE ) && ( k == 0 ) );

#ifndef HARMONIZE_ISSUE_2435_WRITETNSDATA

                WriteTnsData_fx( st->hTcxCfg->pCurrentTnsConfig, prm + j, &nTnsParams, st, &nTnsBits );

#else

                WriteTnsData_fx( st->hTcxCfg->pCurrentTnsConfig, prm + j, &nTnsParams, st->hBstr, &nTnsBits );

#endif // !HARMONIZE_ISSUE_2435_WRITETNSDATA





                j = add( j, nTnsParams );
@@ -1215,11 +1206,7 @@ void writeTCXparam_fx( 
                }

                ELSE

                {

#ifndef HARMONIZE_ISSUE_2435_WRITETNSDATA

                    WriteTnsData_ivas_fx( st->hTcxCfg->pCurrentTnsConfig, prm + j, &nTnsParams, hBstr, &nTnsBits );

#else

                    WriteTnsData_fx( st->hTcxCfg->pCurrentTnsConfig, prm + j, &nTnsParams, hBstr, &nTnsBits );

#endif // !HARMONIZE_ISSUE_2435_WRITETNSDATA

                }

                IF( no_param_tns )

                {

lib_enc/prot_fx_enc.h

+0 −25
Original line number Diff line number Diff line
@@ -1447,45 +1447,20 @@ Word16 DetectTnsFilt_fx( 
    Word16 *predictionGain        /* o  : TNS prediction gain        Q=7    */

);



#ifdef HARMONIZE_ISSUE_2435_WRITETNSDATA

void EncodeTnsData_fx(

    STnsConfig const *pTnsConfig,

    STnsData const *pTnsData,

    Word16 *stream,

    Word16 *pnSize,

    Word16 *pnBits );

#else

Word16 EncodeTnsData_fx(

    STnsConfig const *pTnsConfig,

    STnsData const *pTnsData,

    Word16 *stream,

    Word16 *pnSize,

    Word16 *pnBits );

#endif



#ifdef HARMONIZE_ISSUE_2435_WRITETNSDATA

Word16 WriteTnsData_fx(

    STnsConfig const *pTnsConfig,

    Word16 const *stream,

    Word16 *pnSize,

    BSTR_ENC_HANDLE hBstr,

    Word16 *pnBits );

#endif // HARMONIZE_ISSUE_2435_WRITETNSDATA



#ifndef HARMONIZE_ISSUE_2435_WRITETNSDATA

Word16 WriteTnsData_fx(

    STnsConfig const *pTnsConfig,

    Word16 const *stream,

    Word16 *pnSize,

    Encoder_State *st,

    Word16 *pnBits );

Word16 WriteTnsData_ivas_fx(

    STnsConfig const *pTnsConfig,

    Word16 const *stream,

    Word16 *pnSize,

    BSTR_ENC_HANDLE hBstr,

    Word16 *pnBits );

#endif // !HARMONIZE_ISSUE_2435_WRITETNSDATA

void subband_FFT_fx(

    Word32 **Sr,      /*(i) real part of the CLDFB*/

    Word32 **Si,      /*(i) imag part of the CLDFB*/