From 4afce03482bef50f07272486efd87e1a932a03f0 Mon Sep 17 00:00:00 2001 From: Devansh Kandpal <43807487+mrkandpal@users.noreply.github.com> Date: Wed, 6 Aug 2025 09:44:08 +0200 Subject: [PATCH 1/4] compiler switch + changes for mr 1731 --- apps/decoder.c | 10 ++++++++++ lib_com/options.h | 1 + lib_dec/ivas_output_config_fx.c | 4 ++++ 3 files changed, 15 insertions(+) diff --git a/apps/decoder.c b/apps/decoder.c index 179ad3273..4be7d0765 100644 --- a/apps/decoder.c +++ b/apps/decoder.c @@ -373,6 +373,7 @@ int main( } } +#ifndef FIX_1158_FASTCONV_REVERB_HRTF /*------------------------------------------------------------------------------------------* * Open renderer configuration reader file *------------------------------------------------------------------------------------------*/ @@ -393,6 +394,7 @@ int main( goto cleanup; } } +#endif /*------------------------------------------------------------------------------------------* * Configure the decoder @@ -482,6 +484,14 @@ int main( goto cleanup; } +#ifdef FIX_1158_FASTCONV_REVERB_HRTF + if ( ( error = RenderConfigReader_open( arg.renderConfigFilename, &renderConfigReader ) ) != IVAS_ERR_OK ) + { + fprintf( stderr, "\nError: Can't open Renderer configuration file %s \n\n", arg.renderConfigFilename ); + goto cleanup; + } +#endif + if ( RenderConfigReader_read( renderConfigReader, arg.renderConfigFilename, &renderConfig ) != IVAS_ERR_OK ) { fprintf( stderr, "Failed to read renderer configuration from file %s\n\n", arg.renderConfigFilename ); diff --git a/lib_com/options.h b/lib_com/options.h index ffdebc813..f909c68ff 100755 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -116,6 +116,7 @@ #define FIX_1068_ASAN_IN_MC_2_BINAURAL_ROOM_IR /* issue 1068 : Memory leak in MC to BINAURAL_ROOM decoding with bitrate switching*/ #define NONBE_FIX_MC_LFE_LPF /* Dlb: Adding the LFE LPF filter back for MC content. */ +#define FIX_1158_FASTCONV_REVERB_HRTF /* Philips: issue 1158: Rendering with FastConv to BINAURAL_ROOM_REVERB uses BRIR convolution instead of HRTF */ /* #################### End BASOP porting switches ############################ */ diff --git a/lib_dec/ivas_output_config_fx.c b/lib_dec/ivas_output_config_fx.c index de1066cd5..b875a16f2 100644 --- a/lib_dec/ivas_output_config_fx.c +++ b/lib_dec/ivas_output_config_fx.c @@ -125,7 +125,11 @@ void ivas_renderer_select( { *internal_config = output_config; move16(); +#ifdef FIX_1158_FASTCONV_REVERB_HRTF + IF( EQ_32( output_config, IVAS_AUDIO_CONFIG_BINAURAL ) || EQ_32( output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) || EQ_32( output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED ) || EQ_32( output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) ) +#else IF( EQ_32( output_config, IVAS_AUDIO_CONFIG_BINAURAL ) || EQ_32( output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED ) || EQ_32( output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) ) +#endif { *renderer_type = RENDERER_BINAURAL_PARAMETRIC; move16(); -- GitLab From 77013d347ed7eb90e796438a7ee6a37e47850426 Mon Sep 17 00:00:00 2001 From: Devansh Kandpal <43807487+mrkandpal@users.noreply.github.com> Date: Wed, 6 Aug 2025 10:03:44 +0200 Subject: [PATCH 2/4] MR marked ready, restart pipeline -- GitLab From fd015ee45424e2dc999ed01338b00c17c6656486 Mon Sep 17 00:00:00 2001 From: Devansh Kandpal <43807487+mrkandpal@users.noreply.github.com> Date: Mon, 11 Aug 2025 14:09:52 +0200 Subject: [PATCH 3/4] Fixed bug - FL MR change added at wrong location --- lib_dec/ivas_output_config_fx.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib_dec/ivas_output_config_fx.c b/lib_dec/ivas_output_config_fx.c index 1e5acbf34..25533b1d4 100644 --- a/lib_dec/ivas_output_config_fx.c +++ b/lib_dec/ivas_output_config_fx.c @@ -125,11 +125,7 @@ void ivas_renderer_select( { *internal_config = output_config; move16(); -#ifdef FIX_1158_FASTCONV_REVERB_HRTF - IF( EQ_32( output_config, IVAS_AUDIO_CONFIG_BINAURAL ) || EQ_32( output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) || EQ_32( output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED ) || EQ_32( output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) ) -#else IF( EQ_32( output_config, IVAS_AUDIO_CONFIG_BINAURAL ) || EQ_32( output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED ) || EQ_32( output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) ) -#endif { *renderer_type = RENDERER_BINAURAL_PARAMETRIC; move16(); @@ -146,7 +142,11 @@ void ivas_renderer_select( move16(); test(); +#ifdef FIX_1158_FASTCONV_REVERB_HRTF + IF( EQ_32( output_config, IVAS_AUDIO_CONFIG_BINAURAL ) || EQ_32( output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) || EQ_32( output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED ) || EQ_32( output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) ) +#else IF( EQ_32( output_config, IVAS_AUDIO_CONFIG_BINAURAL ) || EQ_32( output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED ) || EQ_32( output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) ) +#endif { *renderer_type = RENDERER_BINAURAL_FASTCONV; move16(); -- GitLab From 7d3d2bd050507312a409b56e5ac041fbf913160f Mon Sep 17 00:00:00 2001 From: Devansh Kandpal <43807487+mrkandpal@users.noreply.github.com> Date: Fri, 15 Aug 2025 11:09:38 +0200 Subject: [PATCH 4/4] Added missing instrumetation code --- lib_dec/ivas_output_config_fx.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib_dec/ivas_output_config_fx.c b/lib_dec/ivas_output_config_fx.c index 2368bf619..14341a888 100644 --- a/lib_dec/ivas_output_config_fx.c +++ b/lib_dec/ivas_output_config_fx.c @@ -142,6 +142,8 @@ void ivas_renderer_select( move16(); test(); + test(); + test(); #ifdef FIX_1158_FASTCONV_REVERB_HRTF IF( EQ_32( output_config, IVAS_AUDIO_CONFIG_BINAURAL ) || EQ_32( output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) || EQ_32( output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED ) || EQ_32( output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) ) #else -- GitLab