From 6a6e698f77afab1d5e39549526aa1f35746edf2d Mon Sep 17 00:00:00 2001 From: Erik Norvell Date: Tue, 19 Aug 2025 12:05:34 +0200 Subject: [PATCH 1/2] Port NONBE_FIX_1337_MISSING_DIRECTIVITY_DISTATT_EXTREND to enable configurable distAtt in renderer --- apps/renderer.c | 13 ++++++++++++- lib_com/options.h | 1 + 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/apps/renderer.c b/apps/renderer.c index f317178b9..8427ce8dd 100644 --- a/apps/renderer.c +++ b/apps/renderer.c @@ -1167,7 +1167,18 @@ int main( fprintf( stderr, "\nFailed to read renderer configuration from file %s\n", args.renderConfigFilePath ); goto cleanup; } - +#ifdef NONBE_FIX_1337_MISSING_DIRECTIVITY_DISTATT_EXTREND + if ( ( error = RenderConfigReader_getDirectivity( renderConfigReader, args.directivityPatternId, renderConfig.directivity ) ) != IVAS_ERR_OK ) + { + fprintf( stderr, "Failed to get directivity patterns for one or more of IDs: %d %d %d %d\n\n", args.directivityPatternId[0], args.directivityPatternId[1], args.directivityPatternId[2], args.directivityPatternId[3] ); + goto cleanup; + } + if ( ( error = RenderConfigReader_getDistanceAttenuation( renderConfigReader, renderConfig.distAtt ) ) != IVAS_ERR_OK ) + { + fprintf( stderr, "Failed to get Distance Attenuation \n\n" ); + goto cleanup; + } +#endif if ( args.outConfig.audioConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) { #ifdef FIX_1053_REVERB_RECONFIGURATION diff --git a/lib_com/options.h b/lib_com/options.h index 9ef650e07..04f13ce6f 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -138,6 +138,7 @@ #define NONBE_1894_OSBA_SCALING /* FhG: do not scale OSBA inputs by 0.5 any more */ #define NONBE_1360_LFE_DELAY /* Dlb: LFE delay alignment when rendering in CLDFB domain*/ +#define NONBE_FIX_1337_MISSING_DIRECTIVITY_DISTATT_EXTREND /* Eri: issue 1337: Missing directivity setting and distance attenuation in external renderer IVAS_rend */ /* #################### End BASOP porting switches ############################ */ -- GitLab From 34652d5da61adecf5c25f5d8a9fee57e539da2f3 Mon Sep 17 00:00:00 2001 From: Erik Norvell Date: Tue, 19 Aug 2025 14:19:08 +0200 Subject: [PATCH 2/2] Fix error in renderer.c --- apps/renderer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/renderer.c b/apps/renderer.c index 8427ce8dd..2682dd96f 100644 --- a/apps/renderer.c +++ b/apps/renderer.c @@ -1168,12 +1168,12 @@ int main( goto cleanup; } #ifdef NONBE_FIX_1337_MISSING_DIRECTIVITY_DISTATT_EXTREND - if ( ( error = RenderConfigReader_getDirectivity( renderConfigReader, args.directivityPatternId, renderConfig.directivity ) ) != IVAS_ERR_OK ) + if ( ( error = RenderConfigReader_getDirectivity( renderConfigReader, args.directivityPatternId, renderConfig.directivity_fx ) ) != IVAS_ERR_OK ) { fprintf( stderr, "Failed to get directivity patterns for one or more of IDs: %d %d %d %d\n\n", args.directivityPatternId[0], args.directivityPatternId[1], args.directivityPatternId[2], args.directivityPatternId[3] ); goto cleanup; } - if ( ( error = RenderConfigReader_getDistanceAttenuation( renderConfigReader, renderConfig.distAtt ) ) != IVAS_ERR_OK ) + if ( ( error = RenderConfigReader_getDistanceAttenuation( renderConfigReader, renderConfig.distAtt_fx ) ) != IVAS_ERR_OK ) { fprintf( stderr, "Failed to get Distance Attenuation \n\n" ); goto cleanup; -- GitLab