Merge remote-tracking branch 'remotes/origin/main' into... (5bf043dd) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitlab-ci.yml

+25 −4

Original line number	Original line	Diff line number	Diff line
	@@ -872,7 +872,7 @@ lc3-wrapper-unit-test:
	script:		script:
	- cmake -B cmake-build -G "Unix Makefiles" -DCOPY_EXECUTABLES_FROM_BUILD_DIR=true		- cmake -B cmake-build -G "Unix Makefiles" -DCOPY_EXECUTABLES_FROM_BUILD_DIR=true
	- cmake --build cmake-build -- -j		- cmake --build cmake-build -- -j
	- scripts/split_rendering/lc3plus/ivas_lc3plus_unit_test		- scripts/split_rendering/lc3plus_float/ivas_lc3plus_unit_test

	# compare split-rendering bitexactness between target and source branch		# compare split-rendering bitexactness between target and source branch
	split-rendering-pytest-on-merge-request:		split-rendering-pytest-on-merge-request:
	@@ -1460,6 +1460,7 @@ ivas-conformance:
	- mkdir testvec/bin		- mkdir testvec/bin
	- cp -force -ErrorAction Ignore scripts/testv/* testvec/testv		- cp -force -ErrorAction Ignore scripts/testv/* testvec/testv
	- cp -r -force -ErrorAction Ignore scripts/ls_layouts testvec		- cp -r -force -ErrorAction Ignore scripts/ls_layouts testvec
			- cp -r -force -ErrorAction Ignore scripts/object_edit testvec
	- cp -r -force -ErrorAction Ignore scripts/switchPaths testvec		- cp -r -force -ErrorAction Ignore scripts/switchPaths testvec
	- cp -r -force -ErrorAction Ignore scripts/trajectories testvec		- cp -r -force -ErrorAction Ignore scripts/trajectories testvec
	- cp -r -force -ErrorAction Ignore scripts/binauralRenderer_interface/binaural_renderers_hrtf_data testvec/binauralRenderer_interface		- cp -r -force -ErrorAction Ignore scripts/binauralRenderer_interface/binaural_renderers_hrtf_data testvec/binauralRenderer_interface
	@@ -1546,6 +1547,7 @@ ivas-conformance-linux:
	- mkdir testvec/bin		- mkdir testvec/bin
	- cp -r scripts/testv/* testvec/testv		- cp -r scripts/testv/* testvec/testv
	- cp -r scripts/ls_layouts testvec		- cp -r scripts/ls_layouts testvec
			- cp -r scripts/object_edit testvec
	- cp -r scripts/switchPaths testvec		- cp -r scripts/switchPaths testvec
	- cp -r scripts/trajectories testvec		- cp -r scripts/trajectories testvec
	- cp -r scripts/binauralRenderer_interface/binaural_renderers_hrtf_data testvec/binauralRenderer_interface		- cp -r scripts/binauralRenderer_interface/binaural_renderers_hrtf_data testvec/binauralRenderer_interface
	@@ -1816,7 +1818,7 @@ ltv-usan:
	- ivas-linux-fast		- ivas-linux-fast
	artifacts:		artifacts:
	name: "$CI_JOB_NAME--main--sha-$CI_COMMIT_SHORT_SHA"		name: "$CI_JOB_NAME--main--sha-$CI_COMMIT_SHORT_SHA"
	expire_in: 2 weeks		expire_in: 4 weeks
	when: always		when: always
	paths:		paths:
	- ep_015.g192		- ep_015.g192
	@@ -2405,8 +2407,27 @@ coverage-test-on-main-scheduled:
	- unzip artifacts.zip \|\| true # this may fail on first run, when there are no artifacts there and the zip file is actually just "404"-html		- unzip artifacts.zip \|\| true # this may fail on first run, when there are no artifacts there and the zip file is actually just "404"-html
	- ls		- ls
	- public_dir="$CI_JOB_NAME-public"		- public_dir="$CI_JOB_NAME-public"

	# if is needed to catch case when no artifact is there (first run), similarly as above		# if is needed to catch case when no artifact is there (first run), similarly as above
	- if [[ -d $public_dir ]]; then mv $public_dir/* wmops/; fi		# 1. check for public_dir being there as this might not be the case when artifact download failed
			# 2. check for public dir not being empty - handle job failures in prev job that happen after the dir is created. In that case, the empty dir is in the artifacts
			- if [ -d $public_dir ] && [ ! -z "$( ls -A $public_dir )" ]; then
			- mv $public_dir/* wmops/
			# check here if we have the split-by-levels files present - if not, fake them up with the existing global one
			# this is needed for the first run with split graphs on a branch where the global version did run previously
			# NOTE: checking only for level_1 file here as this should already be sufficient
			# NOTE2: also not chechking for RAM for same reason
			- wmops_all_global="wmops/log_wmops_all.txt"
			- ram_all_global="wmops/log_ram_all.txt"
			- if [ -f "${wmops_all_global}" ] && [ ! -f "wmops/log_wmops_all_level_1.txt" ]; then
			- declare -a suffixes=("level_1" "level_2" "level_3" "rate_sw")
			- for suffix in "${suffixes[@]}"; do
			- cp ${wmops_all_global} wmops/log_wmops_all_${suffix}.txt
			- cp ${ram_all_global} wmops/log_ram_all_${suffix}.txt
			- done
			- fi
			- fi

	- ls wmops		- ls wmops
	- rm artifacts.zip		- rm artifacts.zip
	- rm -rf $public_dir		- rm -rf $public_dir
	@@ -2415,7 +2436,7 @@ coverage-test-on-main-scheduled:
	&complexity-measurements-prepare-artifacts # prepare artifacts -> move to public directory		&complexity-measurements-prepare-artifacts # prepare artifacts -> move to public directory
	- public_dir="$CI_JOB_NAME-public"		- public_dir="$CI_JOB_NAME-public"
	- mkdir $public_dir		- mkdir $public_dir
	- mv -f wmops/log__all.txt ./.js ${public_dir}/		- mv -f wmops/log__all.txt ./*.js ${public_dir}/
	# move logfiles for links		# move logfiles for links
	- mkdir $public_dir/logs		- mkdir $public_dir/logs
	# first move logs		# first move logs

CMakeLists.txt

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -174,7 +174,7 @@ target_include_directories(lib_util PUBLIC lib_util PRIVATE lib_com lib_enc lib_
	target_include_directories(lib_util PRIVATE lib_lc3plus lib_isar)		target_include_directories(lib_util PRIVATE lib_lc3plus lib_isar)

	if(NOT WMOPS)		if(NOT WMOPS)
	add_executable(ivas_lc3plus_unit_test scripts/split_rendering/lc3plus/ivas_lc3plus_unit_test.c)		add_executable(ivas_lc3plus_unit_test scripts/split_rendering/lc3plus_float/ivas_lc3plus_unit_test.c)
	target_link_libraries(ivas_lc3plus_unit_test lib_rend lib_dec lib_util lib_com lib_debug lib_isar)		target_link_libraries(ivas_lc3plus_unit_test lib_rend lib_dec lib_util lib_com lib_debug lib_isar)
	endif()		endif()

	@@ -213,7 +213,7 @@ if(COPY_EXECUTABLES_FROM_BUILD_DIR)
	add_custom_command(TARGET IVAS_rend POST_BUILD VERBATIM COMMAND "${CMAKE_COMMAND}" -E copy "$<TARGET_FILE:IVAS_rend>" "${CMAKE_CURRENT_SOURCE_DIR}/")		add_custom_command(TARGET IVAS_rend POST_BUILD VERBATIM COMMAND "${CMAKE_COMMAND}" -E copy "$<TARGET_FILE:IVAS_rend>" "${CMAKE_CURRENT_SOURCE_DIR}/")
	add_custom_command(TARGET ISAR_post_rend POST_BUILD VERBATIM COMMAND "${CMAKE_COMMAND}" -E copy "$<TARGET_FILE:ISAR_post_rend>" "${CMAKE_CURRENT_SOURCE_DIR}/")		add_custom_command(TARGET ISAR_post_rend POST_BUILD VERBATIM COMMAND "${CMAKE_COMMAND}" -E copy "$<TARGET_FILE:ISAR_post_rend>" "${CMAKE_CURRENT_SOURCE_DIR}/")
	if (NOT WMOPS)		if (NOT WMOPS)
	add_custom_command(TARGET ivas_lc3plus_unit_test POST_BUILD VERBATIM COMMAND "${CMAKE_COMMAND}" -E copy "$<TARGET_FILE:ivas_lc3plus_unit_test>" "${CMAKE_CURRENT_SOURCE_DIR}/scripts/split_rendering/lc3plus")		add_custom_command(TARGET ivas_lc3plus_unit_test POST_BUILD VERBATIM COMMAND "${CMAKE_COMMAND}" -E copy "$<TARGET_FILE:ivas_lc3plus_unit_test>" "${CMAKE_CURRENT_SOURCE_DIR}/scripts/split_rendering/lc3plus_float")
	endif()		endif()
	endif()		endif()

LICENSE.md

+1 −1

Original line number	Original line	Diff line number	Diff line
	/******************************************************************************************************		/******************************************************************************************************

	(C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,		(C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
	Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,		Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
	Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,		Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
	Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other		Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other

apps/decoder.c

+26 −73

Original line number	Original line	Diff line number	Diff line
	/******************************************************************************************************		/******************************************************************************************************

	(C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,		(C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
	Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,		Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
	Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,		Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
	Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other		Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other
	@@ -32,9 +32,7 @@

	#include "lib_dec.h"		#include "lib_dec.h"
	#include <string.h>		#include <string.h>
	#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE
	#include <math.h>		#include <math.h>
	#endif
	#include "cmdl_tools.h"		#include "cmdl_tools.h"
	#include "audio_file_writer.h"		#include "audio_file_writer.h"
	#include "bitstream_reader.h"		#include "bitstream_reader.h"
	@@ -48,9 +46,7 @@
	#include "rotation_file_reader.h"		#include "rotation_file_reader.h"
	#include "aeid_file_reader.h"		#include "aeid_file_reader.h"
	#include "split_render_file_read_write.h"		#include "split_render_file_read_write.h"
	#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE
	#include "obj_edit_file_reader.h"		#include "obj_edit_file_reader.h"
	#endif
	#ifdef VARIABLE_SPEED_DECODING		#ifdef VARIABLE_SPEED_DECODING
	#include "tsm_scale_file_reader.h"		#include "tsm_scale_file_reader.h"
	#include <math.h>		#include <math.h>
	@@ -157,9 +153,7 @@ typedef struct
	bool dpidEnabled;		bool dpidEnabled;
	uint16_t directivityPatternId[IVAS_MAX_NUM_OBJECTS];		uint16_t directivityPatternId[IVAS_MAX_NUM_OBJECTS];
	bool objEditEnabled;		bool objEditEnabled;
	#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE
	char *objEditFileName;		char *objEditFileName;
	#endif

	} DecArguments;		} DecArguments;

	@@ -188,24 +182,15 @@ typedef struct

	static bool parseCmdlIVAS_dec( int16_t argc, char *argv, DecArguments arg );		static bool parseCmdlIVAS_dec( int16_t argc, char *argv, DecArguments arg );
	static void usage_dec( void );		static void usage_dec( void );
	#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE
	static ivas_error decodeG192( 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 );		static ivas_error decodeG192( 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 );
	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, IVAS_DEC_HANDLE hIvasDec );		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, IVAS_DEC_HANDLE hIvasDec );
	#else
	static ivas_error decodeG192( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HRTF_BINARY_WRAPPER hHrtf, RotFileReader headRotReader, RotFileReader externalOrientationFileReader, RotFileReader refRotReader, Vector3PairFileReader referenceVectorReader, 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, IVAS_DEC_HANDLE hIvasDec );
	#endif
	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 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 );
	#ifdef DEBUGGING		#ifdef DEBUGGING
	static ivas_error printBitstreamInfoVoip( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HANDLE hIvasDec );		static ivas_error printBitstreamInfoVoip( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HANDLE hIvasDec );
	static int16_t app_own_random( int16_t *seed );		static int16_t app_own_random( int16_t *seed );
	static IVAS_DEC_FORCED_REND_MODE parseForcedRendModeDec( char *forcedRendModeChar );		static IVAS_DEC_FORCED_REND_MODE parseForcedRendModeDec( char *forcedRendModeChar );
	#endif		#endif
	#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE
	static void do_object_editing( IVAS_EDITABLE_PARAMETERS editableParameters, ObjectEditFileReader objectEditFileReader );		static void do_object_editing( IVAS_EDITABLE_PARAMETERS editableParameters, ObjectEditFileReader objectEditFileReader );
	#else
	static void do_object_editing( IVAS_EDITABLE_PARAMETERS *editableParameters );
	#endif

	/------------------------------------------------------------------------------------------		/------------------------------------------------------------------------------------------
	* main()		* main()
	@@ -236,9 +221,7 @@ int main(
	int16_t *pcmBuf = NULL;		int16_t *pcmBuf = NULL;
	IVAS_RENDER_NUM_SUBFR asked_num_subframes;		IVAS_RENDER_NUM_SUBFR asked_num_subframes;
	IVAS_DEC_HRTF_BINARY_WRAPPER hHrtfBinary;		IVAS_DEC_HRTF_BINARY_WRAPPER hHrtfBinary;
	#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE
	ObjectEditFileReader *objectEditFileReader = NULL;		ObjectEditFileReader *objectEditFileReader = NULL;
	#endif
	#ifdef DEBUGGING		#ifdef DEBUGGING
	int32_t noClipping;		int32_t noClipping;
	int32_t cnt_frames_limited;		int32_t cnt_frames_limited;
	@@ -442,7 +425,6 @@ int main(
	}		}
	}		}

	#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE
	/------------------------------------------------------------------------------------------		/------------------------------------------------------------------------------------------
	* Open object editing instruction file		* Open object editing instruction file
	------------------------------------------------------------------------------------------/		------------------------------------------------------------------------------------------/
	@@ -455,7 +437,6 @@ int main(
	goto cleanup;		goto cleanup;
	}		}
	}		}
	#endif

	/------------------------------------------------------------------------------------------		/------------------------------------------------------------------------------------------
	* Configure the decoder		* Configure the decoder
	@@ -777,19 +758,11 @@ int main(

	if ( arg.voipMode )		if ( arg.voipMode )
	{		{
	#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE
	error = decodeVoIP( arg, hBsReader, &hHrtfBinary, headRotReader, externalOrientationFileReader, refRotReader, referenceVectorReader, objectEditFileReader, hIvasDec );		error = decodeVoIP( arg, hBsReader, &hHrtfBinary, headRotReader, externalOrientationFileReader, refRotReader, referenceVectorReader, objectEditFileReader, hIvasDec );
	#else
	error = decodeVoIP( arg, hBsReader, &hHrtfBinary, headRotReader, externalOrientationFileReader, refRotReader, referenceVectorReader, hIvasDec );
	#endif
	}		}
	else		else
	{		{
	#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE
	error = decodeG192( arg, hBsReader, &hHrtfBinary, headRotReader, externalOrientationFileReader, refRotReader, referenceVectorReader, objectEditFileReader, &splitRendBits, hIvasDec, pcmBuf );		error = decodeG192( arg, hBsReader, &hHrtfBinary, headRotReader, externalOrientationFileReader, refRotReader, referenceVectorReader, objectEditFileReader, &splitRendBits, hIvasDec, pcmBuf );
	#else
	error = decodeG192( arg, hBsReader, &hHrtfBinary, headRotReader, externalOrientationFileReader, refRotReader, referenceVectorReader, &splitRendBits, hIvasDec, pcmBuf );
	#endif
	}		}

	if ( error == IVAS_ERR_OK \|\| error == IVAS_ERR_END_OF_FILE )		if ( error == IVAS_ERR_OK \|\| error == IVAS_ERR_END_OF_FILE )
	@@ -853,9 +826,7 @@ cleanup:
	RotationFileReader_close( &refRotReader );		RotationFileReader_close( &refRotReader );
	Vector3PairFileReader_close( &referenceVectorReader );		Vector3PairFileReader_close( &referenceVectorReader );
	RenderConfigReader_close( &renderConfigReader );		RenderConfigReader_close( &renderConfigReader );
	#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE
	ObjectEditFileReader_close( &objectEditFileReader );		ObjectEditFileReader_close( &objectEditFileReader );
	#endif

	if ( BS_Reader_Close( &hBsReader ) != IVAS_ERR_OK )		if ( BS_Reader_Close( &hBsReader ) != IVAS_ERR_OK )
	{		{
	@@ -1054,9 +1025,7 @@ static bool parseCmdlIVAS_dec(
	}		}

	arg->objEditEnabled = false;		arg->objEditEnabled = false;
	#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE
	arg->objEditFileName = NULL;		arg->objEditFileName = NULL;
	#endif

	/-----------------------------------------------------------------		/-----------------------------------------------------------------
	* Initialization		* Initialization
	@@ -1514,7 +1483,6 @@ static bool parseCmdlIVAS_dec(
	{		{
	arg->objEditEnabled = true;		arg->objEditEnabled = true;
	i++;		i++;
	#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE
	if ( argc - i <= 3 \|\| argv[i][0] == '-' )		if ( argc - i <= 3 \|\| argv[i][0] == '-' )
	{		{
	fprintf( stderr, "Error: Object editing instruction filename not specified!\n\n" );		fprintf( stderr, "Error: Object editing instruction filename not specified!\n\n" );
	@@ -1531,7 +1499,6 @@ static bool parseCmdlIVAS_dec(
	arg->objEditFileName = argv[i]; /* read edit instructions from this file */		arg->objEditFileName = argv[i]; /* read edit instructions from this file */
	}		}
	i++;		i++;
	#endif
	}		}

	/-----------------------------------------------------------------		/-----------------------------------------------------------------
	@@ -1734,11 +1701,7 @@ static void usage_dec( void )
	fprintf( stdout, "-aeid ID \| File : Acoustic environment ID (number > 0)\n" );		fprintf( stdout, "-aeid ID \| File : Acoustic environment ID (number > 0)\n" );
	fprintf( stdout, " alternatively, it can be a text file where each line contains \"ID duration\"\n" );		fprintf( stdout, " alternatively, it can be a text file where each line contains \"ID duration\"\n" );
	fprintf( stdout, " for BINAURAL_ROOM_REVERB output configuration.\n" );		fprintf( stdout, " for BINAURAL_ROOM_REVERB output configuration.\n" );
	#ifndef FIX_1217_OBJECT_EDIT_FILE_INTERFACE
	fprintf( stdout, "-obj_edit : Enable objects editing\n" );
	#else
	fprintf( stdout, "-obj_edit File : Object editing instructions file or NULL for built-in example\n" );		fprintf( stdout, "-obj_edit File : Object editing instructions file or NULL for built-in example\n" );
	#endif
	fprintf( stdout, "-level level : Complexity level, level = (1, 2, 3), will be defined after characterisation. \n" );		fprintf( stdout, "-level level : Complexity level, level = (1, 2, 3), will be defined after characterisation. \n" );
	fprintf( stdout, " Currently, all values default to level 3 (full functionality).\n" );		fprintf( stdout, " Currently, all values default to level 3 (full functionality).\n" );
	fprintf( stdout, "-q : Quiet mode, no frame counter\n" );		fprintf( stdout, "-q : Quiet mode, no frame counter\n" );
	@@ -2001,7 +1964,18 @@ static ivas_error initOnFirstGoodFrame(
	if ( numInitialBadFrames > 0 )		if ( numInitialBadFrames > 0 )
	{		{
	/* Duplicate good first frame metadata to fill the beginning of stream. */		/* Duplicate good first frame metadata to fill the beginning of stream. */
	IVAS_MASA_DECODER_EXT_OUT_META_HANDLE hMasaExtOutMeta = NULL;		int16_t fullDelayNumSamplesLocal[3];
			int32_t delayTimeScaleLocal;
			float delayMs;
			IVAS_MASA_DECODER_EXT_OUT_META_HANDLE hMasaExtOutMeta;
			hMasaExtOutMeta = NULL;

			/* fullDelayNumSamples is zeroed so need to re-fetch delay info */
			if ( ( error = IVAS_DEC_GetDelay( hIvasDec, fullDelayNumSamplesLocal, &delayTimeScaleLocal ) ) != IVAS_ERR_OK )
			{
			fprintf( stderr, "\nUnable to get delay of decoder: %s\n", ivas_error_to_string( error ) );
			}
			delayMs = (float) ( fullDelayNumSamplesLocal[0] ) / (float) ( delayTimeScaleLocal );

	if ( ( error = IVAS_DEC_GetMasaMetadata( hIvasDec, &hMasaExtOutMeta, 0 ) ) != IVAS_ERR_OK )		if ( ( error = IVAS_DEC_GetMasaMetadata( hIvasDec, &hMasaExtOutMeta, 0 ) ) != IVAS_ERR_OK )
	{		{
	@@ -2011,7 +1985,6 @@ static ivas_error initOnFirstGoodFrame(

	for ( int16_t j = 0; j < numInitialBadFrames; ++j )		for ( int16_t j = 0; j < numInitialBadFrames; ++j )
	{		{
	float delayMs = (float) ( pFullDelayNumSamples[0] ) / (float) ( *delayTimeScale );
	if ( ( error = MasaFileWriter_writeFrame( *ppMasaWriter, hMasaExtOutMeta, &delayMs ) ) != IVAS_ERR_OK )		if ( ( error = MasaFileWriter_writeFrame( *ppMasaWriter, hMasaExtOutMeta, &delayMs ) ) != IVAS_ERR_OK )
	{		{
	fprintf( stderr, "\nError writing MASA metadata to file: %s\n", MasaFileWriter_getFilePath( *ppMasaWriter ) );		fprintf( stderr, "\nError writing MASA metadata to file: %s\n", MasaFileWriter_getFilePath( *ppMasaWriter ) );
	@@ -2060,9 +2033,7 @@ static ivas_error decodeG192(
	RotFileReader *externalOrientationFileReader,		RotFileReader *externalOrientationFileReader,
	RotFileReader *refRotReader,		RotFileReader *refRotReader,
	Vector3PairFileReader *referenceVectorReader,		Vector3PairFileReader *referenceVectorReader,
	#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE
	ObjectEditFileReader *objectEditFileReader,		ObjectEditFileReader *objectEditFileReader,
	#endif
	ISAR_SPLIT_REND_BITS_DATA *splitRendBits,		ISAR_SPLIT_REND_BITS_DATA *splitRendBits,
	IVAS_DEC_HANDLE hIvasDec,		IVAS_DEC_HANDLE hIvasDec,
	int16_t *pcmBuf )		int16_t *pcmBuf )
	@@ -2491,7 +2462,6 @@ static ivas_error decodeG192(
	return error;		return error;
	}		}

	#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE
	if ( arg.objEditFileName != NULL )		if ( arg.objEditFileName != NULL )
	{		{
	if ( ( error = ObjectEditFileReader_readNextFrame( objectEditFileReader ) ) != IVAS_ERR_OK )		if ( ( error = ObjectEditFileReader_readNextFrame( objectEditFileReader ) ) != IVAS_ERR_OK )
	@@ -2500,14 +2470,9 @@ static ivas_error decodeG192(
	return error;		return error;
	}		}
	}		}
	#endif

	/* Do object metadata editing here ... */		/* Do object metadata editing here ... */
	#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE
	do_object_editing( &editableParameters, objectEditFileReader );		do_object_editing( &editableParameters, objectEditFileReader );
	#else
	do_object_editing( &editableParameters );
	#endif

	/* set new object parameters */		/* set new object parameters */
	if ( ( error = IVAS_DEC_SetEditableParameters( hIvasDec, editableParameters ) ) != IVAS_ERR_OK )		if ( ( error = IVAS_DEC_SetEditableParameters( hIvasDec, editableParameters ) ) != IVAS_ERR_OK )
	@@ -3030,9 +2995,7 @@ static ivas_error decodeVoIP(
	RotFileReader *externalOrientationFileReader,		RotFileReader *externalOrientationFileReader,
	RotFileReader *refRotReader,		RotFileReader *refRotReader,
	Vector3PairFileReader *referenceVectorReader,		Vector3PairFileReader *referenceVectorReader,
	#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE
	ObjectEditFileReader *objectEditFileReader,		ObjectEditFileReader *objectEditFileReader,
	#endif
	IVAS_DEC_HANDLE hIvasDec )		IVAS_DEC_HANDLE hIvasDec )
	{		{
	bool decodingFailed = true; /* Assume failure until cleanup is reached without errors */		bool decodingFailed = true; /* Assume failure until cleanup is reached without errors */
	@@ -3081,7 +3044,7 @@ static ivas_error decodeVoIP(

	bool bitstreamReadDone = false;		bool bitstreamReadDone = false;

	bool parameterAvailableForEditing = false;		bool parametersAvailableForEditing = false;
	uint16_t nSamplesRendered = 0;		uint16_t nSamplesRendered = 0;

	vec_pos_update = 0;		vec_pos_update = 0;
	@@ -3344,8 +3307,7 @@ static ivas_error decodeVoIP(
	}		}
	}		}

	#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE		if ( arg.objEditEnabled && arg.objEditFileName != NULL && vec_pos_update == 0 )
	if ( arg.objEditEnabled && ( arg.objEditFileName != NULL ) )
	{		{
	if ( ( error = ObjectEditFileReader_readNextFrame( objectEditFileReader ) ) != IVAS_ERR_OK )		if ( ( error = ObjectEditFileReader_readNextFrame( objectEditFileReader ) ) != IVAS_ERR_OK )
	{		{
	@@ -3353,7 +3315,6 @@ static ivas_error decodeVoIP(
	return error;		return error;
	}		}
	}		}
	#endif

	/* read all packets with a receive time smaller than the system time */		/* read all packets with a receive time smaller than the system time */
	while ( nextPacketRcvTime_ms <= systemTime_ms )		while ( nextPacketRcvTime_ms <= systemTime_ms )
	@@ -3409,7 +3370,7 @@ static ivas_error decodeVoIP(
	while ( nSamplesRendered < nOutSamples )		while ( nSamplesRendered < nOutSamples )
	{		{
	#ifdef SUPPORT_JBM_TRACEFILE		#ifdef SUPPORT_JBM_TRACEFILE
	if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, IVAS_DEC_PCM_INT16, (void *) pcmBuf, writeJbmTraceFileFrameWrapper, jbmTraceWriter, &bitstreamReadDone, &nSamplesRendered, &parameterAvailableForEditing, systemTime_ms ) ) != IVAS_ERR_OK )		if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, IVAS_DEC_PCM_INT16, (void *) pcmBuf, writeJbmTraceFileFrameWrapper, jbmTraceWriter, &bitstreamReadDone, &nSamplesRendered, &parametersAvailableForEditing, systemTime_ms ) ) != IVAS_ERR_OK )
	#else		#else
	if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, IVAS_DEC_PCM_INT16, (void *) pcmBuf, &bitstreamReadDone, &nSamplesRendered, &parameterAvailableForEditing, systemTime_ms ) ) != IVAS_ERR_OK )		if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, IVAS_DEC_PCM_INT16, (void *) pcmBuf, &bitstreamReadDone, &nSamplesRendered, &parameterAvailableForEditing, systemTime_ms ) ) != IVAS_ERR_OK )
	#endif		#endif
	@@ -3443,7 +3404,7 @@ static ivas_error decodeVoIP(
	}		}

	/* Object metadata editing */		/* Object metadata editing */
	if ( arg.objEditEnabled && parameterAvailableForEditing == true )		if ( arg.objEditEnabled && parametersAvailableForEditing == true )
	{		{
	IVAS_EDITABLE_PARAMETERS editableParameters;		IVAS_EDITABLE_PARAMETERS editableParameters;

	@@ -3455,11 +3416,7 @@ static ivas_error decodeVoIP(
	}		}

	/* Do object metadata editing here ... */		/* Do object metadata editing here ... */
	#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE
	do_object_editing( &editableParameters, objectEditFileReader );		do_object_editing( &editableParameters, objectEditFileReader );
	#else
	do_object_editing( &editableParameters );
	#endif

	/* set new object parameters */		/* set new object parameters */
	if ( ( error = IVAS_DEC_SetEditableParameters( hIvasDec, editableParameters ) ) != IVAS_ERR_OK )		if ( ( error = IVAS_DEC_SetEditableParameters( hIvasDec, editableParameters ) ) != IVAS_ERR_OK )
	@@ -3587,17 +3544,21 @@ static ivas_error decodeVoIP(
	}		}
	}		}

	if ( !arg.quietModeEnabled )
	{
	fprintf( stdout, "%-8d\b\b\b\b\b\b\b\b", frame );
	}
	vec_pos_update = ( vec_pos_update + 1 ) % vec_pos_len;		vec_pos_update = ( vec_pos_update + 1 ) % vec_pos_len;
	frame++;
	if ( vec_pos_update == 0 )		if ( vec_pos_update == 0 )
	{		{
	systemTime_ms += vec_pos_len * systemTimeInc_ms;		systemTime_ms += vec_pos_len * systemTimeInc_ms;
	}		}

			if ( vec_pos_update == 0 )
			{
			frame++;
			if ( !arg.quietModeEnabled )
			{
			fprintf( stdout, "%-8d\b\b\b\b\b\b\b\b", frame );
			}
			}

	#ifdef WMOPS		#ifdef WMOPS
	update_mem();		update_mem();
	update_wmops();		update_wmops();
	@@ -3759,12 +3720,8 @@ cleanup:
	---------------------------------------------------------------------/		---------------------------------------------------------------------/

	static void do_object_editing(		static void do_object_editing(
	#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE
	IVAS_EDITABLE_PARAMETERS *editableParameters,		IVAS_EDITABLE_PARAMETERS *editableParameters,
	ObjectEditFileReader *objectEditFileReader )		ObjectEditFileReader *objectEditFileReader )
	#else
	IVAS_EDITABLE_PARAMETERS *editableParameters )
	#endif
	{		{
	/* put the objects equally spaced at the horizontal plane */		/* put the objects equally spaced at the horizontal plane */
	/* and play a little bit with the gains... */		/* and play a little bit with the gains... */
	@@ -3780,7 +3737,6 @@ static void do_object_editing(
	}		}
	}		}

	#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE
	if ( objectEditFileReader != NULL )		if ( objectEditFileReader != NULL )
	{		{
	ReadObjectEditInfo *readInfo;		ReadObjectEditInfo *readInfo;
	@@ -3839,7 +3795,6 @@ static void do_object_editing(
	}		}
	else		else
	{		{
	#endif
	if ( num_nondiegetic_objects )		if ( num_nondiegetic_objects )
	{		{
	float start_angle, angle_inc;		float start_angle, angle_inc;
	@@ -3863,9 +3818,7 @@ static void do_object_editing(
	}		}

	editableParameters->gain_bed = 0.5f;		editableParameters->gain_bed = 0.5f;
	#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE
	}		}
	#endif

	return;		return;
	}		}

apps/encoder.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	/******************************************************************************************************		/******************************************************************************************************

	(C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,		(C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,
	Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,		Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,
	Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,		Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,
	Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other		Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other