Commit ff51b978 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_28_SBA_LS_RENDER

parent 4d07a07a

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -146,7 +146,6 @@ 
/*#define FIX_IVAS_185_MDCT_ST_PLC_FADEOUT*/            /* IVAS-185 fix bug in TCX-PLC fadeout for MDCT-Stereo and improve fadeout by fading to background noise instead of white noise */

/*#define FIX_I1_113*/                                  /* under review : MCT bit distribution optimization for SBA high bitrates*/



#define FIX_28_SBA_LS_RENDER                            /* FhG: fix for discontinuities in SBA LS renderer */



#define SIMPLIFY_SBA_RENDERING_LOGIC                    /* SBA rendering maintenance related to ticket #45 */

#define SBA_CLEANING                                    /* SBA maintenance related to ticket #45 */

lib_dec/ivas_spar_foa_dec.c

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

                if ( ( st_ivas->hOutSetup.num_lfe > 0 ) && ( st_ivas->hOutSetup.index_lfe[idx_lfe] == ch ) )

                {

#ifdef FIX_28_SBA_LS_RENDER

                    set_zero( &( output[ch][i_sf * MAX_PARAM_SPATIAL_SUBFRAMES * num_cldfb_bands] ),  MAX_PARAM_SPATIAL_SUBFRAMES * num_cldfb_bands );

#else

                    set_zero( &( output[ch][0] ), CLDFB_NO_COL_MAX * num_cldfb_bands );

#endif



                    if ( idx_lfe < ( st_ivas->hDirAC->hOutSetup.num_lfe - 1 ) )

                    {