Commit ed2b7873 authored by eichenseer's avatar eichenseer
Browse files

Remove TMP switches.

parent 3305e9d2

lib_com/options.h

+1 −5
Original line number Diff line number Diff line
@@ -157,12 +157,8 @@ 


#define PARAM_ISM_DTX_CNG                               /* Support of DTX/CNG for Param-ISM, includes updates */ 

#ifdef PARAM_ISM_DTX_CNG

// choose one of the following:

//#define TMP_FIX                                         /* set cng_type to FD_CNG, quick hack; TODO: move init to correct place */

#define TMP_FIX3                                        /* cng_type here could work, seems to cause no BE issues */

//#define TMP_FIX4                                      /* causes BE issues with ISM */

#define PARAM_ISM_DTX_PARABIN_RATIO_FIX                 /* Nokia: Better value for energy ratio for parametric binauralizer when in DTX */

#define PARAM_ISM_DTX_CORE_FIX                          /* FhG: a temporary fix to restrict core coder changes to ParamISM DTX */

#define PARAM_ISM_DTX_CORE_FIX                          /* FhG: restrict core coder changes to ParamISM DTX */

#endif



/* ################## End DEVELOPMENT switches ######################### */

lib_dec/init_dec.c

+0 −5
Original line number Diff line number Diff line
@@ -290,12 +290,7 @@ ivas_error init_decoder( 
     *-----------------------------------------------------------------*/



    st->first_CNG = 0;

#if defined(TMP_FIX) && defined(PARAM_ISM_DTX_CNG)

    /* TODO: this needs to go back to -1, correct place to set this only for paramISM? */

    st->cng_type = FD_CNG;

#else

    st->cng_type = -1;

#endif

    st->last_vad = 0;

    st->last_active_brate = ACELP_7k20;

    st->last_CNG_L_frame = L_FRAME;

lib_dec/ivas_init_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -805,10 +805,6 @@ ivas_error ivas_init_decoder( 
            }



            reset_indices_dec( st_ivas->hSCE[sce_id]->hCoreCoder[0] );



#ifdef TMP_FIX4

            st_ivas->hSCE[sce_id]->hCoreCoder[0]->cng_type = FD_CNG; /* use FD-CNG in both ParamISM and discrete ISM */

#endif

        }



#ifdef PARAM_ISM_DTX_CNG

lib_dec/ivas_sce_dec.c

+1 −3
Original line number Diff line number Diff line
@@ -124,9 +124,7 @@ ivas_error ivas_sce_dec( 
    if (st_ivas->ism_mode == ISM_MODE_PARAM)

    {

        ivas_ism_preprocessing(st_ivas, sce_id);

#ifdef TMP_FIX3

        st->cng_type = FD_CNG; /* esr: more suitable place? this one doesn't cause BE issues at least */

#endif

        st->cng_type = FD_CNG; /* TODO: move to init if possible */

    }

#endif