From 73cb6c3524b5962212fadd03cece92ab966546db Mon Sep 17 00:00:00 2001 From: Charles Kinuthia Date: Wed, 19 Jul 2023 15:18:45 +0200 Subject: [PATCH 1/2] [fix] remove overwriting of directivity - seems like bug first appeared as part of commit 29e345c2 --- lib_util/render_config_reader.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib_util/render_config_reader.c b/lib_util/render_config_reader.c index 38345015b4..0b437f5b44 100644 --- a/lib_util/render_config_reader.c +++ b/lib_util/render_config_reader.c @@ -2038,8 +2038,6 @@ ivas_error RenderConfigReader_getDirectivity( { return IVAS_ERR_UNEXPECTED_NULL_POINTER; } - - mvr2r( pRenderConfigReader->directivity, directivity, 3 ); return IVAS_ERR_OK; } #endif -- GitLab From 4ff80bf33adb90853d93e6dee56ecd073d82d01c Mon Sep 17 00:00:00 2001 From: Charles Kinuthia Date: Wed, 19 Jul 2023 19:15:35 +0200 Subject: [PATCH 2/2] fix compiler warning --- apps/decoder.c | 7 ------- lib_util/render_config_reader.c | 20 -------------------- lib_util/render_config_reader.h | 6 ------ 3 files changed, 33 deletions(-) diff --git a/apps/decoder.c b/apps/decoder.c index 9bf644b0de..307b0ca520 100644 --- a/apps/decoder.c +++ b/apps/decoder.c @@ -630,13 +630,6 @@ int main( fprintf( stderr, "Failed to get acoustic environment with ID: %d\n\n", ACOUSTIC_ENVIRONMENT_ID ); goto cleanup; } -#ifdef CONTROL_METADATA_DIRECTIVITY - if ( ( error = RenderConfigReader_getDirectivity( renderConfigReader, renderConfig.directivity ) ) != IVAS_ERR_OK ) - { - fprintf( stderr, "Invalid directivity configuration parameters\n\n" ); - goto cleanup; - } -#endif #endif renderConfig.room_acoustics.override = true; diff --git a/lib_util/render_config_reader.c b/lib_util/render_config_reader.c index d4e382e9b3..4851137311 100644 --- a/lib_util/render_config_reader.c +++ b/lib_util/render_config_reader.c @@ -2128,26 +2128,6 @@ ivas_error RenderConfigReader_getAcousticEnvironment( return IVAS_ERR_ACOUSTIC_ENVIRONMENT_MISSING; } -#ifdef CONTROL_METADATA_DIRECTIVITY -/*------------------------------------------------------------------------------------------* - * RenderConfigReader_getDirectivity() - * - * Gets Acoustic environment with a given ID - *------------------------------------------------------------------------------------------*/ - -ivas_error RenderConfigReader_getDirectivity( - RenderConfigReader *pRenderConfigReader, /* i : RenderConfigReader handle */ - float *directivity /* o : directivity */ -) -{ - if ( pRenderConfigReader == NULL ) - { - return IVAS_ERR_UNEXPECTED_NULL_POINTER; - } - return IVAS_ERR_OK; -} -#endif - #endif diff --git a/lib_util/render_config_reader.h b/lib_util/render_config_reader.h index 2f3fdf3265..4facb5b9cd 100644 --- a/lib_util/render_config_reader.h +++ b/lib_util/render_config_reader.h @@ -62,12 +62,6 @@ ivas_error RenderConfigReader_getAcousticEnvironment( ivas_error RenderConfigReader_checkValues( IVAS_RENDER_CONFIG_HANDLE hRenderConfig /* o : Renderer configuration handle */ ); -#ifdef CONTROL_METADATA_DIRECTIVITY -ivas_error RenderConfigReader_getDirectivity( - RenderConfigReader *pRenderConfigReader, /* i : RenderConfigReader handle */ - float *directivity /* o : directivity */ -); -#endif #endif /* Reads a configuration */ -- GitLab