Merge branch 'main' into basop_port_MR_2395_fix_BASOP_1585 (494b8e26) · Commits · SA4 / Audio / IVAS BASOP

apps/decoder.c

+50 −19

Original line number	Diff line number	Diff line
		@@ -178,19 +178,27 @@ typedef struct
		static bool parseCmdlIVAS_dec( int16_t argc, char *argv, DecArguments arg );
		static void usage_dec( void );
		static ivas_error decodeG192( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HRTF_BINARY_WRAPPER hHrtfBinary, RotFileReader headRotReader, RotFileReader externalOrientationFileReader, RotFileReader refRotReader, Vector3PairFileReader referenceVectorReader, ObjectEditFileReader objectEditFileReader, ISAR_SPLIT_REND_BITS_DATA splitRendBits, IVAS_DEC_HANDLE hIvasDec, int16_t pcmBuf );
		static ivas_error decodeVoIP(
		DecArguments arg,
		BS_READER_HANDLE hBsReader,
		IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtf,
		RotFileReader *headRotReader,
		RotFileReader *externalOrientationFileReader,
		RotFileReader *refRotReader,
		Vector3PairFileReader *referenceVectorReader,
		ObjectEditFileReader *objectEditFileReader,
		#ifdef FIX_1119_SPLIT_RENDERING_VOIP
		#ifdef DECODER_FORMAT_SWITCHING
		static ivas_error decodeVoIP( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HRTF_BINARY_WRAPPER hHrtf, RotFileReader headRotReader, RotFileReader externalOrientationFileReader, RotFileReader refRotReader, Vector3PairFileReader referenceVectorReader, ObjectEditFileReader objectEditFileReader, ISAR_SPLIT_REND_BITS_DATA splitRendBits, IVAS_DEC_HANDLE phIvasDec, int16_t *pcmBuf );
		#else
		static ivas_error decodeVoIP( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HRTF_BINARY_WRAPPER hHrtf, RotFileReader headRotReader, RotFileReader externalOrientationFileReader, RotFileReader refRotReader, Vector3PairFileReader referenceVectorReader, ObjectEditFileReader objectEditFileReader, ISAR_SPLIT_REND_BITS_DATA splitRendBits, IVAS_DEC_HANDLE hIvasDec, int16_t pcmBuf );
		ISAR_SPLIT_REND_BITS_DATA *splitRendBits,
		#endif
		#else
		#ifdef DDECODER_FORMAT_SWITCHING
		static ivas_error decodeVoIP( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HRTF_BINARY_WRAPPER hHrtfBinary, RotFileReader headRotReader, RotFileReader externalOrientationFileReader, RotFileReader refRotReader, Vector3PairFileReader referenceVectorReader, ObjectEditFileReader objectEditFileReader, IVAS_DEC_HANDLE phIvasDec, int16_t pcmBuf );
		#else
		static ivas_error decodeVoIP( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HRTF_BINARY_WRAPPER hHrtfBinary, RotFileReader headRotReader, RotFileReader externalOrientationFileReader, RotFileReader refRotReader, Vector3PairFileReader referenceVectorReader, ObjectEditFileReader objectEditFileReader, IVAS_DEC_HANDLE hIvasDec, int16_t *pcmBuf );
		#ifdef FIX_SPLIT_RENDERING_ON_DECODER_RESTART
		IVAS_RENDER_CONFIG_DATA *renderConfig,
		#endif
		#ifdef DECODER_FORMAT_SWITCHING
		IVAS_DEC_HANDLE *phIvasDec,
		#else
		IVAS_DEC_HANDLE hIvasDec,
		#endif
		int16_t *pcmBuf );
		static ivas_error load_hrtf_from_file( IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtfBinary, IVAS_DEC_HANDLE hIvasDec, const IVAS_AUDIO_CONFIG OutputConfig, const int32_t output_Fs );
		static void do_object_editing_fx( IVAS_EDITABLE_PARAMETERS editableParameters, ObjectEditFileReader objectEditFileReader );

		@@ -232,6 +240,9 @@ int main(
		IVAS_ROOM_ACOUSTICS_CONFIG_DATA **pAE = NULL;
		uint32_t aeCount = 0;
		#endif
		#ifdef FIX_SPLIT_RENDERING_ON_DECODER_RESTART
		IVAS_RENDER_CONFIG_DATA renderConfig = { 0 };
		#endif
		#ifdef WMOPS
		reset_wmops();
		reset_mem( USE_BYTES );
		@@ -530,7 +541,9 @@ int main(

		if ( arg.renderConfigEnabled )
		{
		#ifndef FIX_SPLIT_RENDERING_ON_DECODER_RESTART
		IVAS_RENDER_CONFIG_DATA renderConfig;
		#endif

		/* sanity check */
		if ( arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB &&
		@@ -730,19 +743,19 @@ int main(

		if ( arg.voipMode )
		{
		error = decodeVoIP( arg, hBsReader, &hHrtfBinary, headRotReader, externalOrientationFileReader, refRotReader, referenceVectorReader, objectEditFileReader,
		#ifdef FIX_1119_SPLIT_RENDERING_VOIP
		#ifdef DECODER_FORMAT_SWITCHING
		error = decodeVoIP( arg, hBsReader, &hHrtfBinary, headRotReader, externalOrientationFileReader, refRotReader, referenceVectorReader, objectEditFileReader, &splitRendBits, &hIvasDec, pcmBuf );
		#else
		error = decodeVoIP( arg, hBsReader, &hHrtfBinary, headRotReader, externalOrientationFileReader, refRotReader, referenceVectorReader, objectEditFileReader, &splitRendBits, hIvasDec, pcmBuf );
		&splitRendBits,
		#endif
		#else
		#ifdef DDECODER_FORMAT_SWITCHING
		error = decodeVoIP( arg, hBsReader, &hHrtfBinary, headRotReader, externalOrientationFileReader, refRotReader, referenceVectorReader, objectEditFileReader, &hIvasDec, pcmBuf );
		#else
		error = decodeVoIP( arg, hBsReader, &hHrtfBinary, headRotReader, externalOrientationFileReader, refRotReader, referenceVectorReader, objectEditFileReader, hIvasDec, pcmBuf );
		#ifdef FIX_SPLIT_RENDERING_ON_DECODER_RESTART
		&renderConfig,
		#endif
		#ifdef DECODER_FORMAT_SWITCHING
		&hIvasDec,
		#else
		hIvasDec,
		#endif
		pcmBuf );
		}
		else
		{
		@@ -3008,6 +3021,9 @@ static ivas_error decodeVoIP(
		#ifdef FIX_1119_SPLIT_RENDERING_VOIP
		ISAR_SPLIT_REND_BITS_DATA *splitRendBits,
		#endif
		#ifdef FIX_SPLIT_RENDERING_ON_DECODER_RESTART
		IVAS_RENDER_CONFIG_DATA *renderConfig,
		#endif
		#ifdef DECODER_FORMAT_SWITCHING
		IVAS_DEC_HANDLE *phIvasDec,
		#else
		@@ -3249,7 +3265,11 @@ static ivas_error decodeVoIP(
		&hIvasDec,
		newCodecInPacket,
		&arg,
		#ifdef FIX_SPLIT_RENDERING_ON_DECODER_RESTART
		renderConfig,
		#else
		NULL, /* ToDo : Provide rendererConfig */
		#endif
		NULL /* ToDo : Provide LS Custom Data */
		);
		if ( error != IVAS_ERR_OK )
		@@ -4374,6 +4394,7 @@ ivas_error restartDecoder(
		goto cleanup;
		}

		#ifndef FIX_SPLIT_RENDERING_ON_DECODER_RESTART
		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 )
		@@ -4390,6 +4411,7 @@ ivas_error restartDecoder(

		arg->enableHeadRotation = true;
		}
		#endif

		if ( arg->voipMode )
		{
		@@ -4406,6 +4428,15 @@ ivas_error restartDecoder(
		goto cleanup;
		}

		#ifdef FIX_SPLIT_RENDERING_ON_DECODER_RESTART
		/* ISAR frame size is set from command line, not renderer config file.
		* 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;
		}
		#endif

		if ( arg->renderConfigEnabled && renderConfig != NULL )
		{
		if ( ( error = IVAS_DEC_FeedRenderConfig( hIvasDec, *renderConfig ) ) != IVAS_ERR_OK )

apps/renderer.c

+0 −31

Original line number	Diff line number	Diff line
		@@ -76,9 +76,7 @@
		#define IVAS_MAX16B_FX 32767
		#define IVAS_MIN16B_FX ( -32768 )

		#ifdef NONBE_1359_FIX_IVASREND_OMASA_BINAURAL_LOUDNESS
		#define OMASA_TDREND_MATCHING_GAIN_DB ( -2.0f )
		#endif

		#if !defined( DEBUGGING ) && !defined( WMOPS )
		static
		@@ -665,7 +663,6 @@ static void setupWithSingleFormatInput(
		positionProvider->numObjects = args.inConfig.numAudioObjects;
		for ( int16_t i = 0; i < positionProvider->numObjects; ++i )
		{
		#ifdef FIX_1376_MISSING_ISM_METADATA
		/* Check if path to metadata file was given */
		if ( isEmptyString( args.inMetadataFilePaths[i] ) )
		{
		@@ -674,18 +671,11 @@ static void setupWithSingleFormatInput(
		}

		/* It is allowed on CLI to have no metadata for an ISM input - skip opening if string contains "NULL" */
		#else
		/* It is allowed on CLI to have no metadata for an ISM input - skip opening if string is empty or contains "NULL" */
		#endif
		char charBuf[FILENAME_MAX];
		strncpy( charBuf, args.inMetadataFilePaths[i], min( FILENAME_MAX, RENDERER_MAX_CLI_ARG_LENGTH ) - 1 );
		charBuf[min( FILENAME_MAX, RENDERER_MAX_CLI_ARG_LENGTH ) - 1] = '\0';
		to_upper( charBuf );
		#ifdef FIX_1376_MISSING_ISM_METADATA
		if ( strncmp( charBuf, "NULL", 4 ) == 0 )
		#else
		if ( isEmptyString( args.inMetadataFilePaths[i] ) \|\| strncmp( charBuf, "NULL", 4 ) == 0 )
		#endif
		{
		continue;
		}
		@@ -1304,30 +1294,22 @@ int main(
		}
		}

		#ifndef NONBE_1359_FIX_IVASREND_OMASA_BINAURAL_LOUDNESS
		/* Set the total number of objects */
		#endif
		if ( args.inConfig.numAudioObjects > 0 )
		{
		#ifdef NONBE_1359_FIX_IVASREND_OMASA_BINAURAL_LOUDNESS
		/* Set the total number of objects */
		#endif
		if ( ( error = IVAS_REND_SetTotalNumberOfObjects( hIvasRend, args.inConfig.numAudioObjects ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError in IVAS_REND_SetTotalNumberOfObjects(): %s\n", ivas_error_to_string( error ) );
		goto cleanup;
		}

		#ifdef NONBE_1359_FIX_IVASREND_OMASA_BINAURAL_LOUDNESS
		/* Set the metadata delay for objects */
		#endif
		IF( ( error = IVAS_REND_SetIsmMetadataDelay( hIvasRend, args.syncMdDelay ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError in IVAS_REND_SetIsmMetadataDelay(): %s\n", ivas_error_to_string( error ) );
		goto cleanup;
		}

		#ifdef NONBE_1359_FIX_IVASREND_OMASA_BINAURAL_LOUDNESS

		/* For OMASA input and BINAURAL output, apply a gain to objects to match the loudness with MASA part */
		if ( args.inConfig.numMasaBuses > 0 && args.outConfig.audioConfig == IVAS_AUDIO_CONFIG_BINAURAL )
		@@ -1337,7 +1319,6 @@ int main(
		args.inConfig.audioObjects[i].gain_dB += OMASA_TDREND_MATCHING_GAIN_DB;
		}
		}
		#endif
		}

		IVAS_REND_LfePanMtx lfePanMatrix;
		@@ -1373,7 +1354,6 @@ int main(
		{
		masaIds[i] = 0u;
		}
		#ifdef NONBE_1377_REND_DIRATT_CONF
		#ifdef FIX_1377_HANDLE_ERROR_CODE
		if ( ( error = IVAS_REND_SetObjectIDs( hIvasRend ) ) != IVAS_ERR_OK )
		{
		@@ -1382,7 +1362,6 @@ int main(
		}
		#else
		IVAS_REND_SetObjectIDs( hIvasRend );
		#endif
		#endif

		for ( i = 0; i < args.inConfig.numMultiChannelBuses; ++i )
		@@ -3893,20 +3872,10 @@ static void parseCombinedFormatInput(
		inConfig->numAmbisonicsBuses = 1;
		inConfig->ambisonicsBuses[0].audioConfig = audioConfig;
		inConfig->ambisonicsBuses[0].inputChannelIndex = inConfig->numAudioObjects;
		#ifdef NONBE_1352_HARMONIZE_OSBA_LOUDNESS
		inConfig->ambisonicsBuses[0].gain_dB = 0.f;
		#else
		inConfig->ambisonicsBuses[0].gain_dB = -6.f;
		#endif
		*configString += 4;

		/* Modify input gain for objects too */
		#ifndef NONBE_1352_HARMONIZE_OSBA_LOUDNESS
		for ( int16_t i = 0; i < inConfig->numAudioObjects; ++i )
		{
		inConfig->audioObjects[i].gain_dB = -6.f;
		}
		#endif
		}
		else if ( audioConfig == IVAS_AUDIO_CONFIG_MASA1 \|\| audioConfig == IVAS_AUDIO_CONFIG_MASA2 )
		{

lib_com/cnst.h

+31 −33

Original line number	Diff line number	Diff line
		@@ -668,9 +668,7 @@ enum
		#define ACELP_TCX_TRANS_NS 1250000 /* Duration of the ACELP->TCX overlap - 1.25 ms */
		#define L_FRAME_MAX L_FRAME48k /* Max 20ms frame size @48kHz */
		#define L_FRAME_PLUS 1200 /* Max frame size (long TCX frame) */
		#ifdef FIX_1320_STACK_CPE_DECODER
		#define L_FRAME_PLUS_INTERNAL 800 /* Max frame size (long TCX frame) at maximum internal sampling rate */
		#endif
		#define L_MDCT_OVLP_MAX NS2SA( 48000, ACELP_LOOK_NS ) /* = Max mdct overlap */
		#define N_TCX10_MAX 480 /* Max size of TCX10 MDCT spectrum */
		#define BITS_TEC 1 /* number of bits for TEC */

lib_com/ivas_cnst.h

+0 −5

Original line number	Diff line number	Diff line
		@@ -192,13 +192,8 @@ typedef enum
		#define JBM_CLDFB_SLOTS_IN_SUBFRAME_LOG2 2 /* To be used for shift operation instead of division */
		#define MAX_JBM_CLDFB_TIMESLOTS 32
		#define DEFAULT_JBM_CLDFB_TIMESLOTS 16
		#ifdef JBM_MEMORY_OPT
		#define MAX_JBM_L_FRAME48k ( IVAS_MAX_FRAME_SIZE * 2 ) /* 1920: max. time-scaled frame buffer length (per channel) in samples */
		#define MAX_JBM_L_FRAME_NS 40000000L /* 40 ms: time-scaled frame size in ns, proportional to MAX_JBM_L_FRAME48k */
		#else
		#define MAX_JBM_L_FRAME48k 1920
		#define MAX_JBM_L_FRAME_NS 40000000L
		#endif
		#define MAX_SPAR_INTERNAL_CHANNELS IVAS_SPAR_MAX_CH
		#define MAX_CLDFB_DIGEST_CHANNELS 3 /* == maximum of ParamISM TCs and ParamMC TCs */

lib_com/ivas_error.h

+0 −4

Original line number	Diff line number	Diff line
		@@ -128,9 +128,7 @@ typedef enum
		IVAS_ERR_BITSTREAM_READER_INVALID_FORMAT,
		IVAS_ERR_NO_FILE_OPEN,
		IVAS_ERR_SAMPLING_RATE_UNKNOWN,
		#ifdef FIX_1370_EXTERNAL_ORIENTATION_CHECK
		IVAS_ERR_EXTERNAL_ORIENTATION_INVALID_FORMAT,
		#endif

		/----------------------------------------
		* renderer (lib_rend only) *
		@@ -278,10 +276,8 @@ static inline const char *ivas_error_to_string( ivas_error error_code )
		return "Invalid input format";
		case IVAS_ERR_INVALID_INDEX:
		return "Invalid index";
		#ifdef FIX_1370_EXTERNAL_ORIENTATION_CHECK
		case IVAS_ERR_EXTERNAL_ORIENTATION_INVALID_FORMAT:
		return "Euler angles were detected in the input but only Quaternions are supported";
		#endif
		default:
		break;
		}