Commit 612a8cfb authored by vaclav's avatar vaclav
Browse files

port MR

parent e81dcc6b

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ 
#define NONBE_FIX_SBA_SIGNALING_BITS_B                  /* FhG: issue 1061: option B: signal sba order additionally in OSBA */

#define NONBE_FIX_1028_1DB_TCX_LEVEL_DROP               /* VA: Harmonize the logic setting LP weighting factor between TCX encoder and TCX decoder */

#define FIX_1053_REVERB_RECONFIGURATION                 /* Philips: issue 1053: fix for dynamic switching of acoustic environment */

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



/* #################### End BASOP porting switches ############################ */

lib_dec/ivas_init_dec_fx.c

+6 −1
Original line number Diff line number Diff line
@@ -2674,7 +2674,6 @@ ivas_error ivas_init_decoder_fx( 
     *-----------------------------------------------------------------*/



    IF( st_ivas->hTcBuffer == NULL )



    {

        /* no module has yet open the TC buffer, open a default one */

        n_channels_transport_jbm = ivas_jbm_dec_get_num_tc_channels_fx( st_ivas );
@@ -2693,8 +2692,14 @@ ivas_error ivas_init_decoder_fx( 
            return error;

        }

    }



    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 ) )

        {