Commit 0af1908c authored by vaclav's avatar vaclav
Browse files

Merge branch '1701_ref_PortFlpMR1516' into 'ivas-float-update' 

[non-BE][split-non-be] Port MR1516 from float to float-pc

See merge request !1791
parents 5663ca5b 8b4afa04

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -197,6 +197,7 @@ 
#define NONBE_FIX_1045_ISM_BITRATE_SWITCHING            /* Eri: Difference between ROM/File HRTF in ISM bitrate switching */

#define NONBE_FIX_984_OMASA_EXT_OUTPUT                  /* Nok: issue 1497 - porting OMASA EXT MR   */

#define NONBE_FIX_1065_ISM_MD_HANDLE                    /* VA: issue 1065: Allocate only the necessary number of ISM MD decoder handles. */

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



/* #################### End BASOP porting switches ############################ */

lib_dec/core_dec_init.c

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

        st->gamma = GAMMA16k;

    }

#ifdef NONBE_FIX_1028_1DB_TCX_LEVEL_DROP

    else if ( st->element_mode > EVS_MONO && st->sr_core > INT_FS_16k )

#else

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

#endif

    {

        st->gamma = GAMMA16k;

    }