Commit 2b3f7dc5 authored by multrus's avatar multrus
Browse files

Merge branch '1635_ref_cleanup' into 'ivas-float-update' 

Port MR 1509 to ref

See merge request !1962
parents 8d9c7469 90316972

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -180,7 +180,6 @@ 
#define NONBE_FIX_1058_DECODER_ERROR_WITH_REVERB_ROOM   /* FhG: issue 1058: do not initialize EFAP when IntSetup is HOA3 */

#ifdef NONBE_FIX_1058_DECODER_ERROR_WITH_REVERB_ROOM

#endif

#define FIX_1043_JBM_MD_BUFFER                          /* VA: issue 1043: JBM MD handle allocation is avoided in non-JBM EXT operations */



#define USE_NEW_HRTF_BINARY_FILE_FORMAT                 /* Orange: to activate when decided to change the hrtf binary file format */

#define FIX_WARNING_RENDER_CONFIG                       /* Orange: fix warning on windows build */

lib_dec/ivas_init_dec.c

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





#ifdef FIX_1043_JBM_MD_BUFFER

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

#else

    if ( st_ivas->hJbmMetadata == NULL )

#endif

    {

        if ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_EXTERNAL )

        {

lib_dec/ivas_jbm_dec.c

+0 −12
Original line number Diff line number Diff line
@@ -214,11 +214,7 @@ ivas_error ivas_jbm_dec_tc( 
                return error;

            }



#ifdef FIX_1043_JBM_MD_BUFFER

            if ( output_config == IVAS_AUDIO_CONFIG_EXTERNAL && st_ivas->hDecoderConfig->Opt_tsm )

#else

            if ( output_config == IVAS_AUDIO_CONFIG_EXTERNAL )

#endif

            {

                ivas_jbm_dec_copy_masa_meta_to_buffer( st_ivas );

            }
@@ -427,9 +423,7 @@ ivas_error ivas_jbm_dec_tc( 


            ivas_omasa_rearrange_channels( p_output, nchan_transport_ism, output_frame );

#endif

#ifdef FIX_1043_JBM_MD_BUFFER

            if ( st_ivas->hDecoderConfig->Opt_tsm )

#endif

            {

                ivas_jbm_dec_copy_masa_meta_to_buffer( st_ivas );

            }
@@ -831,11 +825,7 @@ void ivas_jbm_dec_feed_tc_to_renderer( 
    {

        ivas_jbm_dec_td_renderers_adapt_subframes( st_ivas );



#ifdef FIX_1043_JBM_MD_BUFFER

        if ( ( st_ivas->ivas_format == MASA_FORMAT || st_ivas->ivas_format == MASA_ISM_FORMAT ) && st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_EXTERNAL && st_ivas->hDecoderConfig->Opt_tsm )

#else

        if ( ( st_ivas->ivas_format == MASA_FORMAT || st_ivas->ivas_format == MASA_ISM_FORMAT ) && st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_EXTERNAL )

#endif

        {

            ivas_jbm_masa_sf_to_slot_map( st_ivas, n_render_timeslots );

        }
@@ -916,9 +906,7 @@ void ivas_jbm_dec_feed_tc_to_renderer( 
        {

            ivas_jbm_dec_td_renderers_adapt_subframes( st_ivas );



#ifdef FIX_1043_JBM_MD_BUFFER

            if ( st_ivas->hDecoderConfig->Opt_tsm )

#endif

            {

                ivas_jbm_masa_sf_to_slot_map( st_ivas, n_render_timeslots );

            }