Update reflecting review remarks (2d0927c4) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/decoder.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -2473,6 +2473,7 @@ static ivas_error decodeG192(
		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;
		}
		}
		}

apps/renderer.c

+175 −0

Original line number	Diff line number	Diff line
		@@ -150,6 +150,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];
		@@ -189,7 +200,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
		@@ -390,7 +405,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 configuration",
		#endif
		},
		};

		@@ -784,6 +803,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;
		bool splitBinNeedsNewFrame = true;

		@@ -1160,7 +1182,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 )
		{
		@@ -1170,7 +1197,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", args.acousticEnvironmentId );
		#endif
		exit( -1 );
		}
		renderConfig.roomAcoustics.override = 1;
		@@ -1601,6 +1632,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
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		numSamplesRead = 0;
		if ( ( hSplitRendFileReadWrite != NULL ) && is_split_post_rend_mode( &args ) && splitBinNeedsNewFrame )
		@@ -2192,6 +2257,13 @@ cleanup:
		{
		free( bitsBufferData );
		}
		#endif
		#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 )
		{
		@@ -2673,6 +2745,94 @@ 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 )
		{
		@@ -2789,7 +2949,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;
		}
		@@ -2961,12 +3129,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_dec/ivas_binRenderer_internal.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -1263,7 +1263,6 @@ ivas_error ivas_binRenderer_open(
		{
		return error;
		}

		#ifndef FIX_1053_REVERB_RECONFIGURATION
		/* initialize the dmx matrix */
		if ( hBinRenderer->nInChannels != HOA3_CHANNELS )

lib_dec/lib_dec.c

+32 −7

Original line number	Diff line number	Diff line
		@@ -2099,8 +2099,12 @@ ivas_error IVAS_DEC_FeedRenderConfig(
		)
		{
		RENDER_CONFIG_HANDLE hRenderConfig;
		#ifdef FIX_1053_REVERB_RECONFIGURATION
		ivas_error error;
		#else
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		ivas_error error;
		#endif
		#endif

		if ( hIvasDec == NULL \|\| hIvasDec->st_ivas == NULL \|\| hIvasDec->st_ivas->hRenderConfig == NULL )
		@@ -2147,46 +2151,67 @@ ivas_error IVAS_DEC_FeedRenderConfig(
		/* TD renderer Jot reverberator */
		if ( hIvasDec->st_ivas->hReverb != NULL )
		{
		ivas_reverb_open( &hIvasDec->st_ivas->hReverb, hIvasDec->st_ivas->hHrtfStatistics, hRenderConfig, hIvasDec->st_ivas->hDecoderConfig->output_Fs );
		if ( ( error = ivas_reverb_open( &hIvasDec->st_ivas->hReverb, hIvasDec->st_ivas->hHrtfStatistics, hRenderConfig, hIvasDec->st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )
		{
		return error;
		}
		}

		/* CREND Jot reverberator */
		if ( hIvasDec->st_ivas->hCrendWrapper != NULL && hIvasDec->st_ivas->hCrendWrapper->hCrend[0] != NULL && hIvasDec->st_ivas->hCrendWrapper->hCrend[0]->hReverb != NULL )
		{
		ivas_reverb_open( &hIvasDec->st_ivas->hCrendWrapper->hCrend[0]->hReverb, hIvasDec->st_ivas->hHrtfStatistics, hRenderConfig, hIvasDec->st_ivas->hDecoderConfig->output_Fs );
		if ( ( error = ivas_reverb_open( &hIvasDec->st_ivas->hCrendWrapper->hCrend[0]->hReverb, hIvasDec->st_ivas->hHrtfStatistics, hRenderConfig, hIvasDec->st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )
		{
		return error;
		}
		}

		/* FB reverberator */
		if ( hIvasDec->st_ivas->hDiracDecBin[0] != NULL && hIvasDec->st_ivas->hDiracDecBin[0]->hReverb != NULL )
		{
		ivas_binaural_reverb_close( &( hIvasDec->st_ivas->hDiracDecBin[0]->hReverb ) );
		ivas_binaural_reverb_init( &( hIvasDec->st_ivas->hDiracDecBin[0]->hReverb ), hIvasDec->st_ivas->hHrtfStatistics, hIvasDec->st_ivas->hSpatParamRendCom->num_freq_bands, CLDFB_NO_COL_MAX / MAX_PARAM_SPATIAL_SUBFRAMES, &( hRenderConfig->roomAcoustics ), hIvasDec->st_ivas->hDecoderConfig->output_Fs, NULL, NULL );
		if ( ( error = ivas_binaural_reverb_init( &( hIvasDec->st_ivas->hDiracDecBin[0]->hReverb ), hIvasDec->st_ivas->hHrtfStatistics, hIvasDec->st_ivas->hSpatParamRendCom->num_freq_bands, CLDFB_NO_COL_MAX / MAX_PARAM_SPATIAL_SUBFRAMES, &( hRenderConfig->roomAcoustics ), hIvasDec->st_ivas->hDecoderConfig->output_Fs, NULL, NULL ) ) != IVAS_ERR_OK )
		{
		return error;
		}
		}
		#else
		/* TD renderer Jot reverberator */
		if ( hIvasDec->st_ivas->hReverb != NULL )
		{
		ivas_reverb_open( &hIvasDec->st_ivas->hReverb, hIvasDec->st_ivas->hHrtfStatistics, hRenderConfig, hIvasDec->st_ivas->hDecoderConfig->output_Fs );
		if ( ( error = ivas_reverb_open( &hIvasDec->st_ivas->hReverb, hIvasDec->st_ivas->hHrtfStatistics, hRenderConfig, hIvasDec->st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )
		{
		return error;
		}
		}

		/* CREND Jot reverberator */
		if ( hIvasDec->st_ivas->hCrendWrapper != NULL && hIvasDec->st_ivas->hCrendWrapper->hCrend != NULL && hIvasDec->st_ivas->hCrendWrapper->hCrend->hReverb != NULL )
		{
		ivas_reverb_open( &hIvasDec->st_ivas->hCrendWrapper->hCrend->hReverb, hIvasDec->st_ivas->hHrtfStatistics, hRenderConfig, hIvasDec->st_ivas->hDecoderConfig->output_Fs );
		if ( ( error = ivas_reverb_open( &hIvasDec->st_ivas->hCrendWrapper->hCrend->hReverb, hIvasDec->st_ivas->hHrtfStatistics, hRenderConfig, hIvasDec->st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )
		{
		return error;
		}
		}

		/* DirAC CLDFB reverberator */
		if ( hIvasDec->st_ivas->hDiracDecBin != NULL && hIvasDec->st_ivas->hDiracDecBin->hReverb != NULL )
		{
		ivas_binaural_reverb_close( &( hIvasDec->st_ivas->hDiracDecBin->hReverb ) );
		ivas_binaural_reverb_init( &( hIvasDec->st_ivas->hDiracDecBin->hReverb ), hIvasDec->st_ivas->hHrtfStatistics, hIvasDec->st_ivas->hSpatParamRendCom->num_freq_bands, CLDFB_NO_COL_MAX / MAX_PARAM_SPATIAL_SUBFRAMES, &( hRenderConfig->roomAcoustics ), hIvasDec->st_ivas->hDecoderConfig->output_Fs, NULL, NULL );
		if ( ( error = ivas_binaural_reverb_init( &( hIvasDec->st_ivas->hDiracDecBin->hReverb ), hIvasDec->st_ivas->hHrtfStatistics, hIvasDec->st_ivas->hSpatParamRendCom->num_freq_bands, CLDFB_NO_COL_MAX / MAX_PARAM_SPATIAL_SUBFRAMES, &( hRenderConfig->roomAcoustics ), hIvasDec->st_ivas->hDecoderConfig->output_Fs, NULL, NULL ) ) != IVAS_ERR_OK )
		{
		return error;
		}
		}
		#endif
		/* Fastconv CLDFB reverberator */
		if ( hIvasDec->st_ivas->hBinRenderer != NULL && hIvasDec->st_ivas->hBinRenderer->hReverb != NULL )
		{
		ivas_binaural_reverb_close( &( hIvasDec->st_ivas->hBinRenderer->hReverb ) );
		ivas_binaural_reverb_init( &( hIvasDec->st_ivas->hBinRenderer->hReverb ), hIvasDec->st_ivas->hHrtfStatistics, hIvasDec->st_ivas->hBinRenderer->conv_band, hIvasDec->st_ivas->hBinRenderer->timeSlots, &( hRenderConfig->roomAcoustics ), hIvasDec->st_ivas->hDecoderConfig->output_Fs, NULL, NULL );
		if ( ( error = ivas_binaural_reverb_init( &( hIvasDec->st_ivas->hBinRenderer->hReverb ), hIvasDec->st_ivas->hHrtfStatistics, hIvasDec->st_ivas->hBinRenderer->conv_band, hIvasDec->st_ivas->hBinRenderer->timeSlots, &( hRenderConfig->roomAcoustics ), hIvasDec->st_ivas->hDecoderConfig->output_Fs, NULL, NULL ) ) != IVAS_ERR_OK )
		{
		return error;
		}
		}
		#endif

lib_rend/ivas_reverb.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1021,7 +1021,6 @@ static ivas_error setup_FDN_branches(
		return error;
		}
		#endif

		if ( ( error = set_feedback_delay( hReverb, branch_idx, pParams->pLoop_delays[branch_idx] ) ) != IVAS_ERR_OK )
		{
		return error;
		@@ -1045,6 +1044,7 @@ static ivas_error setup_FDN_branches(
		return error;
		}


		#ifdef FIX_1053_REVERB_RECONFIGURATION
		/*-------------------------------------------------------------------------
		* ivas_reverb_open()
		@@ -1205,6 +1205,7 @@ ivas_error ivas_reverb_open(
		/* set up input downmix */
		pState->dmx_gain = calc_dmx_gain();
		#endif

		/* set up predelay - must be after set_base_config() and before compute_t60_coeffs() */
		calc_predelay( &params, hRenderConfig->roomAcoustics.acousticPreDelay, output_Fs );