From d58e455c00c98061192f6826a2d8b74dbbb3a431 Mon Sep 17 00:00:00 2001 From: Tapani Pihlajakuja Date: Thu, 20 Nov 2025 13:51:46 +0200 Subject: [PATCH 1/5] Fix issue 1452 by refactoring the default reverb setting into earlier step in renderer init. --- apps/renderer.c | 59 ++++++++++++++++++++++------ lib_rend/lib_rend.c | 94 +-------------------------------------------- 2 files changed, 48 insertions(+), 105 deletions(-) diff --git a/apps/renderer.c b/apps/renderer.c index 753a116c15..9c6168490e 100644 --- a/apps/renderer.c +++ b/apps/renderer.c @@ -1101,6 +1101,53 @@ int main( fprintf( stderr, "\nError in Renderer Config Init: %s\n", ivas_error_to_string( error ) ); goto cleanup; } +#ifdef FIX_1318_ROOM_SIZE_CMD_LINE + + if ( args.outConfig.audioConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) + { + /* Set reverb room size if specified or select based automatically based on default per input formats */ + IVAS_ROOM_SIZE_T selectedReverbRoomSize = args.reverbRoomSize; + if ( selectedReverbRoomSize == IVAS_ROOM_SIZE_AUTO ) + { + bool combinedFormat = false; + selectedReverbRoomSize = IVAS_ROOM_SIZE_MEDIUM; + + /* ISM present with MASA/SBA inputs; treat as combined format */ + if ( args.inConfig.numAudioObjects > 0 && ( args.inConfig.numMasaBuses > 0 || args.inConfig.numAmbisonicsBuses > 0 ) ) + { + combinedFormat = true; + } + + if ( combinedFormat ) + { + selectedReverbRoomSize = IVAS_ROOM_SIZE_MEDIUM; + } + else + { + /* Only set large if ISM is present alone, MASA and Ambisonic have been checked above */ + if ( args.inConfig.numAudioObjects > 0 && args.inConfig.numMultiChannelBuses == 0 ) + { + selectedReverbRoomSize = IVAS_ROOM_SIZE_LARGE; + } + /* if only MC is present, set medium; Will not be overridden by the subsequent block */ + else if ( args.inConfig.numMultiChannelBuses > 0 ) + { + selectedReverbRoomSize = IVAS_ROOM_SIZE_MEDIUM; + } + else if ( args.inConfig.numMasaBuses > 0 || args.inConfig.numAmbisonicsBuses > 0 ) + { + selectedReverbRoomSize = IVAS_ROOM_SIZE_SMALL; + } + } + } + + if ( ( IVAS_REND_SetReverbRoomSize( hIvasRend, selectedReverbRoomSize ) ) != IVAS_ERR_OK ) + { + fprintf( stderr, "\nError setting reverb room size\n" ); + goto cleanup; + } + } +#endif if ( args.renderConfigFilePath[0] != '\0' ) { @@ -1176,18 +1223,6 @@ int main( fprintf( stderr, "\nError in IVAS_REND_SetOrientationTrackingMode(): %s\n", ivas_error_to_string( error ) ); goto cleanup; } -#ifdef FIX_1318_ROOM_SIZE_CMD_LINE - - /* Set reverb room size if specified */ - if ( args.reverbRoomSize != IVAS_ROOM_SIZE_AUTO ) - { - if ( ( IVAS_REND_SetReverbRoomSize( hIvasRend, args.reverbRoomSize ) ) != IVAS_ERR_OK ) - { - fprintf( stderr, "\nError setting reverb room size\n" ); - goto cleanup; - } - } -#endif /* Set up output custom layout configuration */ if ( args.outConfig.audioConfig == IVAS_AUDIO_CONFIG_LS_CUSTOM ) diff --git a/lib_rend/lib_rend.c b/lib_rend/lib_rend.c index 5f1af59a95..36a6e2ddc8 100644 --- a/lib_rend/lib_rend.c +++ b/lib_rend/lib_rend.c @@ -3809,85 +3809,6 @@ static ivas_error isar_pre_rend_init( return IVAS_ERR_OK; } -#ifdef FIX_1318_ROOM_SIZE_CMD_LINE -static IVAS_ROOM_SIZE_T getDefaultReverbSize( - input_ism *ismInputs, - input_masa *masaInputs, - input_mc *mcInputs, - input_sba *sbaInputs ) -{ - bool combinedFormat; - int16_t i; - int16_t nActiveInputsIsm, nActiveInputsMasa, nActiveInputsSba, nActiveInputsMc; - IVAS_ROOM_SIZE_T selectedReverb; - selectedReverb = IVAS_ROOM_SIZE_MEDIUM; - - combinedFormat = false; - nActiveInputsIsm = 0; - nActiveInputsMasa = 0; - nActiveInputsMc = 0; - nActiveInputsSba = 0; - - for ( i = 0; i < RENDERER_MAX_ISM_INPUTS; i++ ) - { - if ( ismInputs[i].base.inConfig != IVAS_AUDIO_CONFIG_INVALID ) - { - nActiveInputsIsm++; - } - } - for ( i = 0; i < RENDERER_MAX_MASA_INPUTS; i++ ) - { - if ( masaInputs[i].base.inConfig != IVAS_AUDIO_CONFIG_INVALID ) - { - nActiveInputsMasa++; - } - } - for ( i = 0; i < RENDERER_MAX_MC_INPUTS; i++ ) - { - if ( mcInputs[i].base.inConfig != IVAS_AUDIO_CONFIG_INVALID ) - { - nActiveInputsMc++; - } - } - for ( i = 0; i < RENDERER_MAX_SBA_INPUTS; i++ ) - { - if ( sbaInputs[i].base.inConfig != IVAS_AUDIO_CONFIG_INVALID ) - { - nActiveInputsSba++; - } - } - - /* ISM present with MASA/SBA inputs; treat as combined format */ - if ( nActiveInputsIsm && ( nActiveInputsMasa || nActiveInputsSba ) ) - { - combinedFormat = true; - } - - if ( combinedFormat ) - { - selectedReverb = IVAS_ROOM_SIZE_MEDIUM; - } - else - { - /* Only set large if ISM is present alone */ - if ( nActiveInputsIsm && !nActiveInputsMc ) - { - selectedReverb = IVAS_ROOM_SIZE_LARGE; - } - /* if only MC is present, set medium; Will not be overridden by the subsequent block */ - else if ( nActiveInputsMc ) - { - selectedReverb = IVAS_ROOM_SIZE_MEDIUM; - } - else if ( nActiveInputsMasa || nActiveInputsSba ) - { - selectedReverb = IVAS_ROOM_SIZE_SMALL; - } - } - - return selectedReverb; -} -#endif /*-------------------------------------------------------------------* @@ -3987,18 +3908,6 @@ ivas_error IVAS_REND_AddInput( /* set global maximum delay after adding an input */ setMaxGlobalDelayNs( hIvasRend ); -#ifdef FIX_1318_ROOM_SIZE_CMD_LINE - - /* select default reverb size after adding an input */ - if ( hIvasRend->selectedRoomReverbSize == DEFAULT_REVERB_UNSET ) - { - IVAS_REND_SetReverbRoomSize( hIvasRend, - getDefaultReverbSize( hIvasRend->inputsIsm, - hIvasRend->inputsMasa, - hIvasRend->inputsMc, - hIvasRend->inputsSba ) ); - } -#endif return IVAS_ERR_OK; } @@ -5289,8 +5198,7 @@ ivas_error IVAS_REND_SetReverbRoomSize( break; case IVAS_ROOM_SIZE_AUTO: default: - hIvasRend->selectedRoomReverbSize = DEFAULT_REVERB_UNSET; - break; /* will be setup in IVAS_REND_AddInput() */ + assert( 0 && "Room size is not set"); } if ( hIvasRend->hRendererConfig != NULL ) -- GitLab From c26312beae18edba53e52ce92cf77bb44786a4fb Mon Sep 17 00:00:00 2001 From: Tapani Pihlajakuja Date: Thu, 20 Nov 2025 13:56:58 +0200 Subject: [PATCH 2/5] Clang format --- lib_rend/lib_rend.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib_rend/lib_rend.c b/lib_rend/lib_rend.c index 36a6e2ddc8..c0c97f0bed 100644 --- a/lib_rend/lib_rend.c +++ b/lib_rend/lib_rend.c @@ -5198,7 +5198,7 @@ ivas_error IVAS_REND_SetReverbRoomSize( break; case IVAS_ROOM_SIZE_AUTO: default: - assert( 0 && "Room size is not set"); + assert( 0 && "Room size is not set" ); } if ( hIvasRend->hRendererConfig != NULL ) -- GitLab From ee9384904a4a1677ac7781737eff22e4b6448d5f Mon Sep 17 00:00:00 2001 From: Marek Szczerba Date: Mon, 8 Dec 2025 21:37:58 +0100 Subject: [PATCH 3/5] Fixing handling of acoustic pre-delay (offset between input signal and late reverberation start) --- apps/decoder.c | 3 +++ apps/renderer.c | 1 + lib_com/common_api_types.h | 3 --- lib_com/ivas_cnst.h | 9 +++++++++ lib_rend/ivas_render_config.c | 30 +++++++++--------------------- lib_rend/lib_rend.c | 3 +++ lib_util/render_config_reader.c | 6 ++++++ 7 files changed, 31 insertions(+), 24 deletions(-) diff --git a/apps/decoder.c b/apps/decoder.c index 9b20043786..526a1fe783 100644 --- a/apps/decoder.c +++ b/apps/decoder.c @@ -41,6 +41,9 @@ #ifdef IVAS_RTPDUMP #include "ivas_rtp_file.h" #endif +#ifdef IVAS_RTPDUMP_ACOUSTIC_ENVIRONMENT +#include "ivas_cnst.h" +#endif #include "jbm_file_writer.h" #include "hrtf_file_reader.h" #include "ls_custom_file_reader.h" diff --git a/apps/renderer.c b/apps/renderer.c index 9c6168490e..8aff80795f 100644 --- a/apps/renderer.c +++ b/apps/renderer.c @@ -1136,6 +1136,7 @@ int main( } else if ( args.inConfig.numMasaBuses > 0 || args.inConfig.numAmbisonicsBuses > 0 ) { + //selectedReverbRoomSize = IVAS_ROOM_SIZE_LARGE; selectedReverbRoomSize = IVAS_ROOM_SIZE_SMALL; } } diff --git a/lib_com/common_api_types.h b/lib_com/common_api_types.h index f4a75208b6..7e91590225 100644 --- a/lib_com/common_api_types.h +++ b/lib_com/common_api_types.h @@ -59,9 +59,6 @@ #define IVAS_ROOM_ABS_COEFF 6 #define IVAS_REVERB_PREDELAY_MAX 20 /* Max input delay for reverb module */ #define IVAS_ER_LIST_HEIGHT 1.6f -#ifdef IVAS_RTPDUMP_ACOUSTIC_ENVIRONMENT -#define IVAS_DEFAULT_AEID 65535 -#endif /* JBM constants for adaptive-playout */ #define IVAS_TIME_SCALE_MIN 50 /* min. time-scaling [%] */ diff --git a/lib_com/ivas_cnst.h b/lib_com/ivas_cnst.h index 2d3c7e969a..90266bc764 100644 --- a/lib_com/ivas_cnst.h +++ b/lib_com/ivas_cnst.h @@ -1605,10 +1605,19 @@ typedef enum #define IVAS_REVERB_DEFAULT_L_N_BANDS 31 #define IVAS_REVERB_DEFAULT_M_N_BANDS 31 #define IVAS_REVERB_DEFAULT_S_N_BANDS 60 + +#define IVAS_REVERB_DEFAULT_SYNTH_PRE_DELAY 0.016f +#define IVAS_REVERB_DEFAULT_S_INPUT_PRE_DELAY 0.0f +#define IVAS_REVERB_DEFAULT_M_INPUT_PRE_DELAY 0.0f +#define IVAS_REVERB_DEFAULT_L_INPUT_PRE_DELAY 0.1f #else #define IVAS_REVERB_DEFAULT_N_BANDS 31 #endif +#ifdef IVAS_RTPDUMP_ACOUSTIC_ENVIRONMENT +#define IVAS_DEFAULT_AEID 65535u +#endif + #define LR_IAC_LENGTH_NR_FC ( RV_LENGTH_NR_FC ) #define LR_IAC_LENGTH_NR_FC_16KHZ ( RV_LENGTH_NR_FC_16KHZ ) diff --git a/lib_rend/ivas_render_config.c b/lib_rend/ivas_render_config.c index dc44c003f2..73d1dd7c58 100644 --- a/lib_rend/ivas_render_config.c +++ b/lib_rend/ivas_render_config.c @@ -45,16 +45,7 @@ * Local constants *-----------------------------------------------------------------------*/ -#ifdef FIX_1318_ROOM_SIZE_CMD_LINE -#define IVAS_REVERB_DEFAULT_L_PRE_DELAY 0.016f -#define IVAS_REVERB_DEFAULT_L_INPUT_DELAY 0.1f - -#define IVAS_REVERB_DEFAULT_S_PRE_DELAY 0.0125f -#define IVAS_REVERB_DEFAULT_S_INPUT_DELAY 0.0f - -#define IVAS_REVERB_DEFAULT_M_PRE_DELAY 0.0125f -#define IVAS_REVERB_DEFAULT_M_INPUT_DELAY 0.0f -#else +#ifndef FIX_1318_ROOM_SIZE_CMD_LINE #define IVAS_REVERB_DEFAULT_PRE_DELAY 0.016f #define IVAS_REVERB_DEFAULT_INPUT_DELAY 0.1f #endif @@ -129,8 +120,8 @@ ivas_error ivas_render_config_init_from_rom( #endif #ifdef FIX_1318_ROOM_SIZE_CMD_LINE ( *hRenderConfig )->roomAcoustics.nBands = IVAS_REVERB_DEFAULT_L_N_BANDS; - ( *hRenderConfig )->roomAcoustics.acousticPreDelay = IVAS_REVERB_DEFAULT_L_PRE_DELAY; - ( *hRenderConfig )->roomAcoustics.inputPreDelay = IVAS_REVERB_DEFAULT_L_INPUT_DELAY; + ( *hRenderConfig )->roomAcoustics.acousticPreDelay = IVAS_REVERB_DEFAULT_SYNTH_PRE_DELAY; + ( *hRenderConfig )->roomAcoustics.inputPreDelay = IVAS_REVERB_DEFAULT_L_INPUT_PRE_DELAY; #else ( *hRenderConfig )->roomAcoustics.nBands = IVAS_REVERB_DEFAULT_N_BANDS; ( *hRenderConfig )->roomAcoustics.acousticPreDelay = IVAS_REVERB_DEFAULT_PRE_DELAY; @@ -190,13 +181,14 @@ ivas_error ivas_render_config_change_defaults( IVAS_DefaultReverbSize defaultReverbSize /* i: Reverb default size */ ) { + hRenderConfig->roomAcoustics.acousticPreDelay = IVAS_REVERB_DEFAULT_SYNTH_PRE_DELAY; + hRenderConfig->roomAcoustics.use_er = IVAS_REVERB_DEFAULT_USE_ER; + switch ( defaultReverbSize ) { case DEFAULT_REVERB_SMALL: hRenderConfig->roomAcoustics.nBands = IVAS_REVERB_DEFAULT_S_N_BANDS; - hRenderConfig->roomAcoustics.acousticPreDelay = IVAS_REVERB_DEFAULT_S_PRE_DELAY; - hRenderConfig->roomAcoustics.inputPreDelay = IVAS_REVERB_DEFAULT_S_INPUT_DELAY; - hRenderConfig->roomAcoustics.use_er = IVAS_REVERB_DEFAULT_USE_ER; + hRenderConfig->roomAcoustics.inputPreDelay = IVAS_REVERB_DEFAULT_S_INPUT_PRE_DELAY; set_zero( &hRenderConfig->roomAcoustics.pFc_input[0], CLDFB_NO_CHANNELS_MAX ); set_zero( &hRenderConfig->roomAcoustics.pAcoustic_rt60[0], CLDFB_NO_CHANNELS_MAX ); set_zero( &hRenderConfig->roomAcoustics.pAcoustic_dsr[0], CLDFB_NO_CHANNELS_MAX ); @@ -207,9 +199,7 @@ ivas_error ivas_render_config_change_defaults( break; case DEFAULT_REVERB_MEDIUM: hRenderConfig->roomAcoustics.nBands = IVAS_REVERB_DEFAULT_M_N_BANDS; - hRenderConfig->roomAcoustics.acousticPreDelay = IVAS_REVERB_DEFAULT_M_PRE_DELAY; - hRenderConfig->roomAcoustics.inputPreDelay = IVAS_REVERB_DEFAULT_M_INPUT_DELAY; - hRenderConfig->roomAcoustics.use_er = IVAS_REVERB_DEFAULT_USE_ER; + hRenderConfig->roomAcoustics.inputPreDelay = IVAS_REVERB_DEFAULT_M_INPUT_PRE_DELAY; set_zero( &hRenderConfig->roomAcoustics.pFc_input[0], CLDFB_NO_CHANNELS_MAX ); set_zero( &hRenderConfig->roomAcoustics.pAcoustic_rt60[0], CLDFB_NO_CHANNELS_MAX ); set_zero( &hRenderConfig->roomAcoustics.pAcoustic_dsr[0], CLDFB_NO_CHANNELS_MAX ); @@ -220,9 +210,7 @@ ivas_error ivas_render_config_change_defaults( break; case DEFAULT_REVERB_LARGE: hRenderConfig->roomAcoustics.nBands = IVAS_REVERB_DEFAULT_L_N_BANDS; - hRenderConfig->roomAcoustics.acousticPreDelay = IVAS_REVERB_DEFAULT_L_PRE_DELAY; - hRenderConfig->roomAcoustics.inputPreDelay = IVAS_REVERB_DEFAULT_L_INPUT_DELAY; - hRenderConfig->roomAcoustics.use_er = IVAS_REVERB_DEFAULT_USE_ER; + hRenderConfig->roomAcoustics.inputPreDelay = IVAS_REVERB_DEFAULT_L_INPUT_PRE_DELAY; set_zero( &hRenderConfig->roomAcoustics.pFc_input[0], CLDFB_NO_CHANNELS_MAX ); set_zero( &hRenderConfig->roomAcoustics.pAcoustic_rt60[0], CLDFB_NO_CHANNELS_MAX ); set_zero( &hRenderConfig->roomAcoustics.pAcoustic_dsr[0], CLDFB_NO_CHANNELS_MAX ); diff --git a/lib_rend/lib_rend.c b/lib_rend/lib_rend.c index c0c97f0bed..a1d1eb7468 100644 --- a/lib_rend/lib_rend.c +++ b/lib_rend/lib_rend.c @@ -4614,6 +4614,9 @@ ivas_error IVAS_REND_FeedRenderConfig( #endif #ifdef IVAS_RTPDUMP_ACOUSTIC_ENVIRONMENT hRenderConfig->roomAcoustics.aeID = renderConfig.roomAcoustics.aeID; +#endif +#ifdef FIX_1318_ROOM_SIZE_CMD_LINE + hIvasRend->selectedRoomReverbSize = DEFAULT_REVERB_UNSET; #endif hRenderConfig->roomAcoustics.nBands = renderConfig.roomAcoustics.nBands; hRenderConfig->roomAcoustics.acousticPreDelay = renderConfig.roomAcoustics.acousticPreDelay; diff --git a/lib_util/render_config_reader.c b/lib_util/render_config_reader.c index 761b203cb0..e72beec8b2 100644 --- a/lib_util/render_config_reader.c +++ b/lib_util/render_config_reader.c @@ -2395,6 +2395,9 @@ ivas_error RenderConfigReader_read( aeHasERsize = aeHasERabs = FALSE; params_idx = 0; pValue = (char *) calloc( strlen( pParams ), sizeof( char ) ); +#ifdef FIX_1318_ROOM_SIZE_CMD_LINE + hRenderConfig->roomAcoustics.acousticPreDelay = IVAS_REVERB_DEFAULT_SYNTH_PRE_DELAY; +#endif while ( sscanf( pParams + params_idx, "%64[^=]=%[^;];", item, pValue ) == 2 ) { params_idx += (int32_t) ( strlen( item ) + strlen( pValue ) + 2 ); @@ -3075,6 +3078,9 @@ ivas_error RenderConfigReader_getAcousticEnvironment( { if ( id == pRenderConfigReader->pAE[n].id ) { +#ifdef FIX_1318_ROOM_SIZE_CMD_LINE + pAcEnv->aeID = (uint16_t)pRenderConfigReader->pAE[n].id; +#endif pAcEnv->nBands = (int16_t) pRenderConfigReader->pAE[n].pFG->nrBands; pAcEnv->inputPreDelay = pRenderConfigReader->pAE[n].preDelay; for ( m = 0; m < pAcEnv->nBands; m++ ) -- GitLab From 1024546337094de867aba45c2a33e6d0d67b2036 Mon Sep 17 00:00:00 2001 From: Marek Szczerba Date: Mon, 8 Dec 2025 22:13:38 +0100 Subject: [PATCH 4/5] Fixing handling of acoustic pre-delay (offset between input signal and late reverberation start) --- lib_util/render_config_reader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib_util/render_config_reader.c b/lib_util/render_config_reader.c index fdd74ce4dd..5b63f2eb50 100644 --- a/lib_util/render_config_reader.c +++ b/lib_util/render_config_reader.c @@ -2373,7 +2373,7 @@ ivas_error RenderConfigReader_read( aeHasERsize = aeHasERabs = FALSE; params_idx = 0; pValue = (char *) calloc( strlen( pParams ), sizeof( char ) ); -#ifdef FIX_1318_ROOM_SIZE_CMD_LINE +#ifdef FIX_1452_DEFAULT_REVERB hRenderConfig->roomAcoustics.acousticPreDelay = IVAS_REVERB_DEFAULT_SYNTH_PRE_DELAY; #endif while ( sscanf( pParams + params_idx, "%64[^=]=%[^;];", item, pValue ) == 2 ) @@ -3035,7 +3035,7 @@ ivas_error RenderConfigReader_getAcousticEnvironment( { if ( id == pRenderConfigReader->pAE[n].id ) { -#ifdef FIX_1318_ROOM_SIZE_CMD_LINE +#ifdef FIX_1452_DEFAULT_REVERB pAcEnv->aeID = (uint16_t)pRenderConfigReader->pAE[n].id; #endif pAcEnv->nBands = (int16_t) pRenderConfigReader->pAE[n].pFG->nrBands; -- GitLab From a63fedd24b88666119d1f30220dde3ef9a67e1ed Mon Sep 17 00:00:00 2001 From: Marek Szczerba Date: Mon, 8 Dec 2025 22:18:10 +0100 Subject: [PATCH 5/5] Clang reported issues --- apps/renderer.c | 3 +-- lib_com/common_api_types.h | 2 +- lib_rend/ivas_render_config.c | 2 +- lib_util/render_config_reader.c | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/apps/renderer.c b/apps/renderer.c index c3fd6ba493..0d313f9a94 100644 --- a/apps/renderer.c +++ b/apps/renderer.c @@ -1090,7 +1090,7 @@ int main( fprintf( stderr, "\nError in Renderer Config Init: %s\n", ivas_error_to_string( error ) ); goto cleanup; } -#ifdef FIX_1318_ROOM_SIZE_CMD_LINE +#ifdef FIX_1452_DEFAULT_REVERB if ( args.outConfig.audioConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) { @@ -1125,7 +1125,6 @@ int main( } else if ( args.inConfig.numMasaBuses > 0 || args.inConfig.numAmbisonicsBuses > 0 ) { - //selectedReverbRoomSize = IVAS_ROOM_SIZE_LARGE; selectedReverbRoomSize = IVAS_ROOM_SIZE_SMALL; } } diff --git a/lib_com/common_api_types.h b/lib_com/common_api_types.h index 27478edf9f..a0e420c366 100644 --- a/lib_com/common_api_types.h +++ b/lib_com/common_api_types.h @@ -61,7 +61,7 @@ #define IVAS_REVERB_PREDELAY_MAX 20 /* Max input delay for reverb module */ #define IVAS_ER_LIST_HEIGHT 1.6f #ifndef FIX_1452_DEFAULT_REVERB -#define IVAS_DEFAULT_AEID 65535 +#define IVAS_DEFAULT_AEID 65535 #endif /* JBM constants for adaptive-playout */ diff --git a/lib_rend/ivas_render_config.c b/lib_rend/ivas_render_config.c index 59f164cd6e..e01478caa9 100644 --- a/lib_rend/ivas_render_config.c +++ b/lib_rend/ivas_render_config.c @@ -127,7 +127,7 @@ ivas_error ivas_render_config_init_from_rom( ( *hRenderConfig )->roomAcoustics.acousticPreDelay = IVAS_REVERB_DEFAULT_SYNTH_PRE_DELAY; ( *hRenderConfig )->roomAcoustics.inputPreDelay = IVAS_REVERB_DEFAULT_L_INPUT_PRE_DELAY; #else - ( * hRenderConfig )->roomAcoustics.acousticPreDelay = IVAS_REVERB_DEFAULT_L_PRE_DELAY; + ( *hRenderConfig )->roomAcoustics.acousticPreDelay = IVAS_REVERB_DEFAULT_L_PRE_DELAY; ( *hRenderConfig )->roomAcoustics.inputPreDelay = IVAS_REVERB_DEFAULT_L_INPUT_DELAY; #endif ( *hRenderConfig )->roomAcoustics.use_er = IVAS_REVERB_DEFAULT_USE_ER; diff --git a/lib_util/render_config_reader.c b/lib_util/render_config_reader.c index 5b63f2eb50..ea06b8baf5 100644 --- a/lib_util/render_config_reader.c +++ b/lib_util/render_config_reader.c @@ -3036,7 +3036,7 @@ ivas_error RenderConfigReader_getAcousticEnvironment( if ( id == pRenderConfigReader->pAE[n].id ) { #ifdef FIX_1452_DEFAULT_REVERB - pAcEnv->aeID = (uint16_t)pRenderConfigReader->pAE[n].id; + pAcEnv->aeID = (uint16_t) pRenderConfigReader->pAE[n].id; #endif pAcEnv->nBands = (int16_t) pRenderConfigReader->pAE[n].pFG->nrBands; pAcEnv->inputPreDelay = pRenderConfigReader->pAE[n].preDelay; -- GitLab