Commit b10f72e7 authored Jul 19, 2023 by Marek Szczerba

Merge branch 'philips/contribution-38-control-metadata-reverb' into...

Merge branch 'philips/contribution-38-control-metadata-reverb' into 'philips/contribution-38-control-metadata-reverb-draft'

parents 970d9969 59b62674

apps/decoder.c

+0 −7

Original line number	Diff line number	Diff line
		@@ -638,13 +638,6 @@ int main(
		}
		renderConfig.room_acoustics.override = true;
		}
		#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
		if ( ( error = IVAS_DEC_FeedRenderConfig( hIvasDec, renderConfig ) ) != IVAS_ERR_OK )
		{

lib_util/render_config_reader.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -2745,6 +2745,8 @@ ivas_error RenderConfigReader_getAcousticEnvironment(
		return IVAS_ERR_ACOUSTIC_ENVIRONMENT_MISSING;
		}

		#endif

		#ifdef CONTROL_METADATA_DIRECTIVITY
		/------------------------------------------------------------------------------------------
		* RenderConfigReader_getDirectivity()
		@@ -2767,8 +2769,6 @@ ivas_error RenderConfigReader_getDirectivity(
		}
		#endif

		#endif

		/------------------------------------------------------------------------------------------
		* RenderConfigReader_close()
		*

lib_util/render_config_reader.h

+0 −6

Original line number	Diff line number	Diff line
		@@ -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 */