Commit a92d4caa authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_FIX_770_PLANAR_SBA_JBM

parent fa93785e

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -175,7 +175,6 @@ 
/* all switches in this category should start with "NONBE_" */





#define NONBE_FIX_770_PLANAR_SBA_JBM                          /* FhG  : Issue #770: Crash in planar FOA decoding with JBM caused by uninitialized value */

#define NONBE_FIX_760_COHERENCE_MASA                          /* Nokia: Issue 760: fixes decoder crash for some cases when all energy ratios are 1 */

#define NONBE_FIX_752_OSBA_MISCONFIG_MCT                      /* FhG: issue 752: misconfiguration of MCT causes crashes for coding with sampling rate under 48kHz at 256kbps*/

#define NONBE_FIX_787_PARAM_UPMIX_LEVEL                       /* Dlb: issue 787: fix level of Mono/Stereo for ParamUpmix mode */

lib_dec/ivas_jbm_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -2037,11 +2037,7 @@ int16_t ivas_jbm_dec_get_num_tc_channels( 
        if ( st_ivas->ivas_format == SBA_FORMAT )

        {



#ifdef NONBE_FIX_770_PLANAR_SBA_JBM

            if ( num_tc == 3 )

#else

            if ( ( st_ivas->sba_planar && num_tc >= 3 ) || num_tc == 3 )

#endif

            {

                num_tc++;

            }