Commit 89ada716 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_1099_JBM_MD_HANDLE_ALLOC

parent 3ca869a3

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -89,7 +89,6 @@ 
#define NONBE_1244_FIX_SWB_BWE_MEMORY                   /* VA: issue 1244: fix to SWB BWE memory in case of switching from FB coding - pending a review by Huawei */



#define FIX_1129_EXT_REND_OUTPUT_HIGH                   /* Philips: issue 1129: External renderer BINAURAL_ROOM_REVERB format output level too high compared to internal rendering output */

#define FIX_1099_JBM_MD_HANDLE_ALLOC                    /* VA: issue 1099: Limit the allocation of `hJbmMetadata` handle to MASA and OMASA only */

#define FIX_1121_MASA_DESCRIPTOR                        /* VA: issue 1121: Define 'ivasmasaFormatDescriptor' at one common place */

#define NONBE_1894_OSBA_SCALING                         /* FhG: do not scale OSBA inputs by 0.5 any more */

#define NONBE_FIX_1141_OSBA_ROOM_RENDERING              /* FhG: Fix for issue 1141: render objects in OSBA decoder with room effect  */

lib_dec/ivas_init_dec_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -2986,12 +2986,8 @@ ivas_error ivas_init_decoder_fx( 
    }

#endif

    test();

#ifdef FIX_1099_JBM_MD_HANDLE_ALLOC

    test();

    IF( ( EQ_32( st_ivas->ivas_format, MASA_FORMAT ) || EQ_32( st_ivas->ivas_format, MASA_ISM_FORMAT ) ) && st_ivas->hDecoderConfig->Opt_tsm )

#else

    IF( st_ivas->hJbmMetadata == NULL && st_ivas->hDecoderConfig->Opt_tsm )

#endif

    {

        IF( EQ_32( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) )

        {