From 903169726cee17e9c387a8401d55587ed60d9cd0 Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Sun, 3 Aug 2025 20:37:12 +0200 Subject: [PATCH] [cleanup] accept FIX_1043_JBM_MD_BUFFER --- lib_com/options.h | 1 - lib_dec/ivas_init_dec.c | 4 ---- lib_dec/ivas_jbm_dec.c | 12 ------------ 3 files changed, 17 deletions(-) diff --git a/lib_com/options.h b/lib_com/options.h index e31f292aa..0c6be7624 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -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 */ diff --git a/lib_dec/ivas_init_dec.c b/lib_dec/ivas_init_dec.c index dfbe9f497..a2a2ca32d 100644 --- a/lib_dec/ivas_init_dec.c +++ b/lib_dec/ivas_init_dec.c @@ -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 ) { diff --git a/lib_dec/ivas_jbm_dec.c b/lib_dec/ivas_jbm_dec.c index e61825b77..4a7d76917 100644 --- a/lib_dec/ivas_jbm_dec.c +++ b/lib_dec/ivas_jbm_dec.c @@ -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 ); } -- GitLab