Commit 43e8b078 authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_FIX_1056_ISM_RATE_SWITCH

parent c6f8fd55

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -102,7 +102,6 @@ 
#define FIX_1741_REVERB_TIMES_Q_FORMAT                  /* Philips: reverberation times in Q26 format instead of Q31 */

#define FIX_1831_REVERB_REGRESSION                      /* Philips: fixes reverb regression issues  */

#define FIX_1835_REVERB_ACTIVATION                      /* FhG: Modified reverberation activation logic and corrected factEQ calculation */

#define NONBE_FIX_1056_ISM_RATE_SWITCH                  /* FhG: Fix #1056: fix TC buffer udpate on a ISM rate switch */	

#define NONBE_FIX_1063_DIV_BY_ZERO_SUMNRG               /* VoiceAge: issue 1063: division by zero for angle_rot feature in the UNCLR classifier */

#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 */

lib_dec/ivas_ism_dec_fx.c

+0 −7
Original line number Diff line number Diff line
@@ -142,16 +142,9 @@ static ivas_error ivas_ism_bitrate_switching_dec_fx( 
    {

        test();

        test();

#ifndef NONBE_FIX_1056_ISM_RATE_SWITCH

        test();

#endif

/* transfer subframe info from DirAC or ParamMC to central tc buffer */

#ifdef NONBE_FIX_1056_ISM_RATE_SWITCH

        /* only do this if we are not having done everything already in the TC decoding part and having only played out from the TC buffer */

        IF( EQ_32( last_ism_mode, ISM_MODE_PARAM ) && st_ivas->hSpatParamRendCom != NULL && NE_32( st_ivas->hTcBuffer->tc_buffer_mode, TC_BUFFER_MODE_BUFFER ) )

#else

        IF( EQ_32( last_ism_mode, ISM_MODE_PARAM ) && st_ivas->hSpatParamRendCom != NULL && ( NE_32( st_ivas->renderer_type, RENDERER_MONO_DOWNMIX ) && NE_32( st_ivas->renderer_type, RENDERER_DISABLE ) ) )

#endif

        {

            st_ivas->hTcBuffer->nb_subframes = st_ivas->hSpatParamRendCom->nb_subframes;

            move16();