Merge branch 'main' into 1019-socket-interface-for-pose-and-audio (2af4f95c) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitlab-ci.yml

+1 −1

Original line number	Diff line number	Diff line
		@@ -1818,7 +1818,7 @@ ltv-usan:
		- ivas-linux-fast
		artifacts:
		name: "$CI_JOB_NAME--main--sha-$CI_COMMIT_SHORT_SHA"
		expire_in: 2 weeks
		expire_in: 4 weeks
		when: always
		paths:
		- ep_015.g192

apps/decoder.c

+0 −96

Original line number	Diff line number	Diff line
		@@ -32,9 +32,7 @@

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

		} DecArguments;

		@@ -199,7 +193,6 @@ static bool parseCmdlIVAS_dec( int16_t argc, char *argv, DecArguments arg );
		static ivas_error parseQuaternionData( char rxBuffer, IVAS_QUATERNION pQuaternion );
		#endif
		static void usage_dec( void );
		#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE
		#ifdef SOCKET_INTERFACE_FOR_POSE_AND_AUDIO
		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, unsigned int hSocket, 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, unsigned int hSocket, IVAS_DEC_HANDLE hIvasDec );
		@@ -207,26 +200,13 @@ static ivas_error decodeVoIP( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS
		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 );
		#endif
		#else
		#ifdef SOCKET_INTERFACE_FOR_POSE_AND_AUDIO
		static ivas_error decodeG192( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HRTF_BINARY_WRAPPER hHrtf, RotFileReader headRotReader, RotFileReader externalOrientationFileReader, RotFileReader refRotReader, Vector3PairFileReader referenceVectorReader, unsigned int hSocket, 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, unsigned int hSocket, 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
		#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 );
		#ifdef DEBUGGING
		static ivas_error printBitstreamInfoVoip( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HANDLE hIvasDec );
		static int16_t app_own_random( int16_t *seed );
		static IVAS_DEC_FORCED_REND_MODE parseForcedRendModeDec( char *forcedRendModeChar );
		#endif
		#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE
		static void do_object_editing( IVAS_EDITABLE_PARAMETERS editableParameters, ObjectEditFileReader objectEditFileReader );
		#else
		static void do_object_editing( IVAS_EDITABLE_PARAMETERS *editableParameters );
		#endif

		/------------------------------------------------------------------------------------------
		* main()
		@@ -257,9 +237,7 @@ int main(
		int16_t *pcmBuf = NULL;
		IVAS_RENDER_FRAMESIZE asked_frame_size;
		IVAS_DEC_HRTF_BINARY_WRAPPER hHrtfBinary;
		#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE
		ObjectEditFileReader *objectEditFileReader = NULL;
		#endif
		#ifdef SOCKET_INTERFACE_FOR_POSE_AND_AUDIO
		uint32_t hSocket = (uint32_t) NULL;
		#endif
		@@ -489,7 +467,6 @@ int main(
		}
		}

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

		/------------------------------------------------------------------------------------------
		* Configure the decoder
		@@ -822,34 +798,18 @@ int main(

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

		@@ -914,9 +874,7 @@ cleanup:
		RotationFileReader_close( &refRotReader );
		Vector3PairFileReader_close( &referenceVectorReader );
		RenderConfigReader_close( &renderConfigReader );
		#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE
		ObjectEditFileReader_close( &objectEditFileReader );
		#endif

		#ifdef SOCKET_INTERFACE_FOR_POSE_AND_AUDIO
		if ( arg.enableHeadrotTrajSocket )
		@@ -1128,9 +1086,7 @@ static bool parseCmdlIVAS_dec(
		}

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

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

		/-----------------------------------------------------------------
		@@ -1889,11 +1843,7 @@ static void usage_dec( void )
		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, " 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" );
		#endif
		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, "-q : Quiet mode, no frame counter\n" );
		@@ -2156,7 +2106,6 @@ static ivas_error initOnFirstGoodFrame(
		if ( numInitialBadFrames > 0 )
		{
		/* Duplicate good first frame metadata to fill the beginning of stream. */
		#ifdef NONBE_FIX_1261_MASA_EXT_META_JBM
		int16_t fullDelayNumSamplesLocal[3];
		int32_t delayTimeScaleLocal;
		float delayMs;
		@@ -2169,9 +2118,6 @@ static ivas_error initOnFirstGoodFrame(
		fprintf( stderr, "\nUnable to get delay of decoder: %s\n", ivas_error_to_string( error ) );
		}
		delayMs = (float) ( fullDelayNumSamplesLocal[0] ) / (float) ( delayTimeScaleLocal );
		#else
		IVAS_MASA_DECODER_EXT_OUT_META_HANDLE hMasaExtOutMeta = NULL;
		#endif

		if ( ( error = IVAS_DEC_GetMasaMetadata( hIvasDec, &hMasaExtOutMeta, 0 ) ) != IVAS_ERR_OK )
		{
		@@ -2181,9 +2127,6 @@ static ivas_error initOnFirstGoodFrame(

		for ( int16_t j = 0; j < numInitialBadFrames; ++j )
		{
		#ifndef NONBE_FIX_1261_MASA_EXT_META_JBM
		float delayMs = (float) ( pFullDelayNumSamples[0] ) / (float) ( *delayTimeScale );
		#endif
		if ( ( error = MasaFileWriter_writeFrame( *ppMasaWriter, hMasaExtOutMeta, &delayMs ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError writing MASA metadata to file: %s\n", MasaFileWriter_getFilePath( *ppMasaWriter ) );
		@@ -2233,9 +2176,7 @@ static ivas_error decodeG192(
		RotFileReader *refRotReader,

		Vector3PairFileReader *referenceVectorReader,
		#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE
		ObjectEditFileReader *objectEditFileReader,
		#endif
		#ifdef SOCKET_INTERFACE_FOR_POSE_AND_AUDIO
		uint32_t hSocket,
		#endif
		@@ -2674,7 +2615,6 @@ static ivas_error decodeG192(
		return error;
		}

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

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

		/* set new object parameters */
		if ( ( error = IVAS_DEC_SetEditableParameters( hIvasDec, editableParameters ) ) != IVAS_ERR_OK )
		@@ -3223,9 +3158,7 @@ static ivas_error decodeVoIP(
		RotFileReader *externalOrientationFileReader,
		RotFileReader *refRotReader,
		Vector3PairFileReader *referenceVectorReader,
		#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE
		ObjectEditFileReader *objectEditFileReader,
		#endif
		#ifdef SOCKET_INTERFACE_FOR_POSE_AND_AUDIO
		uint32_t hSocket,
		#endif
		@@ -3547,12 +3480,7 @@ static ivas_error decodeVoIP(
		}
		}

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

		/* read all packets with a receive time smaller than the system time */
		while ( nextPacketRcvTime_ms <= systemTime_ms )
		@@ -3662,11 +3589,7 @@ static ivas_error decodeVoIP(
		}

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

		/* set new object parameters */
		if ( ( error = IVAS_DEC_SetEditableParameters( hIvasDec, editableParameters ) ) != IVAS_ERR_OK )
		@@ -3804,22 +3727,12 @@ static ivas_error decodeVoIP(
		}
		}

		#ifdef NONBE_FIX_1255_OBJ_EDIT_JBM
		vec_pos_update = ( vec_pos_update + 1 ) % vec_pos_len;
		#else
		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;
		frame++;
		#endif
		if ( vec_pos_update == 0 )
		{
		systemTime_ms += vec_pos_len * systemTimeInc_ms;
		}

		#ifdef NONBE_FIX_1255_OBJ_EDIT_JBM
		if ( vec_pos_update == 0 )
		{
		frame++;
		@@ -3828,7 +3741,6 @@ static ivas_error decodeVoIP(
		fprintf( stdout, "%-8d\b\b\b\b\b\b\b\b", frame );
		}
		}
		#endif

		#ifdef WMOPS
		update_mem();
		@@ -3991,12 +3903,8 @@ cleanup:
		---------------------------------------------------------------------/

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

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

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

		return;
		}

ci/basop-pages/create_summary_page.py

+29 −6

Original line number	Diff line number	Diff line
		import argparse
		from typing import List

		from create_report_pages import SUBPAGE_TMPL_CSS, FORMATS

		MEASURES = ["MLD","DIFF","SSNR","ODG"]

		title = {
		"MLD": "Maximum MLD across channels",
		"DIFF": "Maximim absolute difference across channels",
		"SSNR": "Minimum SSNR across channels",
		"ODG": "Minimum PEAQ ODG across channels",
		"DELTA_ODG": "PEAQ ODG using binauralized input and output",
		}

		SUMMARY_PAGE_TMPL_HTML = """

		@@ -12,12 +20,14 @@ SUMMARY_PAGE_TMPL_HTML = """

		"""


		def create_summary_page(
		html_out,
		id_current: int,
		job_name: str,
		measures: List[str],
		):
		images = histogram_summary(job_name)
		images = histogram_summary(job_name, measures)

		new_summary_page = SUBPAGE_TMPL_CSS + SUMMARY_PAGE_TMPL_HTML.format(
		id_current=id_current,
		@@ -27,13 +37,15 @@ def create_summary_page(
		with open(html_out, "w") as f:
		f.write(new_summary_page)


		def histogram_summary(
		job_name: str,
		measures: List[str],
		):
		images = "<hr>"
		for m in MEASURES:
		for m in measures:
		images += (
		f"<h2>{m} summary {job_name}</h2>\n"
		f"<h2>{title[m]}</h2>\n"
		+ " ".join(
		[f"<img src=images_{job_name}/summary_{m}_{x}.png>" for x in FORMATS]
		)
		@@ -41,15 +53,26 @@ def histogram_summary(
		)
		return images


		if __name__ == "__main__":
		parser = argparse.ArgumentParser()
		parser.add_argument("html_out")
		parser.add_argument("id_current", type=int)
		parser.add_argument("job_name")
		parser.add_argument(
		"--measures",
		nargs="+",
		help=f"List of measures to include in summary. Allowed values: {' '.join(title.keys())}",
		default=["MLD", "DIFF", "SSNR", "ODG"],
		)
		args = parser.parse_args()

		if not all([m in title for m in args.measures]):
		raise ValueError(f"Invalid list of measures: {args.measures}, expected one of {' '.join(title.keys())}")

		create_summary_page(
		args.html_out,
		args.id_current,
		args.job_name,
		args.measures,
		)

ci/remove_unsupported_testcases.py

+17 −0

Original line number	Diff line number	Diff line
		@@ -66,6 +66,23 @@ TESTCASES = [
		"MASA 1TC at 256kbps, 48kHz in, 48 kHz out, BINAURAL_ROOM_REVERB out custom configuration",
		"MASA 1TC at 256 kbps, 48kHz in, 48kHz out, BINAURAL_ROOM_REVERB out, HR custom configuration",
		"OMASA 2TC 4ISM at br sw techs 13.2 to 512 kbps start 80 kbps, 48kHz in, 48kHz out, EXT out",
		"OMASA 2Dir2TC 4ISM at 80 kbps, 48kHz in, 48kHz out, BINAURAL out, default object editing, 1SEP-PARAM",
		"OMASA 2Dir2TC 4ISM at 256 kbps, 48kHz in, 48kHz out, BINAURAL out, object editing, JBM Prof 5, DISC",
		"OMASA 2Dir2TC 2ISM at 96 kbps, 48kHz in, 48kHz out, FOA out, object editing, JBM Prof 5, DISC",
		"OMASA 2Dir2TC 2ISM br sw techs 13.2 to 512 kbps start 48 kbps, 48kHz in, 48kHz out, BINAURAL out, object editing",
		"OSBA 3OA 4ISM at 256 kbps, 48kHz in, 48kHz out, BINAURAL out, object editing, DISC",
		"OSBA 2OA 3ISM at 128 kbps, 48kHz in, 48kHz out, FOA out, object editing, JBM Prof 5, DISC",
		"OSBA 2OA 3ISM at bitrate switching 13.2 to 512 kbps, 48kHz in, 48kHz out, BINAURAL out, object editing",
		"4 ISM with metadata at 32 kbps, 48 kHz in, 48 kHz out, BINAURAL out, object editing, PARAM_ISM",
		"4 ISM with metadata at 128 kbps, 48 kHz in, 48 kHz out, BINAURAL out, object editing, DISC",
		"3 ISM with metadata at 24.4 kbps, 48 kHz in, 48 kHz out, FOA out, object editing, JBM Prof 5, PARAM_ISM",
		"3 ISM with metadata at 384 kbps, 48 kHz in, 48 kHz out, FOA out, object editing, JBM Prof 5, DISC",
		"4 ISM with metadata bitrate switching from 32 kbps to 48 kbps, 48 kHz in, 48 kHz out, BINAURAL_ROOM_IR out, object editing",
		"4 ISM with metadata bitrate switching from 48 kbps to 32 kbps, 48 kHz in, 48 kHz out, BINAURAL out, object editing, JBM Prof 5",
		"OMASA 2TC 4ISM at 80 kbps, 48kHz in, 48kHz out, BINAURAL out, default object editing, 1SEP-PARAM",
		"OMASA 2TC 4ISM at 256 kbps, 48kHz in, 48kHz out, BINAURAL out, object editing, JBM Prof 5, DISC",
		"OMASA 2TC 2ISM at 96 kbps, 48kHz in, 48kHz out, FOA out, object editing, JBM Prof 5, DISC",
		"OMASA 2TC 2ISM br sw techs 13.2 to 512 kbps start 48 kbps, 48kHz in, 48kHz out, BINAURAL out, object editing",
		]

ci/smoke_test.sh

+24 −21

Original line number	Diff line number	Diff line
		@@ -28,6 +28,8 @@
		# accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and
		# the United Nations Convention on Contracts on the International Sales of Goods.

		set -euxo pipefail

		function usage {
		echo
		echo "Usage:"
		@@ -42,9 +44,9 @@ if [ ! -d "lib_com" ]; then
		exit 1
		fi

		if [ -z "$1" ] \|\| [ "$1" == "test" ]; then
		if [ -z "${1:-}" ] \|\| [ "${1:-}" == "test" ]; then
		BUILD=1
		elif [ "$1" == "coverage" ]; then
		elif [ "${1:-}" == "coverage" ]; then
		BUILD=0
		else
		usage
		@@ -76,37 +78,38 @@ if [ $BUILD -eq 1 ];then
		fi

		# prepare combined format test signals
		echo "\n======================= 0. preparing combined format test inputs =======================\n\n"
		echo -e "\n======================= 0. preparing combined format test inputs =======================\n\n"
		./scripts/prepare_combined_format_inputs.py

		# run all modes vanilla-fashion
		# treat ISM modes separately because passing the metadata files to MASA modes causes crashes
		ism_modes=$(./scripts/runIvasCodec.py -l \| grep ISM)
		non_ism_modes=$(./scripts/runIvasCodec.py -l \| grep -v ISM)
		echo "\n======================= 1. non-ism modes no FEC =======================\n\n"
		./scripts/runIvasCodec.py $verbosity_cmd -m $non_ism_modes -p $cfg $duration_arg $timeout_cmd \| tee smoke_test_output.txt
		echo "\n======================= 2. ism modes no FEC =======================\n\n"
		./scripts/runIvasCodec.py $verbosity_cmd -m $ism_modes -p $cfg $duration_arg $ism_md_cmd $timeout_cmd \| tee smoke_test_output.txt
		readarray -t ism_modes < <(./scripts/runIvasCodec.py -l \| grep ISM)
		readarray -t non_ism_modes < <(./scripts/runIvasCodec.py -l \| grep -v ISM)

		echo -e "\n======================= 1. non-ism modes no FEC =======================\n\n"
		./scripts/runIvasCodec.py $verbosity_cmd -m "${non_ism_modes[@]}" -p $cfg $duration_arg $timeout_cmd \| tee smoke_test_output.txt
		echo -e "\n======================= 2. ism modes no FEC =======================\n\n"
		./scripts/runIvasCodec.py $verbosity_cmd -m "${ism_modes[@]}" -p $cfg $duration_arg $ism_md_cmd $timeout_cmd \| tee smoke_test_output.txt

		# all modes with simulated network delay - this includes JBM TSM and lost frames
		echo "\n======================= 3. JBM =======================\n\n"
		echo -e "\n======================= 3. JBM =======================\n\n"
		./scripts/runIvasCodec.py $verbosity_cmd -p $cfg $duration_arg --decoder_only --jbm_file $dly_profile $timeout_cmd \| tee smoke_test_output_jbm.txt

		# run all modes with binaural output using external files
		formats_with_bin_out=$(./scripts/runIvasCodec.py -L \| grep -v "mono\\|tereo")
		bin_out_modes="BINAURAL BINAURAL_ROOM_IR BINAURAL_ROOM_REVERB"
		readarray -t formats_with_bin_out < <(./scripts/runIvasCodec.py -L \| grep -v "mono\\|tereo")
		bin_out_modes=(BINAURAL BINAURAL_ROOM_IR BINAURAL_ROOM_REVERB)

		echo "\n======================= 4. binaural out with HRTF files - WB =======================\n\n"
		wb_modes=$(./scripts/runIvasCodec.py -l -C $formats_with_bin_out \| grep _wb_)
		echo -e "\n======================= 4. binaural out with HRTF files - WB =======================\n\n"
		readarray -t wb_modes < <(./scripts/runIvasCodec.py -l -C "${formats_with_bin_out[@]}" \| grep _wb_)
		hrtf_wb="../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin"
		./scripts/runIvasCodec.py $verbosity_cmd -p $cfg -m $wb_modes $duration_arg -D="-hrtf ${hrtf_wb}" --decoder_only --oc $bin_out_modes $timeout_cmd \| tee -a smoke_test_output_hrtf.txt
		./scripts/runIvasCodec.py $verbosity_cmd -p $cfg -m "${wb_modes[@]}" $duration_arg -D="-hrtf ${hrtf_wb}" --decoder_only --oc "${bin_out_modes[@]}" $timeout_cmd \| tee -a smoke_test_output_hrtf.txt

		echo "\n======================= 5. binaural out with HRTF files - SWB =======================\n\n"
		swb_modes=$(./scripts/runIvasCodec.py -l -C $formats_with_bin_out \| grep _swb_)
		echo -e "\n======================= 5. binaural out with HRTF files - SWB =======================\n\n"
		readarray -t swb_modes < <(./scripts/runIvasCodec.py -l -C "${formats_with_bin_out[@]}" \| grep _swb_)
		hrtf_swb="../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin"
		./scripts/runIvasCodec.py $verbosity_cmd -p $cfg -m $swb_modes $duration_arg -D="-hrtf ${hrtf_swb}" --decoder_only --oc $bin_out_modes $timeout_cmd \| tee -a smoke_test_output_hrtf.txt
		./scripts/runIvasCodec.py $verbosity_cmd -p $cfg -m "${swb_modes[@]}" $duration_arg -D="-hrtf ${hrtf_swb}" --decoder_only --oc "${bin_out_modes[@]}" $timeout_cmd \| tee -a smoke_test_output_hrtf.txt

		echo "\n======================= 6. binaural out with HRTF files - FB =======================\n\n"
		fb_modes=$(./scripts/runIvasCodec.py -l -C $formats_with_bin_out \| grep _fb_)
		echo -e "\n======================= 6. binaural out with HRTF files - FB =======================\n\n"
		readarray -t fb_modes < <(./scripts/runIvasCodec.py -l -C "${formats_with_bin_out[@]}" \| grep _fb_)
		hrtf_fb="../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin"
		./scripts/runIvasCodec.py $verbosity_cmd -p $cfg -m $fb_modes $duration_arg -D="-hrtf ${hrtf_fb}" --decoder_only --oc $bin_out_modes $timeout_cmd \| tee -a smoke_test_output_hrtf.txt
		./scripts/runIvasCodec.py $verbosity_cmd -p $cfg -m "${fb_modes[@]}" $duration_arg -D="-hrtf ${hrtf_fb}" --decoder_only --oc "${bin_out_modes[@]}" $timeout_cmd \| tee -a smoke_test_output_hrtf.txt