Commit 99f431eb authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_FIX_1028_1DB_TCX_LEVEL_DROP

parent be824e84

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -115,7 +115,6 @@ 
#define LC3PLUS_LEA_COMPAT_BITRATES_48_6                /* FhG: treat split-rendering 256kbps lc3plus 10ms 0dof bitrate as sentinel value for LEA compatible 48_6 bitrate (124 kbps per channel)  */

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

#define NONBE_FIX_ISM_XOVER_BR                          /* FhG: issue 1072: select OSBA coding method depending on number of object and bitrate */

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

#define FIX_1053_REVERB_RECONFIGURATION                 /* Philips: issue 1053: fix for dynamic switching of acoustic environment */

#define CONF_DISTATT                                    /* Eri: Make distance attenuation configurable */

#define FIX_1068_ASAN_IN_MC_2_BINAURAL_ROOM_IR          /* issue 1068 : Memory leak in MC to BINAURAL_ROOM decoding with bitrate switching*/

lib_dec/core_dec_init_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -1287,11 +1287,7 @@ 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();