Correctly exit and deallocate memory in case of errors in decoder, renderer... (68a2597e) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/decoder.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -665,7 +665,8 @@ int main(

		if ( ( error = IVAS_DEC_SetRenderFramesize( hIvasDec, arg.renderFramesize ) ) != IVAS_ERR_OK )
		{
		return error;
		fprintf( stderr, "\nIVAS_DEC_PrintConfig failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		}

		if ( arg.renderFramesize != asked_frame_size )

apps/isar_post_rend.c

+59 −57

Original line number	Diff line number	Diff line
		@@ -690,10 +690,10 @@ int main(
		int32_t inBufferSize;
		int32_t outBufferSize;
		int32_t bitsBufferSize;
		int16_t *inpInt16Buffer;
		float *inFloatBuffer;
		int16_t *outInt16Buffer;
		float *outFloatBuffer;
		int16_t *inpInt16Buffer = NULL;
		float *inFloatBuffer = NULL;
		int16_t *outInt16Buffer = NULL;
		float *outFloatBuffer = NULL;
		uint8_t *bitsBufferData = NULL;
		IVAS_REND_AudioBuffer inBuffer;
		IVAS_REND_AudioBuffer outBuffer;
		@@ -744,8 +744,8 @@ int main(
		{
		if ( RotationFileReader_open( args.headRotationFilePath, &headRotReader ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Error opening file: %s\n", args.headRotationFilePath );
		exit( -1 );
		fprintf( stderr, "\nError opening file: %s\n", args.headRotationFilePath );
		goto cleanup;
		}
		}

		@@ -778,14 +778,14 @@ int main(
		&bitsBuffer.config.lc3plusHighRes );
		if ( error != IVAS_ERR_OK )
		{
		fprintf( stderr, "Could not open split rend metadata file %s\n", args.inMetadataFilePaths[0] );
		exit( -1 );
		fprintf( stderr, "\nCould not open split rend metadata file %s\n", args.inMetadataFilePaths[0] );
		goto cleanup;
		}

		if ( AudioFileReader_open( &audioReader, audioFilePath ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Error opening file: %s\n", audioFilePath );
		exit( -1 );
		fprintf( stderr, "\nError opening file: %s\n", audioFilePath );
		goto cleanup;
		}
		}

		@@ -802,8 +802,8 @@ int main(
		&bitsBuffer.config.lc3plusHighRes );
		if ( error != IVAS_ERR_OK )
		{
		fprintf( stderr, "Could not open split rend metadata file %s\n", args.inputFilePath );
		exit( -1 );
		fprintf( stderr, "\nCould not open split rend metadata file %s\n", args.inputFilePath );
		goto cleanup;
		}
		audioReader = NULL;
		}
		@@ -828,20 +828,20 @@ int main(
		/* else if sampling rate given on command line, compare with wav file */
		else if ( inFileSampleRate != args.sampleRate )
		{
		fprintf( stderr, "Sampling rate mismatch: %d Hz requested, but %d Hz found in file %s\n", args.sampleRate, inFileSampleRate, args.inputFilePath );
		exit( -1 );
		fprintf( stderr, "\nSampling rate mismatch: %d Hz requested, but %d Hz found in file %s\n", args.sampleRate, inFileSampleRate, args.inputFilePath );
		goto cleanup;
		}
		break;
		case IVAS_ERR_SAMPLING_RATE_UNKNOWN: /* Returned when input is raw PCM */
		if ( args.sampleRate == 0 )
		{
		fprintf( stderr, "Sampling rate must be specified on command line when using raw PCM input\n" );
		exit( -1 );
		fprintf( stderr, "\nSampling rate must be specified on command line when using raw PCM input\n" );
		goto cleanup;
		}
		break;
		default:
		fprintf( stderr, "Error: %s\n", ivas_error_to_string( error ) );
		exit( -1 );
		fprintf( stderr, "\nError: %s\n", ivas_error_to_string( error ) );
		goto cleanup;
		}

		int16_t inFileNumChannels = 0;
		@@ -850,8 +850,8 @@ int main(
		error = AudioFileReader_getNumChannels( audioReader, &inFileNumChannels );
		if ( error != IVAS_ERR_OK && error != IVAS_ERR_NUM_CHANNELS_UNKNOWN )
		{
		fprintf( stderr, "Error: %s\n", ivas_error_to_string( error ) );
		exit( -1 );
		fprintf( stderr, "\nAudioFileReader_getNumChannels failed: %s\n", ivas_error_to_string( error ) );
		goto cleanup;
		}
		}

		@@ -863,8 +863,8 @@ int main(
		args.outConfig.audioConfig = IVAS_AUDIO_CONFIG_BINAURAL;
		if ( ( error = ISAR_POST_REND_open( &hIsarPostRend, args.sampleRate, args.outConfig.audioConfig, true, 0, 0.0, (int16_t) args.render_framesize ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Error opening renderer handle: %s\n", ivas_error_to_string( error ) );
		exit( -1 );
		fprintf( stderr, "\nError opening renderer handle: %s\n", ivas_error_to_string( error ) );
		goto cleanup;
		}

		/------------------------------------------------------------------------------------------
		@@ -873,8 +873,8 @@ int main(

		if ( ( error = ISAR_POST_REND_InitConfig( hIsarPostRend, args.outConfig.audioConfig ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Error in Renderer Config Init: %s\n", ivas_error_to_string( error ) );
		exit( -1 );
		fprintf( stderr, "\nError in Renderer Config Init: %s\n", ivas_error_to_string( error ) );
		goto cleanup;
		}

		if ( args.inConfig.numBinBuses > 0 )
		@@ -886,8 +886,8 @@ int main(
		bitsBuffer.config.isar_frame_size_ms,
		bitsBuffer.config.lc3plusHighRes ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Error in getting split renderer bitstream header: %s\n", ivas_error_to_string( error ) );
		exit( -1 );
		fprintf( stderr, "\nError in getting split renderer bitstream header: %s\n", ivas_error_to_string( error ) );
		goto cleanup;
		}
		}

		@@ -901,23 +901,23 @@ int main(
		{
		if ( ( error = ISAR_POST_REND_AddInput( hIsarPostRend, args.inConfig.binBuses[i].audioConfig, &splitBinIds[i] ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Error: %s\n", ivas_error_to_string( error ) );
		exit( -1 );
		fprintf( stderr, "\nError: %s\n", ivas_error_to_string( error ) );
		goto cleanup;
		}
		}

		const int16_t totalNumInChannels = getTotalNumInChannels( hIsarPostRend, splitBinIds );
		if ( inFileNumChannels != 0 /* inFileNumChannels is 0 with raw PCM input */ && totalNumInChannels != inFileNumChannels )
		{
		fprintf( stderr, "Number of channels in input file does not match selected configuration\n" );
		exit( -1 );
		fprintf( stderr, "\nNumber of channels in input file does not match selected configuration\n" );
		goto cleanup;
		}

		int16_t numOutChannels = 2;
		if ( AudioFileWriter_open( &audioWriter, args.outputFilePath, args.sampleRate, numOutChannels ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Failed to open file: %s\n", args.outputFilePath );
		exit( -1 );
		fprintf( stderr, "\nFailed to open file: %s\n", args.outputFilePath );
		goto cleanup;
		}

		/------------------------------------------------------------------------------------------
		@@ -1003,7 +1003,7 @@ int main(
		else
		{
		fprintf( stderr, "\nUnable to read from bitstream file!\n" );
		exit( -1 );
		goto cleanup;
		}
		}
		}
		@@ -1014,7 +1014,7 @@ int main(
		if ( ( error = AudioFileReader_read( audioReader, inpInt16Buffer, (int16_t) inBufferSize, &numSamplesRead ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError reading from file %s\n", audioFilePath );
		exit( -1 );
		goto cleanup;
		}
		}

		@@ -1040,21 +1040,21 @@ int main(

		if ( ( error = HeadRotationFileReading( headRotReader, &headRot, &Pos ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Error in Head Rotation File Reading: %s\n", ivas_error_to_string( error ) );
		exit( -1 );
		fprintf( stderr, "\nError in Head Rotation File Reading: %s\n", ivas_error_to_string( error ) );
		goto cleanup;
		}

		if ( ( error = ISAR_POST_REND_SetHeadRotation( hIsarPostRend, headRot, Pos, DEFAULT_AXIS, sf_idx ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Error setting Head Rotation: %s\n", ivas_error_to_string( error ) );
		exit( -1 );
		fprintf( stderr, "\nError setting Head Rotation: %s\n", ivas_error_to_string( error ) );
		goto cleanup;
		}
		}
		}
		else
		{
		fprintf( stderr, "Head Rotation should be enabled in post renderer\n" );
		exit( -1 );
		fprintf( stderr, "\nHead Rotation should be enabled in post renderer\n" );
		goto cleanup;
		}

		/* Read from split renderer bfi file if specified */
		@@ -1063,14 +1063,14 @@ int main(
		int16_t bfi;
		if ( ( error = SplitRendBFIFileReading( splitRendBFIReader, &bfi ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Error in SplitRendBFIFileReading(): %s\n", ivas_error_to_string( error ) );
		exit( -1 );
		fprintf( stderr, "\nError in SplitRendBFIFileReading(): %s\n", ivas_error_to_string( error ) );
		goto cleanup;
		}

		if ( ( error = ISAR_POST_REND_SetSplitRendBFI( hIsarPostRend, bfi ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Error in ISAR_POST_REND_SetSplitRendBFI(): %s\n", ivas_error_to_string( error ) );
		exit( -1 );
		fprintf( stderr, "\nError in ISAR_POST_REND_SetSplitRendBFI(): %s\n", ivas_error_to_string( error ) );
		goto cleanup;
		}
		}

		@@ -1080,31 +1080,31 @@ int main(
		{
		if ( ( error = ISAR_POST_REND_GetInputNumChannels( hIsarPostRend, splitBinIds[i], &numChannels ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Error: %s\n", ivas_error_to_string( error ) );
		exit( -1 );
		fprintf( stderr, "\nISAR_POST_REND_GetInputNumChannels failed: %s\n", ivas_error_to_string( error ) );
		goto cleanup;
		}
		ISAR_POST_REND_ReadOnlyAudioBuffer tmpBuffer = getReadOnlySubBuffer( inBuffer, (int16_t) args.inConfig.binBuses[i].inputChannelIndex, numChannels );

		if ( ( error = ISAR_POST_REND_FeedInputAudio( hIsarPostRend, splitBinIds[i], tmpBuffer ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Error: %s\n", ivas_error_to_string( error ) );
		exit( -1 );
		fprintf( stderr, "\nISAR_POST_REND_FeedInputAudio failed: %s\n", ivas_error_to_string( error ) );
		goto cleanup;
		}
		}
		if ( splitBinNeedsNewFrame )
		{
		if ( ( error = ISAR_POST_REND_FeedSplitBinauralBitstream( hIsarPostRend, splitBinIds[i], &bitsBuffer ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Error: %s\n", ivas_error_to_string( error ) );
		exit( -1 );
		fprintf( stderr, "\nISAR_POST_REND_FeedSplitBinauralBitstream failed: %s\n", ivas_error_to_string( error ) );
		goto cleanup;
		}
		}
		}

		if ( ( error = ISAR_POST_REND_GetSplitBinauralSamples( hIsarPostRend, outBuffer, &splitBinNeedsNewFrame ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Error: %s\n", ivas_error_to_string( error ) );
		exit( -1 );
		fprintf( stderr, "\nISAR_POST_REND_GetSplitBinauralSamples failed: %s\n", ivas_error_to_string( error ) );
		goto cleanup;
		}

		int16_t num_out_channels;
		@@ -1121,7 +1121,7 @@ int main(
		if ( ISAR_POST_REND_GetDelay( hIsarPostRend, &delayNumSamples, &delayTimeScale ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nUnable to get delay of renderer!\n" );
		exit( -1 );
		goto cleanup;
		}

		if ( hSplitRendFileReadWrite != NULL )
		@@ -1146,8 +1146,8 @@ int main(
		{
		if ( AudioFileWriter_write( audioWriter, &outInt16Buffer[delayNumSamples * num_out_channels], outBufferSize - ( delayNumSamples * num_out_channels ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Error writing audio file %s\n", args.outputFilePath );
		exit( -1 );
		fprintf( stderr, "\nError writing audio file %s\n", args.outputFilePath );
		goto cleanup;
		}
		delayNumSamples = 0;
		}
		@@ -1181,7 +1181,7 @@ int main(
		if ( ( error = AudioFileWriter_write( audioWriter, outInt16Buffer, outBufferSize ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nOutput audio file writer error\n" );
		exit( -1 );
		goto cleanup;
		}
		}

		@@ -1189,7 +1189,7 @@ int main(
		if ( ( error = AudioFileWriter_write( audioWriter, outInt16Buffer, zeroPadToWrite * outBuffer.config.numChannels ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nOutput audio file writer error\n" );
		exit( -1 );
		goto cleanup;
		}
		zeroPadToWrite = 0;
		}
		@@ -1217,6 +1217,8 @@ int main(
		* Close files and deallocate resources
		------------------------------------------------------------------------------------------/

		cleanup:

		free( inpInt16Buffer );
		free( inFloatBuffer );
		free( outInt16Buffer );

apps/renderer.c

+171 −168

File changed.

Preview size limit exceeded, changes collapsed.