Commit 991f0bef authored by vaclav's avatar vaclav
Browse files

issue 1099: Limit the allocation of `hJbmMetadata` handle to MASA and OMASA... 

issue 1099: Limit the allocation of `hJbmMetadata` handle to MASA and OMASA only; under FIX_1099_JBM_MD_HANDLE_ALLOC
parent 9f58d491

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -175,6 +175,8 @@ 
#define FIX_989_TD_REND_ROM                             /* Eri: Clean-up for TD renderer and completion of ROM generation tool */



#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_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
@@ -2422,7 +2422,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 )

        {