Commit b5fd0d78 authored by Jan Kiene's avatar Jan Kiene
Browse files

Accept NONBE_FIX_926_OSBA_DECODER_CRASH_PLANAR_SBA

parent 21f35ab4

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -183,7 +183,6 @@ 
#define ISAR_BITSTREAM_UPDATE_LC3PLUS                   /* FhG: Multiple improvements to the ISAR bitstream when LC3plus is used. See MR 1456 for details. */

#define FIX_1372_ISAR_POST_REND

#endif

#define NONBE_FIX_926_OSBA_DECODER_CRASH_PLANAR_SBA           /* FhG: issue 926: crash in OSBA decoding with planar FOA */

#define NONBE_FIX_BINAURAL_ROOM_IR_REVERBERATOR               /* FhG: re-enable acidentially disabled reverberator for BINAURAL_ROOM_IR */

#define NONBE_FIX_1058_DECODER_ERROR_WITH_REVERB_ROOM   /* FhG: issue 1058: do not initialize EFAP when IntSetup is HOA3 */

#define NONBE_FIX_907_VLBR_DIRAC_BAND_MAPPING           /* Dlb: issue 907: fix for band mapping at VLBR */

lib_dec/ivas_jbm_dec_fx.c

+0 −6
Original line number Diff line number Diff line
@@ -3419,13 +3419,7 @@ Word16 ivas_jbm_dec_get_num_tc_channels_fx( 
            move16();

        }



#ifdef NONBE_FIX_926_OSBA_DECODER_CRASH_PLANAR_SBA

        if ( EQ_16( num_tc, 3 ) )

#else

        test();

        test();

        if ( ( st_ivas->sba_planar && GE_16( num_tc, 3 ) ) || EQ_16( num_tc, 3 ) )

#endif

        {

            num_tc = add( num_tc, 1 );

        }