Commit c9e7463c authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

Merge branch '1629_basop_port_fl1485' into 'main' 

Port MR 1485 into main-pc

See merge request !1657
parents aa84cdfe cabe90b6

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -164,6 +164,7 @@ 
#define FIX_1831_REVERB_REGRESSION                      /* Philips: fixes reverb regression issues  */

#define FIX_1835_REVERB_ACTIVATION                      /* FhG: Modified reverberation activation logic and corrected factEQ calculation */

#define NON_BE_FIX_EVS_USAN_ERR_IN_WAVEADJUST           /* FhG: address issue 1037 */

#define FIX_1038_OFFSET_TO_NULL_PTR_IN_EVS_TCX_BFI      /* FhG: move setting of pointers for parameter decoding so they are skipped in lost frames when they are not needed */



/* #################### End BASOP porting switches ############################ */

lib_dec/dec_LPD_fx.c

+8 −0
Original line number Diff line number Diff line
@@ -718,12 +718,20 @@ void decoder_LPD_fx( 
        FOR( k = 0; k < 2; k++ )

        {



#ifndef FIX_1038_OFFSET_TO_NULL_PTR_IN_EVS_TCX_BFI

            /* Set pointer to parameters */

            prm = param + ( k * DEC_NPRM_DIV );



            /* Stability Factor */

#endif

            IF( bfi == 0 )

            {

#ifdef FIX_1038_OFFSET_TO_NULL_PTR_IN_EVS_TCX_BFI

                /* Set pointer to parameters */

                prm = param + ( k * DEC_NPRM_DIV );



                /* Stability Factor */

#endif

                st->stab_fac_fx = lsf_stab_fx( &lsf[( ( k + 1 ) ) * M], &lsf[k * M], 0, L_FRAME );

                move16();

            }

lib_dec/dec_tcx_fx.c

+21 −0
Original line number Diff line number Diff line
@@ -4411,7 +4411,15 @@ void decoder_tcx_invQ_fx( 


    tnsSize = 0;

    move16();

#ifndef FIX_1038_OFFSET_TO_NULL_PTR_IN_EVS_TCX_BFI

    prm_target = NULL; /* just to suppress MSVC warnigs */

#else

    /* just to suppress MSVC warnigs */

    prm_target = NULL;

    prm_ltp = NULL;

    prm_tns = NULL;

    prm_sqQ = NULL;

#endif



    /*-----------------------------------------------------------------*

     * Initializations
@@ -4435,8 +4443,10 @@ void decoder_tcx_invQ_fx( 
        move16();

    }



#ifndef FIX_1038_OFFSET_TO_NULL_PTR_IN_EVS_TCX_BFI

    prm_ltp = &prm[1 + NOISE_FILL_RANGES];

    prm_tns = prm_ltp + LTPSIZE;

#endif



    gainCompensate = ONE_IN_Q14;

    move16();
@@ -4452,6 +4462,10 @@ void decoder_tcx_invQ_fx( 


    IF( !bfi )

    {

#ifdef FIX_1038_OFFSET_TO_NULL_PTR_IN_EVS_TCX_BFI

        prm_ltp = &prm[1 + NOISE_FILL_RANGES];

        prm_tns = prm_ltp + LTPSIZE;

#endif

        index = prm[0];

        move16();
@@ -4473,9 +4487,11 @@ void decoder_tcx_invQ_fx( 
        move16();

    }



#ifndef FIX_1038_OFFSET_TO_NULL_PTR_IN_EVS_TCX_BFI

    prm_hm = prm_tns + tnsSize;

    prm_sqQ = prm_hm + NPRM_CTX_HM;

    *prm_sqQ1 = prm_sqQ;

#endif



    /*-----------------------------------------------------------*

     * Spectrum data                                             *
@@ -4483,6 +4499,11 @@ void decoder_tcx_invQ_fx( 


    IF( !bfi )

    {

#ifdef FIX_1038_OFFSET_TO_NULL_PTR_IN_EVS_TCX_BFI

        prm_hm = prm_tns + tnsSize;

        prm_sqQ = prm_hm + NPRM_CTX_HM;

        *prm_sqQ1 = prm_sqQ;

#endif

        /*-----------------------------------------------------------*

         * Context HM                                                *

         *-----------------------------------------------------------*/