Commit 59a9e42e authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[cleanup] accept FIX_1003_PARAMISM_BINAURAL_RECONFIG_USAN

parent 1be5a789

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -213,7 +213,6 @@ 
#define NONBE_FIX_999_JBM_MCT_FLUSH                     /* FhG: issue #999: fix wrong flushing for MCT at a JBM rate switch */

#define NONBE_FIX_1000_G1_G2_SWB_TBE                    /* VA: issue 1000: avoid div by zero due to g1 + g2 being zero in SWB TBE */



#define FIX_1003_PARAMISM_BINAURAL_RECONFIG_USAN        /* FhG: fix for #1003: fix USAN caused by ParamISM reconfig                    */

#define FIX_1001_ARI_HM_OVERFLOW                        /* FhG: fix for undef behaviour in in the harmonic TCX model arithmetic coder */

#define NONBE_FIX_1005_MC_RS_TCBUFFER_UPDATE            /* FhG: issue #1005: fix TC Buffer update at a MC rate switch */

#define NONBE_FIX_1004_USAN_DTX_MASA_NO_DIRS             /* Nokia: fix USAN error caused by non-setting of correctly the number of MASA directions in DTX */

lib_dec/ivas_ism_dec.c

+0 −7
Original line number Diff line number Diff line
@@ -368,13 +368,6 @@ static ivas_error ivas_ism_bitrate_switching_dec( 
        tc_nchan_allocate_new = tc_nchan_tc_new;

        tc_nchan_full_new = tc_nchan_tc_new;



#ifndef FIX_1003_PARAMISM_BINAURAL_RECONFIG_USAN

        if ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM || st_ivas->renderer_type == RENDERER_STEREO_PARAMETRIC )

        {

            tc_nchan_allocate_new = 2 * BINAURAL_CHANNELS;

            tc_nchan_full_new = tc_nchan_allocate_new;

        }

#endif



        if ( st_ivas->ism_mode == ISM_MODE_PARAM && ( st_ivas->renderer_type != RENDERER_MONO_DOWNMIX && st_ivas->renderer_type != RENDERER_DISABLE && st_ivas->renderer_type != RENDERER_BINAURAL_PARAMETRIC && st_ivas->renderer_type != RENDERER_BINAURAL_PARAMETRIC_ROOM ) )

        {