From ad061ae58af18c9abf53ccd809d6868a8a6bae66 Mon Sep 17 00:00:00 2001 From: "Malenovsky, Vladimir" Date: Thu, 20 Nov 2025 10:10:58 +0100 Subject: [PATCH 1/3] add renderConfig as an input parameter to feedAcousticEnvPI() --- apps/decoder.c | 7 ++++++- lib_dec/lib_dec.c | 13 ++++++++++++- lib_dec/lib_dec.h | 3 +++ 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/apps/decoder.c b/apps/decoder.c index 9b20043786..66fbbf318c 100644 --- a/apps/decoder.c +++ b/apps/decoder.c @@ -3909,7 +3909,12 @@ static ivas_error decodeVoIP( numPiData++; } - if ( ( error = IVAS_DEC_FeedPiDataToDecoder( hIvasDec, &ivasRtp.piData[ivasRtp.nProcPiData], numPiData ) ) != IVAS_ERR_OK ) + if ( ( error = IVAS_DEC_FeedPiDataToDecoder( hIvasDec, &ivasRtp.piData[ivasRtp.nProcPiData], numPiData +#ifdef DEBUGGING + ,renderConfig +#endif + + ) ) != IVAS_ERR_OK ) { fprintf( stderr, "\nError in IVAS_DEC_VoIP_GetSamples: %s\n", IVAS_DEC_GetErrorMessage( error ) ); goto cleanup; diff --git a/lib_dec/lib_dec.c b/lib_dec/lib_dec.c index de95304301..e770a9f2c7 100644 --- a/lib_dec/lib_dec.c +++ b/lib_dec/lib_dec.c @@ -3727,6 +3727,9 @@ ivas_error IVAS_DEC_FeedRenderConfig( static ivas_error feedAcousticEnvPI( IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */ const IVAS_PIDATA_ACOUSTIC_ENV hAcoustEnvPI /* i : Render configuration struct */ +#ifdef DEBUGGING + ,const IVAS_RENDER_CONFIG_DATA renderConfig /* i : Render configuration struct */ +#endif ) { RENDER_CONFIG_HANDLE hRenderConfig; @@ -6151,6 +6154,10 @@ ivas_error IVAS_DEC_FeedPiDataToDecoder( IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */ hPiDataTs piData, /* i : PI data received in rtp packet */ uint32_t numPiData /* i : number of PI data received in rtp packet */ +#ifdef DEBUGGING + , + const IVAS_RENDER_CONFIG_DATA renderConfig /* i : Render configuration struct */ +#endif ) { uint32_t i; @@ -6200,7 +6207,11 @@ ivas_error IVAS_DEC_FeedPiDataToDecoder( if ( piData->data.acousticEnv.availLateReverb && st_ivas->hRenderConfig != NULL && aeid != st_ivas->hRenderConfig->roomAcoustics.aeID ) { - error = feedAcousticEnvPI( hIvasDec, piData->data.acousticEnv ); + error = feedAcousticEnvPI( hIvasDec, piData->data.acousticEnv +#ifdef DEBUGGING + ,renderConfig +#endif + ); } } break; diff --git a/lib_dec/lib_dec.h b/lib_dec/lib_dec.h index 24a663bd35..4abefe9302 100644 --- a/lib_dec/lib_dec.h +++ b/lib_dec/lib_dec.h @@ -553,6 +553,9 @@ ivas_error IVAS_DEC_FeedPiDataToDecoder( IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */ hPiDataTs piData, /* i : PI data received in rtp packet */ uint32_t numPiData /* i : number of PI data received in rtp packet */ +#ifdef DEBUGGING + ,const IVAS_RENDER_CONFIG_DATA renderConfig /* i : Render configuration struct */ +#endif ); #endif -- GitLab From 4a07056dab5cb392d81eddc57a40c5edf4bfd614 Mon Sep 17 00:00:00 2001 From: "Malenovsky, Vladimir" Date: Thu, 20 Nov 2025 10:19:31 +0100 Subject: [PATCH 2/3] more appropriate declaration --- lib_dec/lib_dec.c | 8 ++++---- lib_dec/lib_dec.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib_dec/lib_dec.c b/lib_dec/lib_dec.c index e770a9f2c7..0857777ac5 100644 --- a/lib_dec/lib_dec.c +++ b/lib_dec/lib_dec.c @@ -3728,7 +3728,7 @@ static ivas_error feedAcousticEnvPI( IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */ const IVAS_PIDATA_ACOUSTIC_ENV hAcoustEnvPI /* i : Render configuration struct */ #ifdef DEBUGGING - ,const IVAS_RENDER_CONFIG_DATA renderConfig /* i : Render configuration struct */ + ,const IVAS_RENDER_CONFIG_DATA *renderConfig /* i : Render configuration struct */ #endif ) { @@ -3746,11 +3746,11 @@ static ivas_error feedAcousticEnvPI( #ifdef DEBUGGING hRenderConfig->renderer_type_override = IVAS_RENDER_TYPE_OVERRIDE_NONE; - if ( renderConfig.renderer_type_override == IVAS_RENDER_TYPE_OVERRIDE_FASTCONV ) + if ( renderConfig->renderer_type_override == IVAS_RENDER_TYPE_OVERRIDE_FASTCONV ) { hRenderConfig->renderer_type_override = IVAS_RENDER_TYPE_OVERRIDE_FASTCONV; } - if ( renderConfig.renderer_type_override == IVAS_RENDER_TYPE_OVERRIDE_CREND ) + if ( renderConfig->renderer_type_override == IVAS_RENDER_TYPE_OVERRIDE_CREND ) { hRenderConfig->renderer_type_override = IVAS_RENDER_TYPE_OVERRIDE_CREND; } @@ -6156,7 +6156,7 @@ ivas_error IVAS_DEC_FeedPiDataToDecoder( uint32_t numPiData /* i : number of PI data received in rtp packet */ #ifdef DEBUGGING , - const IVAS_RENDER_CONFIG_DATA renderConfig /* i : Render configuration struct */ + const IVAS_RENDER_CONFIG_DATA *renderConfig /* i : Render configuration struct */ #endif ) { diff --git a/lib_dec/lib_dec.h b/lib_dec/lib_dec.h index 4abefe9302..1255c60f92 100644 --- a/lib_dec/lib_dec.h +++ b/lib_dec/lib_dec.h @@ -554,7 +554,7 @@ ivas_error IVAS_DEC_FeedPiDataToDecoder( hPiDataTs piData, /* i : PI data received in rtp packet */ uint32_t numPiData /* i : number of PI data received in rtp packet */ #ifdef DEBUGGING - ,const IVAS_RENDER_CONFIG_DATA renderConfig /* i : Render configuration struct */ + ,const IVAS_RENDER_CONFIG_DATA *renderConfig /* i : Render configuration struct */ #endif ); #endif -- GitLab From 7bcf5436baa9a485c7689a16ea8e75484dcc7755 Mon Sep 17 00:00:00 2001 From: Vladimir Malenovsky Date: Thu, 20 Nov 2025 10:24:17 +0100 Subject: [PATCH 3/3] clang format --- apps/decoder.c | 9 +++++---- lib_dec/lib_dec.c | 8 +++++--- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/apps/decoder.c b/apps/decoder.c index 66fbbf318c..59452aaca7 100644 --- a/apps/decoder.c +++ b/apps/decoder.c @@ -3909,12 +3909,13 @@ static ivas_error decodeVoIP( numPiData++; } - if ( ( error = IVAS_DEC_FeedPiDataToDecoder( hIvasDec, &ivasRtp.piData[ivasRtp.nProcPiData], numPiData + if ( ( error = IVAS_DEC_FeedPiDataToDecoder( hIvasDec, &ivasRtp.piData[ivasRtp.nProcPiData], numPiData #ifdef DEBUGGING - ,renderConfig + , + renderConfig #endif - - ) ) != IVAS_ERR_OK ) + + ) ) != IVAS_ERR_OK ) { fprintf( stderr, "\nError in IVAS_DEC_VoIP_GetSamples: %s\n", IVAS_DEC_GetErrorMessage( error ) ); goto cleanup; diff --git a/lib_dec/lib_dec.c b/lib_dec/lib_dec.c index 0857777ac5..425b4c9b28 100644 --- a/lib_dec/lib_dec.c +++ b/lib_dec/lib_dec.c @@ -3728,7 +3728,8 @@ static ivas_error feedAcousticEnvPI( IVAS_DEC_HANDLE hIvasDec, /* i/o: IVAS decoder handle */ const IVAS_PIDATA_ACOUSTIC_ENV hAcoustEnvPI /* i : Render configuration struct */ #ifdef DEBUGGING - ,const IVAS_RENDER_CONFIG_DATA *renderConfig /* i : Render configuration struct */ + , + const IVAS_RENDER_CONFIG_DATA *renderConfig /* i : Render configuration struct */ #endif ) { @@ -6207,9 +6208,10 @@ ivas_error IVAS_DEC_FeedPiDataToDecoder( if ( piData->data.acousticEnv.availLateReverb && st_ivas->hRenderConfig != NULL && aeid != st_ivas->hRenderConfig->roomAcoustics.aeID ) { - error = feedAcousticEnvPI( hIvasDec, piData->data.acousticEnv + error = feedAcousticEnvPI( hIvasDec, piData->data.acousticEnv #ifdef DEBUGGING - ,renderConfig + , + renderConfig #endif ); } -- GitLab