Commit 87c20f21 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_1454_FIX_STEREO_TO_FOA_JBM

parent 1405816c

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -175,7 +175,6 @@ 
/* #################### Start NON-BE switches ############################ */

/* any switch which is non-be wrt. TS 26.258 V3.0 */



#define FIX_1454_FIX_STEREO_TO_FOA_JBM                  /* VA: issue 1454: fix buggy stereo to FOA in JBM */

#define FIX_1461_CNG_BW_SWITCHING                       /* Eri: issue 1461: Stereo parameters are not updated when SID/NODATA forces BW to stay the same */

#define FIX_2252_LP_CNG_STARTS_SID                      /* VA: issues 2251 and 2252: fix LP CNG uninitialized value in bitstream that starts with an SID */

#define FIX_1381_BWD                                    /* VA: issue 1381: apply no hysteresis in BWD at higher bitrates also in mono MASA and OMASA */

lib_dec/ivas_jbm_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -965,11 +965,7 @@ ivas_error ivas_dec_render( 
        }

        else if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC )

        {

#ifdef FIX_1454_FIX_STEREO_TO_FOA_JBM

            ivas_stereo2sba( p_tc, p_output, *nSamplesRendered );

#else

            ivas_stereo2sba( p_output, p_output, *nSamplesRendered );

#endif

        }

    }

    else if ( st_ivas->ivas_format == ISM_FORMAT )