Merge branch 'main' into basop-2292-fix-eig2x2_fx-optimisation (19885c4d) · Commits · SA4 / Audio / IVAS BASOP

apps/decoder.c

+42 −42

Original line number	Diff line number	Diff line
		@@ -124,7 +124,7 @@ typedef struct
		char *outputMdFilename;
		IVAS_DEC_COMPLEXITY_LEVEL complexityLevel;
		bool tsmEnabled;
		IVAS_RENDER_FRAMESIZE renderFramesize;
		IVAS_RENDER_NUM_SUBFR render_num_subframes;
		AcousticEnvironmentSequence aeSequence;
		bool dpidEnabled;
		uint16_t directivityPatternId[IVAS_MAX_NUM_OBJECTS];
		@@ -198,7 +198,7 @@ int main(
		Vector3PairFileReader *referenceVectorReader = NULL;
		RenderConfigReader *renderConfigReader = NULL;
		int16_t *pcmBuf = NULL;
		IVAS_RENDER_FRAMESIZE asked_frame_size;
		IVAS_RENDER_NUM_SUBFR asked_num_subframes;
		IVAS_DEC_HRTF_BINARY_WRAPPER hHrtfBinary;
		ObjectEditFileReader *objectEditFileReader = NULL;
		IVAS_ROOM_ACOUSTICS_CONFIG_DATA **pAE = NULL;
		@@ -415,11 +415,11 @@ int main(
		* Configure the decoder
		------------------------------------------------------------------------------------------/

		asked_frame_size = arg.renderFramesize;
		asked_num_subframes = arg.render_num_subframes;
		uint16_t aeID = arg.aeSequence.count > 0 ? arg.aeSequence.pID[0] : IVAS_DEFAULT_AEID;
		arg.enableHeadRotation = arg.enableHeadRotation \|\| arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED \|\| arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM;

		if ( ( error = IVAS_DEC_Configure( hIvasDec, arg.output_Fs, arg.outputConfig, arg.renderFramesize, arg.customLsOutputEnabled, arg.hrtfReaderEnabled,
		if ( ( error = IVAS_DEC_Configure( hIvasDec, arg.output_Fs, arg.outputConfig, arg.render_num_subframes, arg.customLsOutputEnabled, arg.hrtfReaderEnabled,
		arg.enableHeadRotation, arg.enableExternalOrientation, arg.orientation_tracking, arg.renderConfigEnabled, arg.roomSize, arg.non_diegetic_pan_enabled,
		arg.non_diegetic_pan_gain_fx, arg.dpidEnabled, aeID, arg.objEditEnabled, arg.delayCompensationEnabled ) ) != IVAS_ERR_OK )
		{
		@@ -427,13 +427,13 @@ int main(
		goto cleanup;
		}

		if ( ( error = IVAS_DEC_GetRenderFramesize( hIvasDec, &arg.renderFramesize ) ) != IVAS_ERR_OK )
		if ( ( error = IVAS_DEC_GetRenderNumSubfr( hIvasDec, &arg.render_num_subframes ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nConfigure failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		fprintf( stderr, "\nIVAS_DEC_GetRenderNumSubfr failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		}

		if ( arg.renderFramesize != asked_frame_size )
		if ( arg.render_num_subframes != asked_num_subframes )
		{
		fprintf( stderr, "\nChanged render framesize, only 20ms are allowed for decoding to EXT!\n" );
		}
		@@ -442,7 +442,7 @@ int main(
		* Configure Split rendering
		------------------------------------------------------------------------------------------/

		asked_frame_size = arg.renderFramesize;
		asked_num_subframes = arg.render_num_subframes;
		if ( arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED \|\| arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )
		{
		if ( ( error = IVAS_DEC_EnableSplitRendering( hIvasDec ) ) != IVAS_ERR_OK )
		@@ -451,14 +451,14 @@ int main(
		goto cleanup;
		}

		if ( ( error = IVAS_DEC_GetRenderFramesize( hIvasDec, &arg.renderFramesize ) ) != IVAS_ERR_OK )
		if ( ( error = IVAS_DEC_GetRenderNumSubfr( hIvasDec, &arg.render_num_subframes ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nConfigure failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		fprintf( stderr, "\nIVAS_DEC_GetRenderNumSubfr failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		}

		#ifdef FIX_1449_RENDERER_FRAME_SIZE_UNCLEAR_IN_ISAR
		if ( !arg.renderConfigEnabled && ( arg.renderFramesize != asked_frame_size ) )
		if ( !arg.renderConfigEnabled && ( arg.render_num_subframes != asked_num_subframes ) )
		{
		fprintf( stderr, "\nChanged render framesize, only 20ms are allowed for non-0dof split rendering!\n" );
		}
		@@ -574,24 +574,24 @@ int main(

		if ( ( arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED \|\| arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) )
		{
		if ( asked_frame_size != IVAS_RENDER_FRAMESIZE_20MS &&
		if ( asked_num_subframes != IVAS_RENDER_NUM_SUBFR_20MS &&
		( renderConfig.split_rend_config.poseCorrectionMode == ISAR_SPLIT_REND_POSE_CORRECTION_MODE_NONE \|\|
		renderConfig.split_rend_config.dof == 0 ) )
		{
		arg.renderFramesize = asked_frame_size;
		arg.render_num_subframes = asked_num_subframes;
		}
		else
		{
		arg.renderFramesize = IVAS_RENDER_FRAMESIZE_20MS;
		arg.render_num_subframes = IVAS_RENDER_NUM_SUBFR_20MS;
		}

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

		if ( arg.renderFramesize != asked_frame_size )
		if ( arg.render_num_subframes != asked_num_subframes )
		{
		fprintf( stderr, "\nChanged render framesize, only 20ms are allowed for non-0dof split rendering!\n" );
		}
		@@ -616,7 +616,7 @@ int main(

		/* ISAR frame size is set from command line, not renderer config file.
		* This will be ignored if output format is not split rendering. */
		renderConfig.split_rend_config.isar_frame_size_ms = (int16_t) arg.renderFramesize /* given in number of 5ms subframes / 5;
		renderConfig.split_rend_config.isar_frame_size_ms = (int16_t) arg.render_num_subframes * 5;

		if ( ( error = IVAS_DEC_FeedRenderConfig( hIvasDec, renderConfig ) ) != IVAS_ERR_OK )
		{
		@@ -938,7 +938,7 @@ static bool parseCmdlIVAS_dec(
		arg->non_diegetic_pan_enabled = false;
		arg->non_diegetic_pan_gain = 0.f;
		arg->tsmEnabled = false;
		arg->renderFramesize = IVAS_RENDER_FRAMESIZE_20MS;
		arg->render_num_subframes = IVAS_RENDER_NUM_SUBFR_20MS;
		arg->aeSequence.count = 0;
		arg->aeSequence.pID = NULL;
		arg->aeSequence.pValidity = NULL;
		@@ -1105,13 +1105,13 @@ static bool parseCmdlIVAS_dec(
		switch ( (int16_t) tmp )
		{
		case 5:
		arg->renderFramesize = IVAS_RENDER_FRAMESIZE_5MS;
		arg->render_num_subframes = IVAS_RENDER_NUM_SUBFR_5MS;
		break;
		case 10:
		arg->renderFramesize = IVAS_RENDER_FRAMESIZE_10MS;
		arg->render_num_subframes = IVAS_RENDER_NUM_SUBFR_10MS;
		break;
		case 20:
		arg->renderFramesize = IVAS_RENDER_FRAMESIZE_20MS;
		arg->render_num_subframes = IVAS_RENDER_NUM_SUBFR_20MS;
		break;
		default:
		fprintf( stderr, "Error: Invalid render frame size %d \n\n", tmp );
		@@ -2161,10 +2161,10 @@ static ivas_error decodeG192(
		}
		}

		int16_t num_subframes;
		if ( ( error = IVAS_DEC_GetNumOrientationSubframes( hIvasDec, &num_subframes ) ) != IVAS_ERR_OK )
		IVAS_RENDER_NUM_SUBFR num_subframes;
		if ( ( error = IVAS_DEC_GetRenderNumSubfr( hIvasDec, &num_subframes ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nIVAS_DEC_GetNumOrientationSubframes failed: \n" );
		fprintf( stderr, "\nIVAS_DEC_GetRenderNumSubfr failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		}

		@@ -2175,7 +2175,7 @@ static ivas_error decodeG192(

		if ( headRotReader == NULL )
		{
		for ( i = 0; i < num_subframes; i++ )
		for ( i = 0; i < (int16_t) num_subframes; i++ )
		{
		Quaternions[i].w_fx = -12582912;
		Quaternions[i].x_fx = 0;
		@@ -2190,7 +2190,7 @@ static ivas_error decodeG192(
		}
		else
		{
		for ( i = 0; i < num_subframes; i++ )
		for ( i = 0; i < (int16_t) num_subframes; i++ )
		{
		if ( ( error = HeadRotationFileReading( headRotReader, &Quaternions[i], &Pos[i] ) ) != IVAS_ERR_OK )
		{
		@@ -2200,7 +2200,7 @@ static ivas_error decodeG192(
		}
		}

		for ( i = 0; i < num_subframes; i++ )
		for ( i = 0; i < (int16_t) num_subframes; i++ )
		{
		if ( ( error = IVAS_DEC_FeedHeadTrackData( hIvasDec, Quaternions[i], Pos[i], i, DEFAULT_AXIS ) ) != IVAS_ERR_OK )
		{
		@@ -2218,7 +2218,7 @@ static ivas_error decodeG192(
		int8_t enableRotationInterpolation[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES];
		int16_t numFramesToTargetOrientation[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES];

		for ( i = 0; i < num_subframes; i++ )
		for ( i = 0; i < (int16_t) num_subframes; i++ )
		{
		if ( ( error = ExternalOrientationFileReading( externalOrientationFileReader, &Quaternions[i], &enableHeadRotation[i], &enableExternalOrientation[i], &enableRotationInterpolation[i], &numFramesToTargetOrientation[i] ) ) != IVAS_ERR_OK )
		{
		@@ -2226,7 +2226,7 @@ static ivas_error decodeG192(
		goto cleanup;
		}
		}
		for ( i = 0; i < num_subframes; i++ )
		for ( i = 0; i < (int16_t) num_subframes; i++ )
		{
		if ( ( error = IVAS_DEC_FeedExternalOrientationData( hIvasDec, Quaternions[i], enableHeadRotation[i], enableExternalOrientation[i], enableRotationInterpolation[i], numFramesToTargetOrientation[i], i ) ) != IVAS_ERR_OK )
		{
		@@ -2992,10 +2992,10 @@ static ivas_error decodeVoIP(
		}
		}

		int16_t num_subframes;
		if ( ( error = IVAS_DEC_GetNumOrientationSubframes( hIvasDec, &num_subframes ) ) != IVAS_ERR_OK )
		IVAS_RENDER_NUM_SUBFR num_subframes;
		if ( ( error = IVAS_DEC_GetRenderNumSubfr( hIvasDec, &num_subframes ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nIVAS_DEC_GetNumOrientationSubframes failed: \n" );
		fprintf( stderr, "\nIVAS_DEC_GetRenderNumSubfr failed: %s\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		}

		@@ -3006,7 +3006,7 @@ static ivas_error decodeVoIP(

		if ( headRotReader == NULL )
		{
		for ( i = 0; i < num_subframes; i++ )
		for ( i = 0; i < (int16_t) num_subframes; i++ )
		{
		Quaternions[i].w_fx = -12582912;
		Quaternions[i].x_fx = 0;
		@@ -3021,7 +3021,7 @@ static ivas_error decodeVoIP(
		}
		else
		{
		for ( i = 0; i < num_subframes; i++ )
		for ( i = 0; i < (int16_t) num_subframes; i++ )
		{
		if ( ( error = HeadRotationFileReading( headRotReader, &Quaternions[i], &Pos[i] ) ) != IVAS_ERR_OK )
		{
		@@ -3031,7 +3031,7 @@ static ivas_error decodeVoIP(
		}
		}

		for ( i = 0; i < num_subframes; i++ )
		for ( i = 0; i < (int16_t) num_subframes; i++ )
		{
		if ( ( error = IVAS_DEC_FeedHeadTrackData( hIvasDec, Quaternions[i], Pos[i], i, DEFAULT_AXIS ) ) != IVAS_ERR_OK )
		{
		@@ -3049,7 +3049,7 @@ static ivas_error decodeVoIP(
		int8_t enableRotationInterpolation[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES];
		int16_t numFramesToTargetOrientation[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES];

		for ( i = 0; i < num_subframes; i++ )
		for ( i = 0; i < (int16_t) num_subframes; i++ )
		{

		if ( ( error = ExternalOrientationFileReading( externalOrientationFileReader, &Quaternions[i], &enableHeadRotation[i], &enableExternalOrientation[i], &enableRotationInterpolation[i], &numFramesToTargetOrientation[i] ) ) != IVAS_ERR_OK )
		@@ -3059,7 +3059,7 @@ static ivas_error decodeVoIP(
		goto cleanup;
		}
		}
		for ( i = 0; i < num_subframes; i++ )
		for ( i = 0; i < (int16_t) num_subframes; i++ )
		{
		if ( ( error = IVAS_DEC_FeedExternalOrientationData( hIvasDec, Quaternions[i], enableHeadRotation[i], enableExternalOrientation[i], enableRotationInterpolation[i], numFramesToTargetOrientation[i], i ) ) != IVAS_ERR_OK )
		{
		@@ -3988,7 +3988,7 @@ static ivas_error restartDecoder(

		IVAS_AUDIO_CONFIG outputConfig = ( decMode == IVAS_DEC_MODE_IVAS ) ? arg->outputConfig : IVAS_AUDIO_CONFIG_MONO;

		if ( ( error = IVAS_DEC_Configure( hIvasDec, arg->output_Fs, outputConfig, arg->renderFramesize, arg->customLsOutputEnabled, arg->hrtfReaderEnabled,
		if ( ( error = IVAS_DEC_Configure( hIvasDec, arg->output_Fs, outputConfig, arg->render_num_subframes, arg->customLsOutputEnabled, arg->hrtfReaderEnabled,
		arg->enableHeadRotation, arg->enableExternalOrientation, arg->orientation_tracking, arg->renderConfigEnabled, arg->roomSize, arg->non_diegetic_pan_enabled,
		arg->non_diegetic_pan_gain_fx, arg->dpidEnabled, aeID, arg->objEditEnabled, arg->delayCompensationEnabled ) ) != IVAS_ERR_OK )
		{
		@@ -3996,9 +3996,9 @@ static ivas_error restartDecoder(
		goto cleanup;
		}

		if ( ( error = IVAS_DEC_GetRenderFramesize( hIvasDec, &arg->renderFramesize ) ) != IVAS_ERR_OK )
		if ( ( error = IVAS_DEC_GetRenderNumSubfr( hIvasDec, &arg->render_num_subframes ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nConfigure failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		fprintf( stderr, "\nIVAS_DEC_GetRenderNumSubfr failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		}

		@@ -4021,7 +4021,7 @@ static ivas_error restartDecoder(
		* This will be ignored if output format is not split rendering. */
		if ( renderConfig != NULL )
		{
		renderConfig->split_rend_config.isar_frame_size_ms = (int16_t) arg->renderFramesize /* given in number of 5ms subframes / 5;
		renderConfig->split_rend_config.isar_frame_size_ms = (int16_t) arg->render_num_subframes * 5;
		}

		if ( arg->renderConfigEnabled && renderConfig != NULL )

apps/isar_post_rend.c

+13 −13

Original line number	Diff line number	Diff line
		@@ -114,7 +114,7 @@ typedef struct
		bool delayCompensationEnabled;
		bool quietModeEnabled;
		bool sceneDescriptionInput;
		IVAS_RENDER_FRAMESIZE render_framesize;
		IVAS_RENDER_NUM_SUBFR render_num_subframes;
		} CmdlnArgs;

		typedef enum
		@@ -340,13 +340,13 @@ static bool parseInConfig(
		}


		static bool parseRenderFramesize(
		static bool parseRenderNumSubfr(
		char *value,
		IVAS_RENDER_FRAMESIZE *render_framesize )
		IVAS_RENDER_NUM_SUBFR *render_num_subframes )
		{
		int32_t tmp;

		*render_framesize = IVAS_RENDER_FRAMESIZE_UNKNOWN;
		*render_num_subframes = IVAS_RENDER_NUM_SUBFR_UNKNOWN;
		if ( !is_digits_only( value ) )
		{
		return false;
		@@ -355,13 +355,13 @@ static bool parseRenderFramesize(
		switch ( (int16_t) tmp )
		{
		case 5:
		*render_framesize = IVAS_RENDER_FRAMESIZE_5MS;
		*render_num_subframes = IVAS_RENDER_NUM_SUBFR_5MS;
		break;
		case 10:
		*render_framesize = IVAS_RENDER_FRAMESIZE_10MS;
		*render_num_subframes = IVAS_RENDER_NUM_SUBFR_10MS;
		break;
		case 20:
		*render_framesize = IVAS_RENDER_FRAMESIZE_20MS;
		*render_num_subframes = IVAS_RENDER_NUM_SUBFR_20MS;
		break;
		default:
		return false;
		@@ -476,7 +476,7 @@ static CmdlnArgs defaultArgs(
		args.quietModeEnabled = false;
		args.sceneDescriptionInput = false;

		args.render_framesize = IVAS_RENDER_FRAMESIZE_20MS;
		args.render_num_subframes = IVAS_RENDER_NUM_SUBFR_20MS;

		return args;
		}
		@@ -559,7 +559,7 @@ static void parseOption(
		break;
		case CmdLnOptionId_framing:
		assert( numOptionValues == 1 );
		if ( !parseRenderFramesize( optionValues[0], &args->render_framesize ) )
		if ( !parseRenderNumSubfr( optionValues[0], &args->render_num_subframes ) )
		{
		fprintf( stderr, "Unknown or invalid option for frame size: %s\n", optionValues[0] );
		exit( -1 );
		@@ -951,7 +951,7 @@ int main(
		audioReader = NULL;

		/* Force owerwrite of command line provided rendersize to align with codec frame size */
		args.render_framesize = bitsBuffer.config.isar_frame_size_ms / 5;
		args.render_num_subframes = bitsBuffer.config.isar_frame_size_ms / 5;
		}
		/if split renderer is running in post renderer mode/
		else if ( ( args.inConfig.numBinBuses > 0 ) && ( args.inConfig.binBuses[0].audioConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED ) )
		@@ -1023,9 +1023,9 @@ int main(
		* Open ISAR handle
		------------------------------------------------------------------------------------------/

		const int16_t frameSize_smpls = (int16_t) ( ( args.render_framesize ) * args.sampleRate * 5 / ( 1000 ) );
		const int16_t frameSize_smpls = (int16_t) ( ( args.render_num_subframes ) * args.sampleRate * 5 / ( 1000 ) );
		args.outConfig.audioConfig = IVAS_AUDIO_CONFIG_BINAURAL;
		if ( ( error = ISAR_POST_REND_open( &hIsarPostRend, args.sampleRate, args.outConfig.audioConfig, true, 0, 0, (int16_t) args.render_framesize ) ) != IVAS_ERR_OK )
		if ( ( error = ISAR_POST_REND_open( &hIsarPostRend, args.sampleRate, args.outConfig.audioConfig, true, 0, 0, (int16_t) args.render_num_subframes ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError opening renderer handle: %s\n", ivas_error_to_string( error ) );
		goto cleanup;
		@@ -1243,7 +1243,7 @@ int main(
		convertInputBuffer( inpInt16Buffer, numSamplesRead, inBuffer.config.numSamplesPerChannel, num_in_channels, inFloatBuffer_fx );
		*inBuffer.pq_fact = 0;
		int16_t num_subframes, sf_idx;
		num_subframes = (int16_t) args.render_framesize;
		num_subframes = (int16_t) args.render_num_subframes;

		/* Read from head rotation trajectory file if specified */
		if ( headRotReader != NULL )

apps/renderer.c

+32 −21

File changed.

Preview size limit exceeded, changes collapsed.

lib_com/ari_hm_fx.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -2,7 +2,6 @@
		EVS Codec 3GPP TS26.452 Nov 04, 2021. Version 16.4.0
		====================================================================================*/


		#include <stdint.h>
		#include <assert.h>
		#include "options.h"
		@@ -11,7 +10,7 @@
		#include "rom_com.h"
		#include "prot_fx.h"

		#define GET_ADJ2( T, L, F ) ( ( ( L ) << ( F ) ) - ( T ) )

		void UnmapIndex(
		const Word16 PeriodicityIndex, /* Q0 */
		const Word16 Bandwidth, /* Q0 */

lib_com/cldfb_fx.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -595,6 +595,9 @@ void cldfbAnalysis_ts_fx_var_q(
		IF( NE_16( h_cldfb->Q_cldfb_state, *q_cldfb ) )
		{
		Word16 norm_st = L_norm_arr( timeBuffer_fx, offset );
		#ifdef FIX_2257_INCR_GUARD_BITS
		norm_st = sub( norm_st, find_guarded_bits_fx( shr( h_cldfb->no_channels, 2 ) ) );
		#endif
		IF( GE_16( norm_st, sub( *q_cldfb, h_cldfb->Q_cldfb_state ) ) )
		{
		scale_sig32( timeBuffer_fx, offset, sub( *q_cldfb, h_cldfb->Q_cldfb_state ) );