rename CONTROL_METADATA_EARLY_REFLECTIONS to EARLY_REFLECTIONS (3959f06d) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/options.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -151,7 +151,7 @@
		/#define FIX_I4_OL_PITCH/ /* fix open-loop pitch used for EVS core switching */
		#define CONTROL_METADATA_REVERB /* Philips: reverb configuration change to binary format */
		#ifdef CONTROL_METADATA_REVERB
		#define CONTROL_METADATA_EARLY_REFLECTIONS /* Philips/Qualcomm: early reflections extension to reverb configuration */
		#define EARLY_REFLECTIONS /* Philips/Qualcomm: early reflections extension to reverb configuration */
		#define CONTROL_METADATA_DIRECTIVITY /* Ericsson: Directivity renderer configuration */
		#endif
		#define VLBR_20MS_MD /* Dlb: SBA VLBR 20ms Optimization*/

lib_util/render_config_reader.c

+14 −14

Original line number	Diff line number	Diff line
		@@ -93,7 +93,7 @@ typedef enum _FREQ_GRID_MODE
		} FREQ_GRID_MODE;
		#endif

		#ifdef CONTROL_METADATA_EARLY_REFLECTIONS
		#ifdef EARLY_REFLECTIONS
		typedef struct
		{
		IVAS_VECTOR3 dimensions; /* Room dimensions [m] */
		@@ -110,7 +110,7 @@ typedef struct
		float pRT60; / RT60 table */
		float pDSR; / DSR table */
		float preDelay; /* Pre-delay */
		#ifdef CONTROL_METADATA_EARLY_REFLECTIONS
		#ifdef EARLY_REFLECTIONS
		EarlyReflectionsConfig pEarlyReflections; / Early reflections configuration */
		#endif
		} AcousticEnv;
		@@ -1389,7 +1389,7 @@ static ivas_error RenderConfigReader_readBinary(
		{
		uint32_t file_size;
		uint32_t value;
		#ifdef CONTROL_METADATA_EARLY_REFLECTIONS
		#ifdef EARLY_REFLECTIONS
		uint32_t signx, signy, k;
		#endif
		uint32_t i, m, n;
		@@ -1651,7 +1651,7 @@ static ivas_error RenderConfigReader_readBinary(
		{
		free( pRenderConfigReader->pAE[n].pRT60 );
		free( pRenderConfigReader->pAE[n].pDSR );
		#ifdef CONTROL_METADATA_EARLY_REFLECTIONS
		#ifdef EARLY_REFLECTIONS
		if ( pRenderConfigReader->pAE[n].pEarlyReflections != NULL )
		{
		free( pRenderConfigReader->pAE[n].pEarlyReflections->pListenerOrigin );
		@@ -1672,7 +1672,7 @@ static ivas_error RenderConfigReader_readBinary(
		{
		pRenderConfigReader->pAE[n].pRT60 = NULL;
		pRenderConfigReader->pAE[n].pDSR = NULL;
		#ifdef CONTROL_METADATA_EARLY_REFLECTIONS
		#ifdef EARLY_REFLECTIONS
		pRenderConfigReader->pAE[n].pEarlyReflections = NULL;
		#endif
		}
		@@ -1733,7 +1733,7 @@ static ivas_error RenderConfigReader_readBinary(
		}
		}

		#ifdef CONTROL_METADATA_EARLY_REFLECTIONS
		#ifdef EARLY_REFLECTIONS
		/* Has early reflections */
		if ( ( error = read_bin_bool( pRenderConfigReader, &value ) ) != IVAS_ERR_OK )
		{
		@@ -1937,7 +1937,7 @@ ivas_error RenderConfigReader_read(
		uint32_t roomAcHasFgCount, roomAcHasAcEnvCount;
		uint32_t fgHasMethod, fgHasNBands, fgHasFreqs, fgHasDefaultGrid, fgHasStartFreq, fgHasFreqHop;
		uint32_t aeHasFgIdx, aeHasPredelay, aeHasRt60, aeHasDsr;
		#ifdef CONTROL_METADATA_EARLY_REFLECTIONS
		#ifdef EARLY_REFLECTIONS
		uint32_t aeHasERsize, aeHasERabs;
		#endif
		#else
		@@ -2064,7 +2064,7 @@ ivas_error RenderConfigReader_read(
		{
		free( pRenderConfigReader->pAE[idx].pRT60 );
		free( pRenderConfigReader->pAE[idx].pDSR );
		#ifdef CONTROL_METADATA_EARLY_REFLECTIONS
		#ifdef EARLY_REFLECTIONS
		if ( pRenderConfigReader->pAE[idx].pEarlyReflections != NULL )
		{
		free( pRenderConfigReader->pAE[idx].pEarlyReflections->pListenerOrigin );
		@@ -2086,7 +2086,7 @@ ivas_error RenderConfigReader_read(
		{
		pRenderConfigReader->pAE[acIdx].pRT60 = NULL;
		pRenderConfigReader->pAE[acIdx].pDSR = NULL;
		#ifdef CONTROL_METADATA_EARLY_REFLECTIONS
		#ifdef EARLY_REFLECTIONS
		pRenderConfigReader->pAE[acIdx].pEarlyReflections = NULL;
		#endif
		}
		@@ -2358,7 +2358,7 @@ ivas_error RenderConfigReader_read(
		pRenderConfigReader->pAE->id = idx;

		aeHasFgIdx = aeHasPredelay = aeHasRt60 = aeHasDsr = FALSE;
		#ifdef CONTROL_METADATA_EARLY_REFLECTIONS
		#ifdef EARLY_REFLECTIONS
		aeHasERsize = aeHasERabs = FALSE;
		#endif
		params_idx = 0;
		@@ -2434,7 +2434,7 @@ ivas_error RenderConfigReader_read(
		}
		aeHasDsr = TRUE;
		}
		#ifdef CONTROL_METADATA_EARLY_REFLECTIONS
		#ifdef EARLY_REFLECTIONS
		else if ( strcmp( item, "EARLYREFLECTIONSSIZE" ) == 0 )
		{
		if ( pRenderConfigReader->pAE[acIdx].pEarlyReflections == NULL )
		@@ -2541,7 +2541,7 @@ ivas_error RenderConfigReader_read(
		{
		fprintf( stderr, "Renderer configuration: DSR missing from 'acousticEnvironment' %d.\n\n", acIdx );
		}
		#ifdef CONTROL_METADATA_EARLY_REFLECTIONS
		#ifdef EARLY_REFLECTIONS
		if ( aeHasERsize == TRUE && aeHasERabs == FALSE )
		{
		fprintf( stderr, "Renderer configuration: early reflections absorption coefficients missing from 'acousticEnvironment' %d.\n\n", acIdx );
		@@ -2552,7 +2552,7 @@ ivas_error RenderConfigReader_read(
		{
		return IVAS_ERR_INVALID_RENDER_CONFIG;
		}
		#ifdef CONTROL_METADATA_EARLY_REFLECTIONS
		#ifdef EARLY_REFLECTIONS
		if ( aeHasERsize == TRUE && aeHasERabs == FALSE )
		{
		return IVAS_ERR_INVALID_RENDER_CONFIG;
		@@ -3056,7 +3056,7 @@ void RenderConfigReader_close(
		/* Free the acoustic environments */
		for ( n = 0; n < ( *ppRenderConfigReader )->nAE; n++ )
		{
		#ifdef CONTROL_METADATA_EARLY_REFLECTIONS
		#ifdef EARLY_REFLECTIONS
		if ( ( *ppRenderConfigReader )->pAE[n].pEarlyReflections != NULL )
		{
		free( ( *ppRenderConfigReader )->pAE[n].pEarlyReflections->pListenerOrigin );