Commit f364f9c1 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_1038_OFFSET_TO_NULL_PTR_IN_EVS_TCX_BFI

parent 3b13c09c

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -107,7 +107,6 @@ 
#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 */

#define NONBE_FIX_1056_ISM_RATE_SWITCH                  /* FhG: Fix #1056: fix TC buffer udpate on a ISM rate switch */	

#define NONBE_FIX_1075                                  /* FhG: fix segfault for bitrate switching + BINAURAL_ROOM_REVERB output in MC */

#define NON_BE_FIX_1041_USE_OLD_CNG_LSPS_IF_NONSTAB     /* FhG: fix bug in TD MDCT-Stereo concealment */

lib_dec/dec_LPD_fx.c

+0 −8
Original line number Diff line number Diff line
@@ -718,20 +718,12 @@ 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

+0 −17
Original line number Diff line number Diff line
@@ -4401,15 +4401,11 @@ 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
@@ -4433,10 +4429,6 @@ 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,10 +4444,8 @@ 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();
@@ -4477,11 +4467,6 @@ 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                                             *
@@ -4489,11 +4474,9 @@ 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                                                *

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