add error returns, formatting, comments replace "#if defined XX" by "#ifdef XX" (c5a61f67) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/decoder.c

+49 −68

Original line number	Diff line number	Diff line
		@@ -1736,7 +1736,7 @@ static ivas_error initOnFirstGoodFrame(
		IVAS_DEC_HANDLE hIvasDec, /* i/o: */
		const DecArguments arg, /* i : */
		const int16_t numInitialBadFrames, /* i : */
		#if defined( SPLIT_REND_WITH_HEAD_ROT )
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		uint16_t numOutSamples, / i/o: */
		int16_t vec_pos_len, / i/o: */
		#else
		@@ -1864,22 +1864,18 @@ static ivas_error initOnFirstGoodFrame(
		else
		{
		#endif
		if ( *pRemainingDelayNumSamples <
		#if defined( SPLIT_REND_WITH_HEAD_ROT )
		*numOutSamples

		#ifdef SPLIT_REND_WITH_HEAD_ROT
		if ( pRemainingDelayNumSamples < numOutSamples )
		#else
		numOutSamples
		if ( *pRemainingDelayNumSamples < numOutSamples )
		#endif
		)
		{
		if ( ( error = AudioFileWriter_write( *ppAfWriter, zeroBuf,
		#if defined( SPLIT_REND_WITH_HEAD_ROT )
		*numOutSamples
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		if ( ( error = AudioFileWriter_write( ppAfWriter, zeroBuf, numOutSamples * pNumOutChannels - ( pRemainingDelayNumSamples * *pNumOutChannels ) ) ) != IVAS_ERR_OK )
		#else
		numOutSamples
		if ( ( error = AudioFileWriter_write( ppAfWriter, zeroBuf, numOutSamples pNumOutChannels - ( pRemainingDelayNumSamples * *pNumOutChannels ) ) ) != IVAS_ERR_OK )
		#endif
		* *pNumOutChannels -
		( pRemainingDelayNumSamples *pNumOutChannels ) ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nOutput audio file writer error\n" );
		return error;
		@@ -1888,13 +1884,11 @@ static ivas_error initOnFirstGoodFrame(
		}
		else
		{
		*pRemainingDelayNumSamples -=
		#if defined( SPLIT_REND_WITH_HEAD_ROT )
		*numOutSamples
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		pRemainingDelayNumSamples -= numOutSamples;
		#else
		numOutSamples
		*pRemainingDelayNumSamples -= numOutSamples;
		#endif
		;
		}
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		}
		@@ -1984,10 +1978,9 @@ static ivas_error initOnFirstGoodFrame(
		}
		}

		#if defined( SPLIT_REND_WITH_HEAD_ROT )
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		if ( *hSplitRendFileReadWrite != NULL )
		{

		int16_t enable5ms;

		if ( numOutSamples == NULL \|\| vec_pos_len == NULL )
		@@ -1995,7 +1988,10 @@ static ivas_error initOnFirstGoodFrame(
		return IVAS_ERR_UNEXPECTED_NULL_POINTER;
		}

		IVAS_DEC_Get5msFlag( hIvasDec, &enable5ms );
		if ( ( error = IVAS_DEC_Get5msFlag( hIvasDec, &enable5ms ) ) != IVAS_ERR_OK )
		{
		return error;
		}

		/* real setting of the 5ms mode for split rendering is only known after the decoded first good frame, reset the variables needed in the main decoding loop accordingly here*/
		if ( enable5ms )
		@@ -2014,11 +2010,13 @@ static ivas_error initOnFirstGoodFrame(
		return IVAS_ERR_OK;
		}


		/---------------------------------------------------------------------
		* decodeG192()
		*
		* Read G.192 bitstream and decode in regular decoder
		---------------------------------------------------------------------/

		static ivas_error decodeG192(
		DecArguments arg,
		BS_READER_HANDLE hBsReader,
		@@ -2047,7 +2045,7 @@ static ivas_error decodeG192(
		int16_t nOutChannels = 0;
		int16_t delayNumSamples = -1;
		int16_t delayNumSamples_orig[3];
		#if defined( SPLIT_REND_WITH_HEAD_ROT )
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		uint16_t nOutSamples = 0;
		#else
		int16_t nOutSamples = 0;
		@@ -2068,7 +2066,6 @@ static ivas_error decodeG192(
		IsmFileWriter *ismWriters[IVAS_MAX_NUM_OBJECTS];
		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;

		#ifdef SPLIT_REND_WITH_HEAD_ROT
		IVAS_SPLIT_REND_BITS_DATA splitRendBits;
		SplitFileReadWrite *hSplitRendFileReadWrite;
		@@ -2223,8 +2220,7 @@ static ivas_error decodeG192(
		{
		if ( ( error = HeadRotationFileReading( headRotReader, &Quaternions[i], &Pos[i] ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError %s while reading head orientation from %s\n", IVAS_DEC_GetErrorMessage( error ),
		RotationFileReader_getFilePath( headRotReader ) );
		fprintf( stderr, "\nError %s while reading head orientation from %s\n", IVAS_DEC_GetErrorMessage( error ), RotationFileReader_getFilePath( headRotReader ) );
		goto cleanup;
		}
		}
		@@ -2234,12 +2230,11 @@ static ivas_error decodeG192(

		for ( i = 0; i < num_subframes; i++ )
		{
		if ( ( error = IVAS_DEC_FeedHeadTrackData( hIvasDec, Quaternions[i], Pos[i], i
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		,
		DEFAULT_AXIS
		if ( ( error = IVAS_DEC_FeedHeadTrackData( hIvasDec, Quaternions[i], Pos[i], i, DEFAULT_AXIS ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = IVAS_DEC_FeedHeadTrackData( hIvasDec, Quaternions[i], Pos[i], i ) ) != IVAS_ERR_OK )
		#endif
		) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nIVAS_DEC_FeedHeadTrackData failed: %s\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		@@ -2333,42 +2328,36 @@ static ivas_error decodeG192(
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		if ( arg.outputConfig == AUDIO_CONFIG_BINAURAL_SPLIT_CODED \|\| arg.outputConfig == AUDIO_CONFIG_BINAURAL_SPLIT_PCM )
		{
		error = IVAS_DEC_GetSplitBinauralBitstream( hIvasDec,
		(void ) ( pcmBuf + nOutChannels nSamplesRendered ),
		&splitRendBits,
		&nSamplesRendered_loop,
		&needNewFrame );
		nSamplesRendered += nSamplesRendered_loop;
		nSamplesToRender -= nSamplesRendered_loop;
		if ( error != IVAS_ERR_OK )
		if ( ( error = IVAS_DEC_GetSplitBinauralBitstream( hIvasDec, (void ) ( pcmBuf + nOutChannels nSamplesRendered ), &splitRendBits, &nSamplesRendered_loop, &needNewFrame ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError in IVAS_DEC_GetSplitBinauralBitstream: %s\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		}

		nSamplesRendered += nSamplesRendered_loop;
		nSamplesToRender -= nSamplesRendered_loop;
		}
		else
		{
		#endif
		error = IVAS_DEC_GetSamples( hIvasDec, nSamplesToRender,
		#if defined SPLIT_REND_WITH_HEAD_ROT
		IVAS_DEC_PCM_INT16,
		(void *)

		#ifdef SPLIT_REND_WITH_HEAD_ROT
		if ( ( error = IVAS_DEC_GetSamples( hIvasDec, nSamplesToRender, IVAS_DEC_PCM_INT16, (void ) ( pcmBuf + nOutChannels nSamplesRendered ), &nSamplesRendered_loop, &needNewFrame ) ) != IVAS_ERR_OK )

		#else
		if ( ( error = IVAS_DEC_GetSamples( hIvasDec, nSamplesToRender, ( pcmBuf + nOutChannels * nSamplesRendered ), &nSamplesRendered_loop, &needNewFrame ) ) != IVAS_ERR_OK )

		#endif
		( pcmBuf + nOutChannels * nSamplesRendered ),
		&nSamplesRendered_loop,
		&needNewFrame );
		nSamplesRendered += nSamplesRendered_loop;
		nSamplesToRender -= nSamplesRendered_loop;
		if ( error != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError in IVAS_DEC_GetSamples: %s\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		}
		nSamplesRendered += nSamplesRendered_loop;
		nSamplesToRender -= nSamplesRendered_loop;
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		}
		#endif


		} while ( nSamplesRendered < nOutSamples && error == IVAS_ERR_OK );

		if ( error == IVAS_ERR_END_OF_FILE )
		@@ -2392,7 +2381,7 @@ static ivas_error decodeG192(
		hIvasDec,
		arg,
		numInitialBadFrames,
		#if defined( SPLIT_REND_WITH_HEAD_ROT )
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		&nOutSamples,
		&vec_pos_len,
		#else
		@@ -2593,8 +2582,6 @@ static ivas_error decodeG192(
		if ( arg.enableHeadRotation )
		{
		IVAS_QUATERNION Quaternion;


		if ( ( error = HeadRotationFileReading( headRotReader, &Quaternion, &Pos[0] ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError %s while reading head orientation from %s\n", IVAS_DEC_GetErrorMessage( error ), RotationFileReader_getFilePath( headRotReader ) );
		@@ -2616,7 +2603,7 @@ static ivas_error decodeG192(

		/* decode and get samples */
		if ( ( error = IVAS_DEC_Flush( hIvasDec, nOutSamples,
		#if defined SPLIT_REND_WITH_HEAD_ROT
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		IVAS_DEC_PCM_INT16,
		(void *)
		#endif
		@@ -2836,10 +2823,8 @@ static ivas_error printBitstreamInfoVoip(
		else
		{
		auPtr = au; /* might have been set to RTP packet in prev call */
		rtpdumpDepackerError = EVS_RTPDUMP_DEPACKER_readNextFrame( &rtpdumpDepacker, &rtpSequenceNumber, &rtpTimeStamp,
		&nextPacketRcvTime_ms,
		&isAMRWB_IOmode, &frameTypeIndex, &qBit,
		&auPtr, (uint16_t *) &auSizeBits );
		rtpdumpDepackerError = EVS_RTPDUMP_DEPACKER_readNextFrame( &rtpdumpDepacker, &rtpSequenceNumber, &rtpTimeStamp, &nextPacketRcvTime_ms, &isAMRWB_IOmode, &frameTypeIndex, &qBit, &auPtr, (uint16_t *) &auSizeBits );

		/* EVS RTP payload format has timescale 16000, JBM uses 1000 internally */
		rtpTimeStamp = rtpTimeStamp / 16;
		}
		@@ -3001,10 +2986,8 @@ static ivas_error decodeVoIP(
		else
		{
		auPtr = au; /* might have been set to RTP packet in prev call */
		rtpdumpDepackerError = EVS_RTPDUMP_DEPACKER_readNextFrame( &rtpdumpDepacker, &rtpSequenceNumber, &rtpTimeStamp,
		&nextPacketRcvTime_ms,
		&isAMRWB_IOmode, &frameTypeIndex, &qBit,
		&auPtr, (uint16_t *) &auSize );
		rtpdumpDepackerError = EVS_RTPDUMP_DEPACKER_readNextFrame( &rtpdumpDepacker, &rtpSequenceNumber, &rtpTimeStamp, &nextPacketRcvTime_ms, &isAMRWB_IOmode, &frameTypeIndex, &qBit, &auPtr, (uint16_t *) &auSize );

		/* EVS RTP payload format has timescale 16000, JBM uses 1000 internally */
		rtpTimeStamp = rtpTimeStamp / 16;
		}
		@@ -3039,7 +3022,7 @@ static ivas_error decodeVoIP(

		while ( 1 )
		{
		#if defined( SPLIT_REND_WITH_HEAD_ROT )
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		uint16_t nOutSamples = 0;
		#else
		int16_t nOutSamples = 0;
		@@ -3049,6 +3032,7 @@ static ivas_error decodeVoIP(
		#else
		nOutSamples = (int16_t) ( arg.output_Fs / 1000 * JBM_FRONTEND_FETCH_FRAMESIZE_MS );
		#endif

		/* read all packets with a receive time smaller than the system time */
		while ( nextPacketRcvTime_ms <= systemTime_ms )
		{
		@@ -3101,9 +3085,8 @@ static ivas_error decodeVoIP(

		/* decode and get samples */
		if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples,
		#if defined SPLIT_REND_WITH_HEAD_ROT
		IVAS_DEC_PCM_INT16,
		(void *)
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		IVAS_DEC_PCM_INT16, (void *)
		#endif
		pcmBuf,
		systemTime_ms
		@@ -3118,7 +3101,6 @@ static ivas_error decodeVoIP(
		goto cleanup;
		}


		/* write JBM Offset file entry */
		if ( jbmOffsetWriter != NULL )
		{
		@@ -3150,14 +3132,14 @@ static ivas_error decodeVoIP(
		if ( decodedGoodFrame )
		{
		#ifdef SPLIT_REND_WITH_HEAD_ROT

		SplitFileReadWrite *hSplitRendFileReadWrite = NULL;
		#endif

		error = initOnFirstGoodFrame(
		hIvasDec,
		arg,
		numInitialBadFrames,
		#if defined( SPLIT_REND_WITH_HEAD_ROT )
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		&nOutSamples,
		NULL,
		#else
		@@ -3192,7 +3174,6 @@ static ivas_error decodeVoIP(
		}
		}


		/* Write current frame */
		if ( decodedGoodFrame )
		{

apps/renderer.c

+79 −26

Original line number	Diff line number	Diff line
		@@ -526,7 +526,12 @@ static int16_t getTotalNumInChannels(
		fprintf( stderr, "Error: %s\n", ivas_error_to_string( error ) );
		exit( -1 );
		}
		IVAS_REND_GetNumAllObjects( hIvasRend, &numInputChannels ); /* In case of MASA output, modify the numInputChannels to contain all objects. Otherwise, keep the original value. */

		/* In case of MASA output, modify the numInputChannels to contain all objects. Otherwise, keep the original value. */
		if ( ( error = IVAS_REND_GetNumAllObjects( hIvasRend, &numInputChannels ) ) != IVAS_ERR_OK )
		{
		return error;
		}
		totalNumInChannels += numInputChannels;
		}

		@@ -1104,7 +1109,8 @@ int main(

		if ( ( error = IVAS_REND_SetOrientationTrackingMode( hIvasRend, args.orientation_tracking ) ) != IVAS_ERR_OK )
		{
		return error;
		fprintf( stderr, "Error in IVAS_REND_SetOrientationTrackingMode(): %s\n", ivas_error_to_string( error ) );
		exit( -1 );
		}

		/* Set up output custom layout configuration */
		@@ -1112,7 +1118,8 @@ int main(
		{
		if ( ( error = IVAS_REND_ConfigureCustomOutputLoudspeakerLayout( hIvasRend, args.outConfig.outSetupCustom ) ) != IVAS_ERR_OK )
		{
		return error;
		fprintf( stderr, "Error in IVAS_REND_ConfigureCustomOutputLoudspeakerLayout(): %s\n", ivas_error_to_string( error ) );
		exit( -1 );
		}
		}

		@@ -1130,8 +1137,17 @@ int main(
		/* Set the total number of objects */
		if ( args.inConfig.numAudioObjects > 0 )
		{
		IVAS_REND_SetTotalNumberOfObjects( hIvasRend, args.inConfig.numAudioObjects );
		IVAS_REND_SetIsmMetadataDelay( hIvasRend, args.syncMdDelay );
		if ( ( error = IVAS_REND_SetTotalNumberOfObjects( hIvasRend, args.inConfig.numAudioObjects ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Error in IVAS_REND_SetTotalNumberOfObjects(): %s\n", ivas_error_to_string( error ) );
		exit( -1 );
		}

		if ( ( error = IVAS_REND_SetIsmMetadataDelay( hIvasRend, args.syncMdDelay ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Error in IVAS_REND_SetIsmMetadataDelay(): %s\n", ivas_error_to_string( error ) );
		exit( -1 );
		}
		}

		IVAS_REND_LfePanMtx lfePanMatrix;
		@@ -1164,7 +1180,8 @@ int main(
		{
		if ( ( error = IVAS_REND_ConfigureCustomInputLoudspeakerLayout( hIvasRend, mcIds[i], args.inConfig.inSetupCustom ) ) != IVAS_ERR_OK )
		{
		return error;
		fprintf( stderr, "Error in IVAS_REND_ConfigureCustomInputLoudspeakerLayout(): %s\n", ivas_error_to_string( error ) );
		exit( -1 );
		}
		}

		@@ -1317,21 +1334,29 @@ int main(
		int16_t numOutChannels;
		if ( ( error = IVAS_REND_NumOutChannels( hIvasRend, &numOutChannels ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Error: %s\n", ivas_error_to_string( error ) );
		fprintf( stderr, "Error in IVAS_REND_NumOutChannels(): %s\n", ivas_error_to_string( error ) );
		exit( -1 );
		}

		#ifdef SPLIT_REND_WITH_HEAD_ROT
		if ( cldfb_in )
		{
		IVAS_REND_openCldfb( cldfbAna, cldfbSyn, totalNumInChannels, numOutChannels, args.sampleRate );
		if ( ( error = IVAS_REND_openCldfb( cldfbAna, cldfbSyn, totalNumInChannels, numOutChannels, args.sampleRate ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Error in IVAS_REND_openCldfb(): %s\n", ivas_error_to_string( error ) );
		exit( -1 );
		}
		}

		if ( args.outConfig.audioConfig == AUDIO_CONFIG_BINAURAL_SPLIT_CODED )
		{
		IVAS_REND_GetDelay( hIvasRend, &delayNumSamples_temp, &delayTimeScale_temp );
		error = split_rend_writer_open( &hSplitRendFileReadWrite, args.outputFilePath, delayNumSamples_temp, delayTimeScale_temp );
		if ( error != IVAS_ERR_OK )
		if ( IVAS_REND_GetDelay( hIvasRend, &delayNumSamples_temp, &delayTimeScale_temp ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nUnable to get delay of renderer!\n" );
		exit( -1 );
		}

		if ( ( error = split_rend_writer_open( &hSplitRendFileReadWrite, args.outputFilePath, delayNumSamples_temp, delayTimeScale_temp ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Could not open split rend metadata file %s\n", args.outputFilePath );
		exit( -1 );
		@@ -1342,15 +1367,20 @@ int main(
		{
		if ( args.outConfig.audioConfig == AUDIO_CONFIG_BINAURAL_SPLIT_PCM )
		{
		IVAS_REND_GetDelay( hIvasRend, &delayNumSamples_temp, &delayTimeScale_temp );
		error = split_rend_writer_open( &hSplitRendFileReadWrite, args.outMetadataFilePath, delayNumSamples_temp, delayTimeScale_temp );
		if ( error != IVAS_ERR_OK )
		if ( IVAS_REND_GetDelay( hIvasRend, &delayNumSamples_temp, &delayTimeScale_temp ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nUnable to get delay of renderer!\n" );
		exit( -1 );
		}

		if ( ( error = split_rend_writer_open( &hSplitRendFileReadWrite, args.outMetadataFilePath, delayNumSamples_temp, delayTimeScale_temp ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Could not open split rend metadata file %s\n", args.outMetadataFilePath );
		exit( -1 );
		}
		}
		#endif

		if ( AudioFileWriter_open( &audioWriter, args.outputFilePath, args.sampleRate, numOutChannels ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Failed to open file: %s\n", args.outputFilePath );
		@@ -1585,8 +1615,17 @@ int main(
		if ( splitRendBFIReader != NULL && splitBinNeedsNewFrame )
		{
		int16_t bfi;
		SplitRendBFIFileReading( splitRendBFIReader, &bfi );
		IVAS_REND_SetSplitRendBFI( hIvasRend, bfi );
		if ( ( error = SplitRendBFIFileReading( splitRendBFIReader, &bfi ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Error in SplitRendBFIFileReading(): %s\n", ivas_error_to_string( error ) );
		exit( -1 );
		}

		if ( ( error = IVAS_REND_SetSplitRendBFI( hIvasRend, bfi ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Error in IVAS_REND_SetSplitRendBFI(): %s\n", ivas_error_to_string( error ) );
		exit( -1 );
		}
		}
		#endif

		@@ -1608,8 +1647,7 @@ int main(
		}
		for ( sf_idx = 0; sf_idx < num_subframes; sf_idx++ )
		{
		if ( ( error = IVAS_REND_SetExternalOrientation( hIvasRend, &quatBuffer[sf_idx], enableHeadRotation[sf_idx], enableExternalOrientation[sf_idx], enableRotationInterpolation[sf_idx], numFramesToTargetOrientation[sf_idx],
		sf_idx ) ) != IVAS_ERR_OK )
		if ( ( error = IVAS_REND_SetExternalOrientation( hIvasRend, &quatBuffer[sf_idx], enableHeadRotation[sf_idx], enableExternalOrientation[sf_idx], enableRotationInterpolation[sf_idx], numFramesToTargetOrientation[sf_idx], sf_idx ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Error setting External Orientation: %s\n", ivas_error_to_string( error ) );
		exit( -1 );
		@@ -1752,7 +1790,7 @@ int main(
		}
		#endif

		#if defined SPLIT_REND_WITH_HEAD_ROT
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		if ( args.inConfig.numBinBuses != 0 )
		{
		if ( ( error = IVAS_REND_GetSplitBinauralSamples( hIvasRend, outBuffer, &splitBinNeedsNewFrame ) ) != IVAS_ERR_OK )
		@@ -1761,8 +1799,7 @@ int main(
		exit( -1 );
		}
		}
		else if ( args.outConfig.audioConfig == AUDIO_CONFIG_BINAURAL_SPLIT_CODED \|\|
		args.outConfig.audioConfig == AUDIO_CONFIG_BINAURAL_SPLIT_PCM )
		else if ( args.outConfig.audioConfig == AUDIO_CONFIG_BINAURAL_SPLIT_CODED \|\| args.outConfig.audioConfig == AUDIO_CONFIG_BINAURAL_SPLIT_PCM )
		{
		if ( ( error = IVAS_REND_GetSplitBinauralBitstream( hIvasRend, outBuffer, &bitsBuffer ) ) != IVAS_ERR_OK )
		{
		@@ -1782,7 +1819,7 @@ int main(
		#endif
		exit( -1 );
		}
		#if defined SPLIT_REND_WITH_HEAD_ROT
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		}
		#endif

		@@ -1908,26 +1945,42 @@ int main(

		if ( numInputFormats == 1 )
		{
		IVAS_REND_GetMasaMetadata( hIvasRend, &hMetaOutput, inputType1 );
		if ( ( error = IVAS_REND_GetMasaMetadata( hIvasRend, &hMetaOutput, inputType1 ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Error in IVAS_REND_GetMasaMetadata(): %s\n", ivas_error_to_string( error ) );
		exit( -1 );
		}
		}
		else
		{
		if ( args.inConfig.numAmbisonicsBuses > 0 && args.inConfig.numMultiChannelBuses > 0 )
		{
		inputType2 = IVAS_REND_AUDIO_CONFIG_TYPE_CHANNEL_BASED;
		IVAS_REND_MergeMasaMetadata( hIvasRend, &hMetaOutput, inputType1, inputType2 );
		if ( ( error = IVAS_REND_MergeMasaMetadata( hIvasRend, &hMetaOutput, inputType1, inputType2 ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Error in IVAS_REND_MergeMasaMetadata(): %s\n", ivas_error_to_string( error ) );
		exit( -1 );
		}
		}

		if ( ( args.inConfig.numAmbisonicsBuses > 0 \|\| args.inConfig.numMultiChannelBuses > 0 ) && args.inConfig.numMasaBuses > 0 )
		{
		inputType2 = IVAS_REND_AUDIO_CONFIG_TYPE_MASA;
		IVAS_REND_MergeMasaMetadata( hIvasRend, &hMetaOutput, inputType1, inputType2 );
		if ( ( error = IVAS_REND_MergeMasaMetadata( hIvasRend, &hMetaOutput, inputType1, inputType2 ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Error in IVAS_REND_MergeMasaMetadata(): %s\n", ivas_error_to_string( error ) );
		exit( -1 );
		}
		}

		if ( ( args.inConfig.numAmbisonicsBuses > 0 \|\| args.inConfig.numMultiChannelBuses > 0 \|\| args.inConfig.numMasaBuses > 0 ) && args.inConfig.numAudioObjects > 0 )
		{
		inputType2 = IVAS_REND_AUDIO_CONFIG_TYPE_OBJECT_BASED;
		IVAS_REND_MergeMasaMetadata( hIvasRend, &hMetaOutput, inputType1, inputType2 );
		if ( ( error = IVAS_REND_MergeMasaMetadata( hIvasRend, &hMetaOutput, inputType1, inputType2 ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Error in IVAS_REND_MergeMasaMetadata(): %s\n", ivas_error_to_string( error ) );
		exit( -1 );
		}
		}
		}

lib_com/ivas_cnst.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -130,7 +130,7 @@ typedef enum
		} ivas_renderTypeOverride;
		#endif

		#if defined SPLIT_REND_WITH_HEAD_ROT
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		typedef enum
		{
		PCM_INT16,

lib_com/ivas_mdft_imdft.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -231,10 +231,10 @@ void ivas_mdft(
		float im[L_FRAME48k];
		int16_t j, len_by_2;
		const float *pTwid;

		len_by_2 = mdft_length >> 1;

		ivas_get_mdft_twid_factors( mdft_length,
		&pTwid );
		ivas_get_mdft_twid_factors( mdft_length, &pTwid );

		if ( mdft_length == input_length )
		{

lib_com/ivas_prot.h

+40 −39

File changed.

Preview size limit exceeded, changes collapsed.