Commit b45cbe9f authored by malenov's avatar malenov
Browse files

Harmonize the logic setting LP weighting factor between TCX encoder and TCX decoder

parent e64e11c5

lib_com/options.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -166,6 +166,7 @@ 
/* all switches in this category should start with "NONBE_" */

/* all switches in this category should start with "NONBE_" */





#define NONBE_FIX_1045_ISM_BITRATE_SWITCHING            /* Eri: Difference between ROM/File HRTF in ISM bitrate switching */

#define NONBE_FIX_1045_ISM_BITRATE_SWITCHING            /* Eri: Difference between ROM/File HRTF in ISM bitrate switching */

#define NONBE_FIX_1028_1DB_TCX_LEVEL_DROP               /* VA: Harmonize the logic setting LP weighting factor between TCX encoder and TCX decoder */





/* ##################### End NON-BE switches ########################### */

/* ##################### End NON-BE switches ########################### */

lib_dec/core_dec_init.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -150,7 +150,11 @@ void open_decoder_LPD( 
    {

    {

        st->gamma = GAMMA16k;

        st->gamma = GAMMA16k;

    }

    }

#ifdef NONBE_FIX_1028_1DB_TCX_LEVEL_DROP

    else if ( st->sr_core > INT_FS_16k || st->element_mode == IVAS_CPE_MDCT )

#else

    else if ( st->sr_core > INT_FS_16k && st->element_mode == IVAS_CPE_MDCT )

    else if ( st->sr_core > INT_FS_16k && st->element_mode == IVAS_CPE_MDCT )

#endif

    {

    {

        st->gamma = GAMMA16k;

        st->gamma = GAMMA16k;

    }

    }

lib_enc/core_enc_init.c

+6 −0
Original line number Original line Diff line number Diff line
@@ -458,6 +458,12 @@ static void init_core_sig_ana( 
    {

    {

        st->gamma = GAMMA16k;

        st->gamma = GAMMA16k;

    }

    }

#ifdef NONBE_FIX_1028_1DB_TCX_LEVEL_DROP

    else if ( st->sr_core > INT_FS_16k || st->element_mode == IVAS_CPE_MDCT )

    {

        st->gamma = GAMMA16k;

    }

#endif

    else

    else

    {

    {

        st->gamma = GAMMA1;

        st->gamma = GAMMA1;