From d0ac4cebc7bf6a82f3ce9aca696f624e92876286 Mon Sep 17 00:00:00 2001 From: Dominik Weckbecker Date: Wed, 22 Nov 2023 12:08:47 +0100 Subject: [PATCH 1/6] enable late reverb with BINAURAL_ROOM_REVERB output in SBA --- lib_dec/ivas_binRenderer_internal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib_dec/ivas_binRenderer_internal.c b/lib_dec/ivas_binRenderer_internal.c index ae8ea8cd8c..0c94d53462 100644 --- a/lib_dec/ivas_binRenderer_internal.c +++ b/lib_dec/ivas_binRenderer_internal.c @@ -1229,7 +1229,7 @@ ivas_error ivas_binRenderer_open( } /* Allocate memories needed for reverb module */ - if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV && st_ivas->hIntSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) + if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV && st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) { if ( ( error = ivas_binaural_reverb_open_fastconv( &( hBinRenderer->hReverb ), hBinRenderer->conv_band, hBinRenderer->timeSlots, &( st_ivas->hRenderConfig->roomAcoustics ), st_ivas->hIntSetup.output_config, st_ivas->hDecoderConfig->output_Fs, st_ivas->hHrtfFastConv ) ) != IVAS_ERR_OK ) { -- GitLab From 9c73ca208e9f54a7c62af30de9846c0a860e4207 Mon Sep 17 00:00:00 2001 From: Dominik Weckbecker Date: Wed, 22 Nov 2023 12:35:49 +0100 Subject: [PATCH 2/6] enable reverberator for BINAURAL_ROOM_IR and disable it for BINAURAL_ROOM_REVERB --- lib_dec/ivas_binRenderer_internal.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib_dec/ivas_binRenderer_internal.c b/lib_dec/ivas_binRenderer_internal.c index 0c94d53462..4146f28141 100644 --- a/lib_dec/ivas_binRenderer_internal.c +++ b/lib_dec/ivas_binRenderer_internal.c @@ -1229,8 +1229,12 @@ ivas_error ivas_binRenderer_open( } /* Allocate memories needed for reverb module */ - if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV && st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) - { +#if 1 + if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM && st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR ) +#else + if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV && st_ivas->hIntSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) +#endif + { if ( ( error = ivas_binaural_reverb_open_fastconv( &( hBinRenderer->hReverb ), hBinRenderer->conv_band, hBinRenderer->timeSlots, &( st_ivas->hRenderConfig->roomAcoustics ), st_ivas->hIntSetup.output_config, st_ivas->hDecoderConfig->output_Fs, st_ivas->hHrtfFastConv ) ) != IVAS_ERR_OK ) { return error; -- GitLab From d4befa1270c5e1e69092d61c08fe1d77aaad4ead Mon Sep 17 00:00:00 2001 From: Dominik Weckbecker Date: Wed, 22 Nov 2023 13:49:09 +0100 Subject: [PATCH 3/6] fix formatting --- lib_dec/ivas_binRenderer_internal.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib_dec/ivas_binRenderer_internal.c b/lib_dec/ivas_binRenderer_internal.c index 4146f28141..f76b19c606 100644 --- a/lib_dec/ivas_binRenderer_internal.c +++ b/lib_dec/ivas_binRenderer_internal.c @@ -1231,10 +1231,10 @@ ivas_error ivas_binRenderer_open( /* Allocate memories needed for reverb module */ #if 1 if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM && st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR ) -#else - if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV && st_ivas->hIntSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) +#else + if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV && st_ivas->hIntSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) #endif - { + { if ( ( error = ivas_binaural_reverb_open_fastconv( &( hBinRenderer->hReverb ), hBinRenderer->conv_band, hBinRenderer->timeSlots, &( st_ivas->hRenderConfig->roomAcoustics ), st_ivas->hIntSetup.output_config, st_ivas->hDecoderConfig->output_Fs, st_ivas->hHrtfFastConv ) ) != IVAS_ERR_OK ) { return error; -- GitLab From 31044c862f12b8c371a4cc26cfc936a753ef6c7d Mon Sep 17 00:00:00 2001 From: Dominik Weckbecker Date: Thu, 30 Nov 2023 15:07:48 +0100 Subject: [PATCH 4/6] wrap changes into the new define NONBE_FIX_BINAURAL_ROOM_IR_REVERBERATOR --- lib_com/options.h | 1 + lib_dec/ivas_binRenderer_internal.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lib_com/options.h b/lib_com/options.h index c8eb019c5b..cb3cda3414 100755 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -164,6 +164,7 @@ #define NONBE_FIX_856_TCX_LTP_SYNTH_FILTER /* FhG: issue 856: correct filtering length for tcx-ltp synth filtering*/ #define NONBE_UNIFIED_DECODING_PATHS /* FhG: unify decoding paths */ #define NONBE_FIX_871_ACELP_CRASH_IN_OSBA /* FhG: isse 871: crash in ACELP core encoder with OSBA */ +#define NONBE_FIX_BINAURAL_ROOM_IR_REVERBERATOR /* FhG: re-enable acidentially disabled reverberator for BINAURAL_ROOM_IR */ /* ##################### End NON-BE switches ########################### */ diff --git a/lib_dec/ivas_binRenderer_internal.c b/lib_dec/ivas_binRenderer_internal.c index f76b19c606..162a4fba37 100644 --- a/lib_dec/ivas_binRenderer_internal.c +++ b/lib_dec/ivas_binRenderer_internal.c @@ -1229,7 +1229,7 @@ ivas_error ivas_binRenderer_open( } /* Allocate memories needed for reverb module */ -#if 1 +#ifdef NONBE_FIX_BINAURAL_ROOM_IR_REVERBERATOR if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM && st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR ) #else if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV && st_ivas->hIntSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) -- GitLab From 631961b8060cdcbf86b98c47d4bc250005a74779 Mon Sep 17 00:00:00 2001 From: Dominik Weckbecker Date: Tue, 5 Dec 2023 11:59:04 +0100 Subject: [PATCH 5/6] fix condition for CLDFB reverberator initialization --- lib_dec/ivas_binRenderer_internal.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib_dec/ivas_binRenderer_internal.c b/lib_dec/ivas_binRenderer_internal.c index 162a4fba37..43580f0f1a 100644 --- a/lib_dec/ivas_binRenderer_internal.c +++ b/lib_dec/ivas_binRenderer_internal.c @@ -1230,7 +1230,9 @@ ivas_error ivas_binRenderer_open( /* Allocate memories needed for reverb module */ #ifdef NONBE_FIX_BINAURAL_ROOM_IR_REVERBERATOR - if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM && st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR ) + if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM + || ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV && st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) + ) #else if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV && st_ivas->hIntSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) #endif -- GitLab From 9e152b30d8a5174318648dd7b017e385face4cee Mon Sep 17 00:00:00 2001 From: Dominik Weckbecker Date: Tue, 5 Dec 2023 12:37:53 +0100 Subject: [PATCH 6/6] fix formatting --- lib_dec/ivas_binRenderer_internal.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib_dec/ivas_binRenderer_internal.c b/lib_dec/ivas_binRenderer_internal.c index 43580f0f1a..6d1d83b5b6 100644 --- a/lib_dec/ivas_binRenderer_internal.c +++ b/lib_dec/ivas_binRenderer_internal.c @@ -1230,9 +1230,7 @@ ivas_error ivas_binRenderer_open( /* Allocate memories needed for reverb module */ #ifdef NONBE_FIX_BINAURAL_ROOM_IR_REVERBERATOR - if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM - || ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV && st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) - ) + if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM || ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV && st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) ) #else if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV && st_ivas->hIntSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) #endif -- GitLab