From 1d4909390902867d550353317d8b33724d265803 Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Sun, 3 Aug 2025 20:42:56 +0200 Subject: [PATCH] [cleanup] accept FIX_1043_JBM_MD_BUFFER --- lib_com/options.h | 1 - lib_dec/ivas_init_dec_fx.c | 4 ---- lib_dec/ivas_jbm_dec_fx.c | 12 ------------ 3 files changed, 17 deletions(-) diff --git a/lib_com/options.h b/lib_com/options.h index 8a9848e4d..692a6dbba 100755 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -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 ) */ diff --git a/lib_dec/ivas_init_dec_fx.c b/lib_dec/ivas_init_dec_fx.c index 60a9aecb7..3fe15331c 100644 --- a/lib_dec/ivas_init_dec_fx.c +++ b/lib_dec/ivas_init_dec_fx.c @@ -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 ) ) { diff --git a/lib_dec/ivas_jbm_dec_fx.c b/lib_dec/ivas_jbm_dec_fx.c index 6c6f93fd7..f3f15daea 100644 --- a/lib_dec/ivas_jbm_dec_fx.c +++ b/lib_dec/ivas_jbm_dec_fx.c @@ -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 ); } -- GitLab