Commit 14823b69 authored by vaclav's avatar vaclav
Browse files

Merge branch '1701_basop_PortFlpMR1516' into 'main' 

[allow-regression][non-BE][split-non-be] Port MR1516 from float to BASOP

Closes #1701

See merge request !1790
parents 803be850 aed93c80

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -113,8 +113,8 @@ 
#define FIX_1060_USAN_ARRAY_BOUNDS                      /* FhG: issue 1060: USAN array-bounds errors */

#define NONBE_FIX_SBA_SIGNALING_BITS_B                  /* FhG: issue 1061: option B: signal sba order additionally in OSBA */

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



#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_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -1287,7 +1287,11 @@ void open_decoder_LPD_ivas_fx( 
        st->inv_gamma = GAMMA16k_INV;

        move16();

    }

#ifdef NONBE_FIX_1028_1DB_TCX_LEVEL_DROP

    ELSE IF( GT_16( st->element_mode, EVS_MONO ) && GT_32( st->sr_core, INT_FS_16k ) )

#else

    ELSE IF( GT_32( st->sr_core, INT_FS_16k ) && EQ_16( st->element_mode, IVAS_CPE_MDCT ) )

#endif

    {

        st->gamma = GAMMA16k;

        move16();