Commit 06b22bdb authored by vaclav's avatar vaclav Committed by emerit
Browse files

accept FIX_1038_OFFSET_TO_NULL_PTR_IN_EVS_TCX_BFI

parent 2aa20818

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -157,7 +157,6 @@ 
/*#define SPLIT_REND_WITH_HEAD_ROT  */                  /* Dlb,FhG: Split Rendering contributions 21 and 35 */



#define FIX_CREND_FIX_POINT_HRTF_FILE_FORMAT            /* Orange issue 1031 : fix point hrtf binary file format */

#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 FIX_1044_ISM_REND_MEMORY                        /* VA: issue 1044: Lower the memory of the ISM renderer handle. */

#define FIX_1060_USAN_ARRAY_BOUNDS                      /* FhG: issue 1060: USAN array-bounds errors */

lib_dec/dec_LPD.c

+0 −8
Original line number Diff line number Diff line
@@ -604,20 +604,12 @@ void decoder_LPD( 


        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 )

            {

#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 = lsf_stab( &lsf[( k + 1 ) * M], &lsf[k * M], 0, st->L_frame );

            }

lib_dec/dec_tcx.c

+2 −21
Original line number Diff line number Diff line
@@ -93,9 +93,7 @@ void decoder_tcx( 
    tmp_concealment_method = 0;

    nf_seed = 0;

    fUseTns = 0; /* flag that is set if TNS data is present */

#ifdef FIX_1038_OFFSET_TO_NULL_PTR_IN_EVS_TCX_BFI

    prm_sqQ = NULL;

#endif



    set_f( xn_buf, 0, L_MDCT_OVLP_MAX + L_FRAME_PLUS + L_MDCT_OVLP_MAX );
@@ -733,15 +731,12 @@ void decoder_tcx_invQ( 
    TCX_CONFIG_HANDLE hTcxCfg = st->hTcxCfg;



    tnsSize = 0;

#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
@@ -761,11 +756,6 @@ void decoder_tcx_invQ( 
        noiseFillingSize = st->hIGFDec->infoIGFStartLine;

    }



#ifndef FIX_1038_OFFSET_TO_NULL_PTR_IN_EVS_TCX_BFI

    prm_ltp = &prm[1 + NOISE_FILL_RANGES];

    prm_tns = prm_ltp + LTPSIZE;

#endif



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

     * Read TCX parameters                                       *

     *-----------------------------------------------------------*/
@@ -775,10 +765,8 @@ void decoder_tcx_invQ( 
    if ( !bfi )

    {

        index = prm[0];

#ifdef FIX_1038_OFFSET_TO_NULL_PTR_IN_EVS_TCX_BFI

        prm_ltp = &prm[1 + NOISE_FILL_RANGES];

        prm_tns = prm_ltp + LTPSIZE;

#endif



        /* read noise level (fac_ns) */

        st->hTcxDec->noise_filling_index[frame_cnt] = prm[1];
@@ -794,23 +782,16 @@ void decoder_tcx_invQ( 
        *fUseTns = 0;

    }



#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                                             *

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



    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                                                *

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