Merge branch '1746_ref_port_fl1489' into 'ivas-float-update' (9271d225) · Commits · SA4 / Audio / IVAS BASOP

apps/decoder.c

+194 −1

Original line number	Diff line number	Diff line
		@@ -88,6 +88,18 @@ static
		* Local structure for storing cmdln arguments
		------------------------------------------------------------------------------------------/


		#ifdef FIX_1053_REVERB_RECONFIGURATION
		typedef struct
		{
		uint16_t *pID;
		uint16_t *pValidity;
		uint16_t count;
		uint16_t selected;
		uint16_t frameCounter;
		} AcousticEnvironmentSequence;
		#endif

		typedef struct
		{
		char *inputBitstreamFilename;
		@@ -137,7 +149,11 @@ typedef struct
		uint16_t tsmScale;
		#endif
		#endif
		#ifdef FIX_1053_REVERB_RECONFIGURATION
		AcousticEnvironmentSequence aeSequence;
		#else
		uint16_t acousticEnvironmentId;
		#endif
		int16_t Opt_dpid_on;
		uint16_t directivityPatternId[IVAS_MAX_NUM_OBJECTS];

		@@ -416,9 +432,15 @@ int main(
		------------------------------------------------------------------------------------------/

		asked_frame_size = arg.renderFramesize;

		#ifdef FIX_1053_REVERB_RECONFIGURATION
		uint16_t aeID = arg.aeSequence.count > 0 ? arg.aeSequence.pID[0] : 65535;
		if ( ( error = IVAS_DEC_Configure( hIvasDec, arg.output_Fs, arg.outputConfig, arg.tsmEnabled, arg.renderFramesize, arg.customLsOutputEnabled, arg.hrtfReaderEnabled, arg.enableHeadRotation, arg.enableExternalOrientation, arg.orientation_tracking, arg.renderConfigEnabled, arg.Opt_non_diegetic_pan, arg.non_diegetic_pan_gain,
		arg.Opt_dpid_on, aeID, arg.delayCompensationEnabled ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = IVAS_DEC_Configure( hIvasDec, arg.output_Fs, arg.outputConfig, arg.tsmEnabled, arg.renderFramesize, arg.customLsOutputEnabled, arg.hrtfReaderEnabled, arg.enableHeadRotation, arg.enableExternalOrientation, arg.orientation_tracking, arg.renderConfigEnabled, arg.Opt_non_diegetic_pan, arg.non_diegetic_pan_gain,
		arg.Opt_dpid_on, arg.acousticEnvironmentId, arg.delayCompensationEnabled ) ) != IVAS_ERR_OK )

		#endif
		{
		fprintf( stderr, "\nConfigure failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		@@ -636,7 +658,11 @@ int main(

		if ( arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )
		{
		#ifdef FIX_1053_REVERB_RECONFIGURATION
		if ( ( error = RenderConfigReader_getAcousticEnvironment( renderConfigReader, aeID, &renderConfig.roomAcoustics ) ) == IVAS_ERR_OK )
		#else
		if ( ( error = RenderConfigReader_getAcousticEnvironment( renderConfigReader, arg.acousticEnvironmentId, &renderConfig.roomAcoustics ) ) == IVAS_ERR_OK )
		#endif
		{
		if ( RenderConfigReader_checkValues( &renderConfig ) != IVAS_ERR_OK )
		{
		@@ -646,7 +672,11 @@ int main(
		}
		else
		{
		#ifdef FIX_1053_REVERB_RECONFIGURATION
		fprintf( stderr, "Failed to get acoustic environment with ID: %d\n\n", aeID );
		#else
		fprintf( stderr, "Failed to get acoustic environment with ID: %d\n\n", arg.acousticEnvironmentId );
		#endif
		goto cleanup;
		}
		renderConfig.roomAcoustics.override = true;
		@@ -853,6 +883,14 @@ cleanup:

		free( pcmBuf );

		#ifdef FIX_1053_REVERB_RECONFIGURATION
		if ( arg.aeSequence.count > 0 )
		{
		free( arg.aeSequence.pID );
		free( arg.aeSequence.pValidity );
		}
		#endif

		#ifdef DEBUG_SBA_AUDIO_DUMP
		IVAS_DEC_GetSbaDebugParams( hIvasDec, &numOutChannels, &numTransportChannels, &pca_ingest_channels );

		@@ -1068,7 +1106,15 @@ static bool parseCmdlIVAS_dec(
		arg->tsmScaleFileName = NULL;
		#endif
		#endif
		#ifdef FIX_1053_REVERB_RECONFIGURATION
		arg->aeSequence.count = 0;
		arg->aeSequence.pID = NULL;
		arg->aeSequence.pValidity = NULL;
		arg->aeSequence.selected = 0;
		arg->aeSequence.frameCounter = 0;
		#else
		arg->acousticEnvironmentId = 65535;
		#endif
		for ( i = 0; i < IVAS_MAX_NUM_OBJECTS; ++i )
		{
		arg->directivityPatternId[i] = 65535;
		@@ -1450,11 +1496,91 @@ static bool parseCmdlIVAS_dec(

		if ( !is_digits_only( argv[i] ) )
		{
		#ifdef FIX_1053_REVERB_RECONFIGURATION
		uint16_t k;
		char *s = argv[i];
		char *token = argv[i];

		for ( k = 0; s[k]; )
		{
		s[k] == ',' ? k++ : *s++;
		}
		k++;

		if ( k == 0 )
		{
		fprintf( stdout, "Error: Invalid acoustic environment sequence specified: %s\n\n", argv[i] );
		usage_dec();
		return false;
		}

		if ( NULL == ( arg->aeSequence.pID = malloc( sizeof( uint16_t ) * k ) ) \|\|
		NULL == ( arg->aeSequence.pValidity = malloc( sizeof( uint16_t ) * k ) ) )
		{
		fprintf( stdout, "Error: Unable to allocate memory for acoustic environment sequence: %s\n\n", argv[i] );
		usage_dec();
		return false;
		}

		arg->aeSequence.count = k;

		k = 0;
		token = strtok( argv[i++], ":" );

		while ( token != NULL )
		{
		if ( !is_number( token ) )
		{
		fprintf( stdout, "Error: Invalid token %s found in acoustic environment sequence: %s\n\n", token, argv[i] );
		usage_dec();
		return false;
		}
		arg->aeSequence.pID[k] = (uint16_t) atoi( token );

		token = strtok( NULL, "," );
		if ( !is_number( token ) )
		{
		fprintf( stdout, "Error: Invalid token %s found in acoustic environment sequence: %s\n\n", token, argv[i] );
		usage_dec();
		return false;
		}
		arg->aeSequence.pValidity[k] = (uint16_t) atoi( token );

		token = strtok( NULL, ":" );
		k++;
		}

		if ( k != arg->aeSequence.count )
		{
		fprintf( stdout, "Error while parsing acoustic environment sequence: %s\n\n", argv[i] );
		usage_dec();
		return false;
		}
		#else
		fprintf( stdout, "Error: Invalid acoustic environment ID specified: %s\n\n", argv[i] );
		usage_dec();
		return false;
		#endif
		}

		#ifdef FIX_1053_REVERB_RECONFIGURATION
		else
		{
		/* A single acoustic environment */
		if ( NULL == ( arg->aeSequence.pID = malloc( sizeof( uint16_t ) ) ) \|\|
		NULL == ( arg->aeSequence.pValidity = malloc( sizeof( uint16_t ) ) ) )
		{
		fprintf( stdout, "Error: Unable to allocate memory for acoustic environment sequence: %s\n\n", argv[i] );
		usage_dec();
		return false;
		}
		arg->aeSequence.count = 1;
		arg->aeSequence.pID[0] = (int16_t) atoi( argv[i++] );
		arg->aeSequence.pValidity[0] = 0;
		}
		#else
		arg->acousticEnvironmentId = (int16_t) atoi( argv[i++] );
		#endif
		}
		else if ( strcmp( argv_to_upper, "-DPID" ) == 0 )
		{
		@@ -1692,7 +1818,15 @@ static void usage_dec( void )
		fprintf( stdout, " output configuration. ID1, ID2, ID3, ID4 specify the directivity pattern IDs used for\n" );
		fprintf( stdout, " ISMs 1,2,3 and 4 respectively. This options needs to be accompanied by a render_config file,\n" );
		fprintf( stdout, " otherwise a default directivity pattern is used.\n" );
		#ifdef FIX_1053_REVERB_RECONFIGURATION
		fprintf( stdout, "-aeid ID : Acoustic environment ID (number > 0) or\n" );
		fprintf( stdout, " a sequence thereof in the format [ID1:duration1,ID2:duration2...]\n" );
		fprintf( stdout, " without braces and spaces, with ':' character separating ID from duration and ',' separating\n" );
		fprintf( stdout, " ID and duration pairs, where duration is specified in frames\n" );
		fprintf( stdout, " for BINAURAL_ROOM_REVERB output configuration.\n" );
		#else
		fprintf( stdout, "-aeid ID : Acoustic environment ID (number >= 0) for BINAURAL_ROOM_REVERB output configuration\n" );
		#endif
		fprintf( stdout, "-level level : Complexity level, level = (1, 2, 3), will be defined after characterisation. \n" );
		fprintf( stdout, " Currently, all values default to level 3 (full functionality).\n" );
		fprintf( stdout, "-q : Quiet mode, no frame counter\n" );
		@@ -2064,7 +2198,31 @@ static ivas_error decodeG192(
		IVAS_VECTOR3 Pos[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES] = { { 0, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 } };
		int16_t vec_pos_update, vec_pos_len;
		SplitFileReadWrite *splitRendWriter = NULL;
		#ifdef FIX_1053_REVERB_RECONFIGURATION
		IVAS_RENDER_CONFIG_DATA renderConfig;
		RenderConfigReader *renderConfigReader = NULL;

		if ( arg.renderConfigEnabled )
		{
		if ( ( error = RenderConfigReader_open( arg.renderConfigFilename, &renderConfigReader ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError: Can't open Renderer configuration file %s \n\n", arg.renderConfigFilename );
		goto cleanup;
		}

		if ( ( error = IVAS_DEC_GetRenderConfig( hIvasDec, &renderConfig ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nIVAS_DEC_GetRenderConfig failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		}

		if ( RenderConfigReader_read( renderConfigReader, arg.renderConfigFilename, &renderConfig ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Failed to read renderer configuration from file %s\n\n", arg.renderConfigFilename );
		goto cleanup;
		}
		}
		#endif
		for ( i = 0; i < IVAS_MAX_NUM_OBJECTS; ++i )
		{
		ismWriters[i] = NULL;
		@@ -2266,6 +2424,38 @@ static ivas_error decodeG192(
		{
		if ( needNewFrame )
		{
		#ifdef FIX_1053_REVERB_RECONFIGURATION
		if ( arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB && renderConfigReader != NULL &&
		arg.aeSequence.count > 0 && arg.aeSequence.pValidity[arg.aeSequence.selected] != 0 )
		{
		if ( ++arg.aeSequence.frameCounter >= arg.aeSequence.pValidity[arg.aeSequence.selected] )
		{
		if ( ++arg.aeSequence.selected >= arg.aeSequence.count )
		{
		arg.aeSequence.selected = 0;
		}
		arg.aeSequence.frameCounter = 0;
		if ( ( error = RenderConfigReader_getAcousticEnvironment( renderConfigReader, arg.aeSequence.pID[arg.aeSequence.selected], &renderConfig.roomAcoustics ) ) == IVAS_ERR_OK )
		{
		if ( RenderConfigReader_checkValues( &renderConfig ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Invalid acoustic environment configuratoin parameters\n\n" );
		goto cleanup;
		}
		}
		else
		{
		fprintf( stderr, "Failed to get acoustic environment with ID %d\n\n", arg.aeSequence.pID[arg.aeSequence.selected] );
		goto cleanup;
		}
		if ( ( error = IVAS_DEC_FeedRenderConfig( hIvasDec, renderConfig ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nIVAS_DEC_FeedRenderConfig failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		}
		}
		}
		#endif
		#ifdef DEBUGGING
		#ifdef VARIABLE_SPEED_DECODING
		if ( arg.tsmScaleFileEnabled )
		@@ -2689,6 +2879,9 @@ static ivas_error decodeG192(

		cleanup:

		#ifdef FIX_1053_REVERB_RECONFIGURATION
		RenderConfigReader_close( &renderConfigReader );
		#endif
		split_rend_reader_writer_close( &splitRendWriter );
		AudioFileWriter_close( &afWriter );
		MasaFileWriter_close( &masaWriter );

apps/renderer.c

+174 −0

Original line number	Diff line number	Diff line
		@@ -140,6 +140,17 @@ typedef struct
		IVAS_CUSTOM_LS_DATA outSetupCustom;
		} OutputConfig;

		#ifdef FIX_1053_REVERB_RECONFIGURATION
		typedef struct
		{
		uint16_t *pID;
		uint16_t *pValidity;
		uint16_t count;
		uint16_t selected;
		uint16_t frameCounter;
		} AcousticEnvironmentSequence;
		#endif

		typedef struct
		{
		char executableName[RENDERER_MAX_CLI_ARG_LENGTH];
		@@ -175,7 +186,11 @@ typedef struct
		float syncMdDelay;
		IVAS_RENDER_FRAMESIZE render_framesize;
		uint16_t directivityPatternId[RENDERER_MAX_ISM_INPUTS];
		#ifdef FIX_1053_REVERB_RECONFIGURATION
		AcousticEnvironmentSequence aeSequence;
		#else
		uint16_t acousticEnvironmentId;
		#endif
		} CmdlnArgs;

		typedef enum
		@@ -370,7 +385,11 @@ static const CmdLnParser_Option cliOptions[] = {
		.id = CmdLnOptionId_acousticEnvironmentId,
		.match = "acoustic_environment_id",
		.matchShort = "aeid",
		#ifdef FIX_1053_REVERB_RECONFIGURATION
		.description = "Acoustic environment ID( number > 0 ) or a sequence thereof in the format [ID1:duration1,ID2:duration2...] without braces and spaces, with ':' character separating ID from duration and ',' separating ID and duration pairs, where duration is specified in frames for BINAURAL_ROOM_REVERB output configuration.",
		#else
		.description = "Acoustic environment ID (number >= 0) for BINAURAL_ROOM_REVERB output.",
		#endif
		},
		};

		@@ -690,6 +709,9 @@ int main(
		int16_t zeroPadToWrite = 0;
		int32_t delayTimeScale = 0;
		int16_t i, numChannels;
		#ifdef FIX_1053_REVERB_RECONFIGURATION
		uint16_t aeID;
		#endif
		ivas_error error = IVAS_ERR_OK;

		#ifdef WMOPS
		@@ -1062,7 +1084,12 @@ int main(

		if ( args.outConfig.audioConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )
		{
		#ifdef FIX_1053_REVERB_RECONFIGURATION
		aeID = args.aeSequence.count > 0 ? args.aeSequence.pID[0] : 65535;
		if ( ( error = RenderConfigReader_getAcousticEnvironment( renderConfigReader, aeID, &renderConfig.roomAcoustics ) ) == IVAS_ERR_OK )
		#else
		if ( ( error = RenderConfigReader_getAcousticEnvironment( renderConfigReader, args.acousticEnvironmentId, &renderConfig.roomAcoustics ) ) == IVAS_ERR_OK )
		#endif
		{
		if ( RenderConfigReader_checkValues( &renderConfig ) != IVAS_ERR_OK )
		{
		@@ -1072,7 +1099,11 @@ int main(
		}
		else
		{
		#ifdef FIX_1053_REVERB_RECONFIGURATION
		fprintf( stderr, "\nFailed to get acoustic environment with ID: %d\n\n", aeID );
		#else
		fprintf( stderr, "\nFailed to get acoustic environment with ID: %d\n\n", args.acousticEnvironmentId );
		#endif
		goto cleanup;
		}
		renderConfig.roomAcoustics.override = 1;
		@@ -1459,6 +1490,40 @@ int main(
		num_in_channels = inBuffer.config.numChannels;
		const bool isCurrentFrameMultipleOf20ms = frame % ( 4 / args.render_framesize ) == 0;

		#ifdef FIX_1053_REVERB_RECONFIGURATION
		if ( args.outConfig.audioConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB && renderConfigReader != NULL &&
		args.aeSequence.count > 0 && args.aeSequence.pValidity[args.aeSequence.selected] != 0 )
		{
		if ( ++args.aeSequence.frameCounter >= args.aeSequence.pValidity[args.aeSequence.selected] )
		{
		IVAS_RENDER_CONFIG_DATA renderConfig;

		if ( ++args.aeSequence.selected >= args.aeSequence.count )
		{
		args.aeSequence.selected = 0;
		}
		args.aeSequence.frameCounter = 0;
		if ( ( error = RenderConfigReader_getAcousticEnvironment( renderConfigReader, args.aeSequence.pID[args.aeSequence.selected], &renderConfig.roomAcoustics ) ) == IVAS_ERR_OK )
		{
		if ( RenderConfigReader_checkValues( &renderConfig ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Invalid acoustic environment configuratoin parameters\n\n" );
		goto cleanup;
		}
		}
		else
		{
		fprintf( stderr, "Failed to get acoustic environment with ID %d\n\n", args.aeSequence.pID[args.aeSequence.selected] );
		goto cleanup;
		}
		if ( ( error = IVAS_REND_FeedRenderConfig( hIvasRend, renderConfig ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nIVAS_REND_FeedRenderConfig failed: %s\n\n", ivas_error_to_string( error ) );
		goto cleanup;
		}
		}
		}
		#endif
		numSamplesRead = 0;
		/* Read the input data */
		if ( ( error = AudioFileReader_read( audioReader, inpInt16Buffer, (int16_t) inBufferSize, &numSamplesRead ) ) != IVAS_ERR_OK )
		@@ -1929,6 +1994,13 @@ cleanup:
		{
		free( bitsBufferData );
		}
		#ifdef FIX_1053_REVERB_RECONFIGURATION
		if ( args.aeSequence.count > 0 )
		{
		free( args.aeSequence.pID );
		free( args.aeSequence.pValidity );
		}
		#endif
		for ( i = 0; i < RENDERER_MAX_MASA_INPUTS; ++i )
		{
		MasaFileReader_close( &masaReaders[i] );
		@@ -2400,6 +2472,93 @@ static bool parseLfePositionConfig(
		}


		#ifdef FIX_1053_REVERB_RECONFIGURATION
		static bool parseAcousticEnvironmentIds(
		const char *value,
		AcousticEnvironmentSequence *aeSequence )
		{
		uint16_t k;
		char config_string[RENDERER_MAX_METADATA_LINE_LENGTH];
		char *s;
		char *token;

		strncpy( config_string, value, RENDERER_MAX_METADATA_LINE_LENGTH );
		s = config_string;
		token = config_string;

		if ( !is_digits_only( config_string ) )
		{

		for ( k = 0; s[k]; )
		{
		s[k] == ',' ? k++ : *s++;
		}
		k++;

		if ( k == 0 )
		{
		fprintf( stdout, "Error: Invalid acoustic environment sequence specified: %s\n\n", config_string );
		return false;
		}

		if ( NULL == ( aeSequence->pID = malloc( sizeof( uint16_t ) * k ) ) \|\|
		NULL == ( aeSequence->pValidity = malloc( sizeof( uint16_t ) * k ) ) )
		{
		fprintf( stdout, "Error: Unable to allocate memory for acoustic environment sequence: %s\n\n", config_string );
		return false;
		}

		aeSequence->count = k;

		k = 0;

		token = strtok( config_string, ":" );

		while ( token != NULL )
		{
		if ( !is_number( token ) )
		{
		fprintf( stdout, "Error: Invalid token %s found in acoustic environment sequence: %s\n\n", token, config_string );
		return false;
		}
		aeSequence->pID[k] = (uint16_t) atoi( token );

		token = strtok( NULL, "," );
		if ( !is_number( token ) )
		{
		fprintf( stdout, "Error: Invalid token %s found in acoustic environment sequence: %s\n\n", token, config_string );
		return false;
		}
		aeSequence->pValidity[k] = (uint16_t) atoi( token );

		token = strtok( NULL, ":" );
		k++;
		}

		if ( k != aeSequence->count )
		{
		fprintf( stdout, "Error while parsing acoustic environment sequence: %s\n\n", config_string );
		return false;
		}
		}
		else
		{
		/* A single acoustic environment */
		if ( NULL == ( aeSequence->pID = malloc( sizeof( uint16_t ) ) ) \|\|
		NULL == ( aeSequence->pValidity = malloc( sizeof( uint16_t ) ) ) )
		{
		fprintf( stdout, "Error: Unable to allocate memory for acoustic environment sequence: %s\n\n", config_string );
		return false;
		}
		aeSequence->count = 1;
		aeSequence->pID[0] = (int16_t) atoi( config_string );
		aeSequence->pValidity[0] = 0;
		}

		return true;
		}
		#endif

		static bool checkRequiredArgs(
		CmdlnArgs args )
		{
		@@ -2506,7 +2665,15 @@ static CmdlnArgs defaultArgs(
		args.directivityPatternId[i] = 65535;
		}

		#ifdef FIX_1053_REVERB_RECONFIGURATION
		args.aeSequence.count = 0;
		args.aeSequence.pID = NULL;
		args.aeSequence.pValidity = NULL;
		args.aeSequence.selected = 0;
		args.aeSequence.frameCounter = 0;
		#else
		args.acousticEnvironmentId = 65535;
		#endif

		return args;
		}
		@@ -2676,12 +2843,19 @@ static void parseOption(
		break;
		case CmdLnOptionId_acousticEnvironmentId:
		assert( numOptionValues == 1 );
		#ifdef FIX_1053_REVERB_RECONFIGURATION
		if ( !parseAcousticEnvironmentIds( optionValues[0], &args->aeSequence ) )
		{
		fprintf( stderr, "Invalid acoustic environment ID specified: %s\n", optionValues[0] );
		}
		#else
		if ( !is_digits_only( optionValues[0] ) )
		{
		fprintf( stderr, "Invalid acousting environment ID specified: %s\n", optionValues[0] );
		exit( -1 );
		}
		args->acousticEnvironmentId = (int16_t) strtol( optionValues[0], NULL, 10 );
		#endif
		break;
		case CmdLnOptionId_syncMdDelay:
		assert( numOptionValues == 1 );

lib_com/options.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -184,6 +184,7 @@
		#define USE_NEW_HRTF_BINARY_FILE_FORMAT /* Orange: to activate when decided to change the hrtf binary file format */
		#define FIX_WARNING_RENDER_CONFIG /* Orange: fix warning on windows build */
		#define NONBE_FIX_991_PARAMBIN_BINARY_HRTF /* Nokia: issue #991: fix using of binary file HRTF in ParamBin (to actiate when USE_NEW_HRTF_BINARY_FILE_FORMAT and FIX_777_COMBI_RENDER_CONFIG_FILE are on )*/
		#define FIX_1053_REVERB_RECONFIGURATION /* Philips: issue 1053: fix for dynamic switching of acoustic environment */
		#define NON_BE_FIX_EVS_USAN_ERR_IN_WAVEADJUST /* FhG: address issue 1037 */
		#define FIX_1038_OFFSET_TO_NULL_PTR_IN_EVS_TCX_BFI /* FhG: move setting of pointers for parameter decoding so they are skipped in lost frames when they are not needed */
		#define NONBE_FIX_1056_ISM_RATE_SWITCH /* FhG: Fix #1056: fix TC buffer udpate on a ISM rate switch */

lib_dec/ivas_binRenderer_internal.c

+33 −1

Original line number	Diff line number	Diff line
		@@ -47,6 +47,19 @@
		#endif
		#include "wmc_auto.h"

		#ifdef FIX_1053_REVERB_RECONFIGURATION

		/*-------------------------------------------------------------------------
		* Local constants
		------------------------------------------------------------------------/

		#define REVERB_INPUT_DOWNMIX_CHANNELS ( 11 )
		/* Downmix table for sparse frequency domain reverberator */
		const float dmxmtx_table[BINAURAL_CHANNELS][REVERB_INPUT_DOWNMIX_CHANNELS] = {
		{ 1.0f, 0.0f, 0.70709997f, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f },
		{ 0.0f, 1.0f, 0.70709997f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f },
		};
		#endif

		/*-------------------------------------------------------------------------
		* ivas_binRenderer_filterModule()
		@@ -824,8 +837,11 @@ static void ivas_binaural_obtain_DMX(

		for ( chIdx = 0; chIdx < hBinRenderer->nInChannels; chIdx++ )
		{
		#ifdef FIX_1053_REVERB_RECONFIGURATION
		float dmxConst = dmxmtx_table[chOutIdx][chIdx];
		#else
		float dmxConst = hBinRenderer->hReverb->dmxmtx[chOutIdx][chIdx];

		#endif
		for ( bandIdx = 0; bandIdx < hBinRenderer->conv_band; bandIdx++ )
		{
		for ( k = 0; k < numTimeSlots; k++ )
		@@ -1031,7 +1047,11 @@ ivas_error ivas_binRenderer_open(
		)
		{
		BINAURAL_RENDERER_HANDLE hBinRenderer;
		#ifdef FIX_1053_REVERB_RECONFIGURATION
		int16_t convBand, k;
		#else
		int16_t convBand, chIdx, k;
		#endif
		ivas_error error;

		error = IVAS_ERR_OK;
		@@ -1177,7 +1197,18 @@ ivas_error ivas_binRenderer_open(
		return error;
		}

		#ifndef FIX_1053_REVERB_RECONFIGURATION
		/* initialize the dmx matrix */
		if ( hBinRenderer->nInChannels != HOA3_CHANNELS )
		{
		for ( chIdx = 0; chIdx < BINAURAL_CHANNELS; chIdx++ )
		{
		for ( k = 0; k < hBinRenderer->nInChannels; k++ )
		{
		hBinRenderer->hReverb->dmxmtx[chIdx][k] = dmxmtx_table[chIdx][k];
		}
		}
		}
		#ifdef NONBE_FIX_1058_DECODER_ERROR_WITH_REVERB_ROOM
		if ( hBinRenderer->nInChannels != HOA3_CHANNELS )
		#endif
		@@ -1190,6 +1221,7 @@ ivas_error ivas_binRenderer_open(
		}
		}
		}
		#endif
		}
		else
		{

lib_dec/ivas_rom_dec.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -390,6 +390,7 @@ const float dirac_dithering_ele_scale[DIRAC_DIFFUSE_LEVELS] =
		6.716062e-01f, 1.011804e+00f, 1.796875e+00f, 2.804382e+00f, 4.623130e+00f, 7.802667e+00f, 1.045446e+01f, 1.379538e+01f
		};

		#ifndef FIX_1053_REVERB_RECONFIGURATION
		/----------------------------------------------------------------------------------
		* FASTCONV and PARAMETRIC binaural renderer ROM tables
		----------------------------------------------------------------------------------/
		@@ -399,7 +400,7 @@ const float dmxmtx_table[BINAURAL_CHANNELS][11] =
		{ 1.0f, 0.0f, 0.70709997f, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f },
		{ 0.0f, 1.0f, 0.70709997f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f },
		};

		#endif

		/----------------------------------------------------------------------
		* MC ParamUpmix ROM tables