Commit 0181b006 authored by multrus's avatar multrus
Browse files

Merge branch '1635_basop_cleanup' into 'main' 

Port MR1509 to main

See merge request !1963
parents 450d5b92 1d490939

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -98,7 +98,6 @@ 
#define FIX_1044_ISM_REND_MEMORY                        /* VA: issue 1044: Lower the memory of the ISM renderer handle. */



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

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



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

#define NONBE_FIX_991_PARAMBIN_BINARY_HRTF              /* Nokia: issue #991: fix using of binary file HRTF in ParamBin (to activate when USE_NEW_HRTF_BINARY_FILE_FORMAT and FIX_777_COMBI_RENDER_CONFIG_FILE are on ) */

lib_dec/ivas_init_dec_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -2671,12 +2671,8 @@ ivas_error ivas_init_decoder_fx( 
            return error;

        }

    }

#ifdef FIX_1043_JBM_MD_BUFFER

    test();

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

#else

    IF( st_ivas->hJbmMetadata == NULL )

#endif

    {

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

        {

lib_dec/ivas_jbm_dec_fx.c

+0 −12
Original line number Diff line number Diff line
@@ -288,12 +288,8 @@ ivas_error ivas_jbm_dec_tc_fx( 
                return error;

            }



#ifdef FIX_1043_JBM_MD_BUFFER

            test();

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

#else

            IF( EQ_32( output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) )

#endif

            {

                ivas_jbm_dec_copy_masa_meta_to_buffer( st_ivas );

            }
@@ -831,9 +827,7 @@ ivas_error ivas_jbm_dec_tc_fx( 


            ivas_omasa_rearrange_channels_fx( p_output_fx, 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 );

            }
@@ -1623,12 +1617,8 @@ void ivas_jbm_dec_feed_tc_to_renderer_fx( 


        test();

        test();

#ifdef FIX_1043_JBM_MD_BUFFER

        test();

        IF( ( EQ_16( st_ivas->ivas_format, MASA_FORMAT ) || EQ_16( st_ivas->ivas_format, MASA_ISM_FORMAT ) ) && EQ_16( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) && st_ivas->hDecoderConfig->Opt_tsm )

#else

        IF( ( EQ_16( st_ivas->ivas_format, MASA_FORMAT ) || EQ_16( st_ivas->ivas_format, MASA_ISM_FORMAT ) ) && EQ_16( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) )

#endif

        {

            ivas_jbm_masa_sf_to_slot_map( st_ivas, n_render_timeslots );

        }
@@ -1749,9 +1739,7 @@ void ivas_jbm_dec_feed_tc_to_renderer_fx( 
        IF( EQ_32( st_ivas->renderer_type, RENDERER_OMASA_MIX_EXT ) || EQ_32( st_ivas->renderer_type, RENDERER_OMASA_OBJECT_EXT ) )

        {

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

            }