Commit 44cfaeb2 authored by Malenovsky, Vladimir's avatar Malenovsky, Vladimir
Browse files

initialize FD CNG with EVS-type of init function

parent 1c5efba7

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ 
#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 FIX_1435_MOVE_STEREO_PANNING                    /* VA: issue 1435: do the EVS stereo panning in the renderer */

#define FIX_2245_INIT_FD_CNG_EVS                        /* Dolby: Issue 2245: initialize FD CNG with EVS-type of init function */





/* #################### End BE switches ################################## */

lib_dec/init_dec_fx.c

+12 −1
Original line number Diff line number Diff line
@@ -928,7 +928,18 @@ ivas_error init_decoder_fx( 
        }



        /* Init FD-CNG */

#ifdef FIX_2245_INIT_FD_CNG_EVS

        if ( EQ_16( st_fx->element_mode, EVS_MONO ) )

        {

            initFdCngDec_fx( st_fx, st_fx->cldfbSyn->scale );

        }

        else

        {

#endif

            initFdCngDec_ivas_fx( st_fx, st_fx->cldfbSyn->scale );

#ifdef FIX_2245_INIT_FD_CNG_EVS

        }

#endif

    }

    ELSE

    {