Fix Visual Studio warnings (8734f88f) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/renderer.c

+13 −30

Original line number	Diff line number	Diff line
		@@ -192,9 +192,6 @@ typedef struct CmdlnArgs
		static IVAS_REND_AudioConfig ambisonicsOrderToEnum(
		int32_t order );

		static IVAS_REND_AudioConfig speakerLayoutCicpToEnum(
		int32_t cicpIndex );

		static bool parseInConfig( char **optionValues,
		CmdlnArgs *args );

		@@ -322,7 +319,7 @@ static IVAS_REND_ReadOnlyAudioBuffer getReadOnlySubBuffer( IVAS_REND_AudioBuffer
		IVAS_REND_ReadOnlyAudioBuffer subBuffer;

		subBuffer.config = buffer.config;
		subBuffer.config.numChannels = numChannels;
		subBuffer.config.numChannels = (int16_t) numChannels;
		subBuffer.data = buffer.data + subBuffer.config.numSamplesPerChannel * chBeginIdx;

		return subBuffer;
		@@ -409,7 +406,7 @@ int32_t main( int32_t argc, char **argv )
		char masaMetadataFilePath[FILENAME_MAX];
		AudioFileReader *audioReader = NULL;
		AudioFileWriter *audioWriter;
		int16_t inBufferSize;
		int32_t inBufferSize;
		int32_t outBufferSize;
		int16_t *inpInt16Buffer;
		float *inFloatBuffer;
		@@ -422,7 +419,6 @@ int32_t main( int32_t argc, char **argv )
		int16_t delayNumSamples_orig = 0;
		int16_t zeroPad = 0;
		int32_t delayTimeScale = 0;
		int32_t i;
		ivas_error error = IVAS_ERR_OK;
		#ifdef WMOPS
		size_t SRAM_size;
		@@ -438,7 +434,7 @@ int32_t main( int32_t argc, char **argv )
		#endif

		CmdlnArgs args = parseCmdlnArgs( argc, argv );
		const int16_t frameSize_smpls = (int16_t) ( 20 * args.sampleRate / 1000 );
		const int32_t frameSize_smpls = 20 * args.sampleRate / 1000;

		positionProvider = IsmPositionProvider_open();

		@@ -475,7 +471,7 @@ int32_t main( int32_t argc, char **argv )

		/* Set up reading metadata files */
		positionProvider->numObjects = args.inConfig.numAudioObjects;
		for ( i = 0; i < positionProvider->numObjects; ++i )
		for ( int32_t i = 0; i < positionProvider->numObjects; ++i )
		{
		positionProvider->ismReaders[i] = IsmFileReader_open( args.metaDataFiles[i] );
		}
		@@ -604,12 +600,12 @@ int32_t main( int32_t argc, char **argv )
		outInt16Buffer = count_malloc( outBufferSize * sizeof( int16_t ) );
		outFloatBuffer = count_malloc( outBufferSize * sizeof( float ) );

		inBuffer.config.numSamplesPerChannel = frameSize_smpls;
		inBuffer.config.numChannels = totalNumInChannels;
		inBuffer.config.numSamplesPerChannel = (int16_t) frameSize_smpls;
		inBuffer.config.numChannels = (int16_t) totalNumInChannels;
		inBuffer.data = inFloatBuffer;

		outBuffer.config.numSamplesPerChannel = frameSize_smpls;
		outBuffer.config.numChannels = numOutChannels;
		outBuffer.config.numSamplesPerChannel = (int16_t) frameSize_smpls;
		outBuffer.config.numChannels = (int16_t) numOutChannels;
		outBuffer.data = outFloatBuffer;

		#ifdef WMOPS
		@@ -632,7 +628,7 @@ int32_t main( int32_t argc, char **argv )
		num_in_channels = inBuffer.config.numChannels;

		/* Read the input data */
		if ( ( error = AudioFileReader_read( audioReader, inpInt16Buffer, inBufferSize, &numSamplesRead ) ) != IVAS_ERR_OK )
		if ( ( error = AudioFileReader_read( audioReader, inpInt16Buffer, (int16_t) inBufferSize, &numSamplesRead ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError reading from file %s\n", audioFilePath );
		exit( -1 );
		@@ -759,7 +755,7 @@ int32_t main( int32_t argc, char **argv )
		}
		else
		{
		delayNumSamples -= outBufferSize;
		delayNumSamples -= (int16_t) outBufferSize;
		}

		frame++;
		@@ -900,7 +896,7 @@ static bool parseInConfig( char *optionValues, CmdlnArgs args )
		/* If input format is objects, parse the characters after "ISM" to get number of objects */
		{
		char *ptr = NULL;
		inConfig.numAudioObjects = strtol( optionValues[0] + 3, &ptr, 10 );
		inConfig.numAudioObjects = (uint16_t) strtol( optionValues[0] + 3, &ptr, 10 );
		if ( ptr == NULL \|\| *ptr != '\0' )
		{
		/* Failed to parse string as a number */
		@@ -1272,7 +1268,7 @@ static void parseOption( int32_t optionId, char **optionValues, int16_t numOptio
		break;
		case CmdLnOptionId_inputGain:
		assert( numOptionValues == 1 );
		args->inputGainGlobal = atof( optionValues[0] ); /* TODO(sgi): atof doesn't detect if string doesn't represent a number, just returns zero */
		args->inputGainGlobal = (float) atof( optionValues[0] ); /* TODO(sgi): atof doesn't detect if string doesn't represent a number, just returns zero */
		break;
		default:
		assert( 0 && "This should be unreachable - all command line options should be explicitly handled." );
		@@ -1629,19 +1625,6 @@ static void parseUint8( const char line, uint8_t ret )
		}
		}

		static void parseUint16( const char line, uint16_t ret )
		{
		char *ptr;
		ptr = NULL;

		*ret = (uint16_t) strtol( line, &ptr, 10 );
		if ( ptr == NULL \|\| *ptr != '\0' )
		{
		fprintf( stderr, "Cannot parse string \"%s\" as an integer value\n", line );
		exit( -1 );
		}
		}

		static int8_t parseUint32( const char line, uint32_t ret )
		{
		char *ptr;

lib_com/ivas_prot.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -3128,7 +3128,7 @@ void ivas_sba_mtx_mult(
		float output_f[][L_FRAME48k], /* i/o: synthesized core-corder transport channels/DirAC output */
		const int16_t output_frame, /* i : frame length per channel */
		const int16_t nchan_in, /* i : Number of ambisonic channels */
		IVAS_OUTPUT_SETUP output_setup, /* i : Output configuration */
		const IVAS_OUTPUT_SETUP output_setup, /* i : Output configuration */
		const float mtx_hoa_decoder / o : HOA decoding matrix */
		);
		#endif