From 67991420e531dbe2abd30f85f2259e13dbcbca2a Mon Sep 17 00:00:00 2001 From: Erik Norvell Date: Thu, 11 Sep 2025 13:38:30 +0200 Subject: [PATCH 1/2] Add FIX_1999_TEMPORARY_DISABLE_DIST_ATT_CHECK as temporary solution for issue 1999, --- lib_com/options.h | 1 + lib_util/render_config_reader.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/lib_com/options.h b/lib_com/options.h index 9765329e5..f53e90fb6 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -110,6 +110,7 @@ #define NONBE_FIX_1220_OMASA_JBM_EXT_USAN /* Nokia: fix issue 1220 OMASA EXT JBM USAN, also fix similar cases of free to avoid future problems */ #define NONBE_FIX_1376_MDCT_CONCEALMENT /* FhG: fix concealment artifact in MDCT Stereo with DTX, in case transition frame gets lost */ #define NONBE_1377_REND_DIRATT_CONF /* Eri: Issue 1377: Error in directivity attenuation configuration for both IVAS_dec and IVAS_rend */ +#define FIX_1999_TEMPORARY_DISABLE_DIST_ATT_CHECK /* Eri: Issue 1999: Range check on float values of distance attenuation, while the float values are not propagated to this function. The test is not correct, but configurable distance attenuation is not used in Characterization.*/ /* #################### End BASOP porting switches ############################ */ diff --git a/lib_util/render_config_reader.c b/lib_util/render_config_reader.c index e2457301f..4ba97b80a 100644 --- a/lib_util/render_config_reader.c +++ b/lib_util/render_config_reader.c @@ -1279,6 +1279,7 @@ ivas_error RenderConfigReader_checkValues( pRoom_acoustics->AbsCoeff_fx[wall_idx] = ER_MAX_ABS_COEFF_FX; } } +#ifndef FIX_1999_TEMPORARY_DISABLE_DIST_ATT_CHECK /* Verify range of distance attenuation parameters: 0.1 <= distAtt[0] <= distAtt[1] */ /* 0.0 <= distAtt[2] <= 10.0 */ hRenderConfig->distAtt[0] = max( 0.1f, hRenderConfig->distAtt[0] ); @@ -1292,6 +1293,7 @@ ivas_error RenderConfigReader_checkValues( hRenderConfig->directivity[i * 3 + 1] = max( 0.0f, min( 360.0f, hRenderConfig->directivity[i * 3 + 1] ) ); hRenderConfig->directivity[i * 3 + 2] = max( 0.0f, min( 1.0f, hRenderConfig->directivity[i * 3 + 2] ) ); } +#endif } -- GitLab From 2759b074427c7b039c6a38336daf8ff330da17a0 Mon Sep 17 00:00:00 2001 From: Erik Norvell Date: Thu, 11 Sep 2025 13:59:21 +0200 Subject: [PATCH 2/2] Add fix for compiler warning --- lib_util/render_config_reader.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib_util/render_config_reader.c b/lib_util/render_config_reader.c index 4ba97b80a..1d5f111ac 100644 --- a/lib_util/render_config_reader.c +++ b/lib_util/render_config_reader.c @@ -1198,7 +1198,9 @@ ivas_error RenderConfigReader_checkValues( pRoom_acoustics = &hRenderConfig->roomAcoustics; tab_value_err_count = 0; int16_t wall_idx; +#ifndef FIX_1999_TEMPORARY_DISABLE_DIST_ATT_CHECK int16_t i; +#endif /* Verify the number of frequency bands in the config input data */ if ( ( pRoom_acoustics->nBands > N_BANDS_MAX ) || ( pRoom_acoustics->nBands < N_BANDS_MIN ) ) -- GitLab