Commit 6f7935ac authored by vaclav's avatar vaclav
Browse files

Merge branch '1099-jbm-md-handle-is-not-needed-except-masa' into 'main' 

Resolve "JBM MD handle is not needed except MASA"

See merge request !1586
parents 9554ea07 4e88509b

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -176,6 +176,8 @@ 


#define FIX_1068_ASAN_IN_MC_2_BINAURAL_ROOM_IR          /* issue 1068 : Memory leak in MC to BINAURAL_ROOM decoding with bitrate switching*/

#define FIX_1050_EFAP_ALLOC                             /* FhG: issue 1050: reduction of memory allocated to EFAP handle */

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





/* #################### End BE switches ################################## */

lib_dec/ivas_init_dec.c

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

    }



#ifdef FIX_1099_JBM_MD_HANDLE_ALLOC

    if ( ( st_ivas->ivas_format == MASA_FORMAT || 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 ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_EXTERNAL )

        {