Merge with main (f27dddad) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitlab-ci.yml

+1 −1

Original line number	Diff line number	Diff line
		@@ -29,7 +29,7 @@ variables:

		GIT_CLEAN_FLAGS: -ffdxq
		TESTCASE_TIMEOUT_STV_SANITIZERS: 180
		TESTCASE_TIMEOUT_LTV_SANITIZERS: 1200
		TESTCASE_TIMEOUT_LTV_SANITIZERS: 2400
		BASOP_REFERENCE_BRANCH: "ivas-float-update"
		SCALE_FACTOR: "3.162"

apps/decoder.c

+451 −103

File changed.

Preview size limit exceeded, changes collapsed.

apps/renderer.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -615,7 +615,11 @@ static int16_t get_cldfb_in_flag(
		int16_t cldfb_in_flag;

		cldfb_in_flag = 0;
		#ifdef FIX_HRTF_LOAD
		if ( renderConfig->split_rend_config.rendererSelection == IVAS_BIN_RENDERER_TYPE_FASTCONV )
		#else
		if ( renderConfig->split_rend_config.rendererSelection == ISAR_SPLIT_REND_RENDERER_SELECTION_FASTCONV )
		#endif
		{
		#ifdef DEBUGGING
		cldfb_in_flag = 1;
		@@ -945,7 +949,11 @@ int main(
		goto cleanup;
		}

		#ifdef FIX_HRTF_LOAD
		if ( ( error = load_fastconv_HRTF_from_binary( *hHrtfFastConv, 0, IVAS_AUDIO_CONFIG_INVALID, hrtfFileReader ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = load_fastconv_HRTF_from_binary( *hHrtfFastConv, hrtfFileReader ) ) != IVAS_ERR_OK )
		#endif
		{
		if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
		{

ci/complexity_measurements/getWmops.sh

+33 −25

Original line number	Diff line number	Diff line
		@@ -29,11 +29,11 @@
		# the United Nations Convention on Contracts on the International Sales of Goods.

		function usage {
		echo "Usage: $0 \"ivas-format(s)\" \"output-format(s)\" \"mode{full(default)\|mem_only}\""
		echo "Usage: $0 \"ivas-format(s)\" \"output-format(s)\" \"mode{full(default)\|mem_only}\" \"repo{float(default)\|basop}\" "
		exit 1
		}

		if [ $# -ne 2 ] && [ $# -ne 3 ]; then
		if [ $# -ne 2 ] && [ $# -ne 3 ] && [ $# -ne 4 ]; then
		usage
		fi

		@@ -41,7 +41,7 @@ ivas_format=$1
		output_format="$2"

		mode_arg_script=""
		if [ $# -eq 3 ]; then
		if [ $# -ge 3 ]; then
		if [ "$3" = "mem_only" ]; then
		mode_arg_script="--wmc_tool_mem_only"
		elif [ "$3" != "full" ]; then
		@@ -49,11 +49,20 @@ if [ $# -eq 3 ]; then
		fi
		fi

		date=`date +%Y%m%d` # used for log-file file ending
		shortDate=`date "+%b %d" \| sed -e "s/\ /_/g"` # stored in the log-file
		fullDate=`date "+%c" \| sed -e "s/\ /_/g"` # stored in the log-file
		repo_arg_script=""
		if [ $# -eq 4 ]; then
		if [ "$4" = "basop" ]; then
		repo_arg_script="--basop"
		elif [ "$4" != "float"]; then
		usage
		fi
		fi

		commit_sha=`git rev-parse --short HEAD`
		date=$(date +%Y%m%d) # used for log-file file ending
		shortDate=$(date "+%b %d" \| sed -e "s/\ /_/g") # stored in the log-file
		fullDate=$(date "+%c" \| sed -e "s/\ /_/g") # stored in the log-file

		commit_sha=$(git rev-parse --short HEAD)

		destDir="."
		scriptDir="ci/complexity_measurements"
		@@ -62,7 +71,7 @@ ep="${scriptDir}/ep_10pct_fer.g192"
		config_file="scripts/config/ci_linux_ltv.json"

		# get wmops newsletter
		wmopsFilenameFlcLast=wmops_newsletter_stereo__${commit_sha}_${date}
		wmopsFilenameFlcLast=wmops_newsletter_${ivas_format}_to_${output_format}__${commit_sha}_${date}
		wmopsFilenameFlc=${destDir}/wmops/logs/${wmopsFilenameFlcLast}

		ret_val=0
		@@ -75,7 +84,7 @@ if [ "$ivas_format" == "OSBA" ]; then
		fi

		# instrument and build
		./scripts/IvasBuildAndRunChecks.py $mode_arg_script -p $config_file --checks COMPLEXITY --create_complexity_tables ${wmopsFilenameFlc} -C $ivas_format $mode_arg -f ${ep} --oc $output_format
		./scripts/IvasBuildAndRunChecks.py $mode_arg_script $repo_arg_script -p $config_file --checks COMPLEXITY --create_complexity_tables ${wmopsFilenameFlc} -C $ivas_format $mode_arg -f ${ep} --oc $output_format
		ret_val=$?

		# get the info on worst-case operating point: WMOPS number, enc-operating mode, dec-operating mode
		@@ -88,7 +97,6 @@ tcsh ${scriptDir}/genWebpageData_WMOPS.csh ${destDir}/wmops/log_wmops_all.txt ${
		# per mode graph
		tcsh ${scriptDir}/genWebpageData_WmopPerOperatingpoint.csh ${wmopsFilenameFlc}_WMOPS.csv ${destDir}/wmops/graphs_wmops_flc_perOP.js Graphs_WMOPS_perOP


		# get memory info for webpage
		### RAM
		${scriptDir}/mergeNewsletterRam.py ${wmopsFilenameFlc}_HEAP.csv ${wmopsFilenameFlc}_STACK.csv >${wmopsFilenameFlc}_RAM.csv

lib_com/common_api_types.h

+19 −0

Original line number	Diff line number	Diff line
		@@ -140,6 +140,7 @@ typedef struct _IVAS_EDITABLE_PARAMETERS
		int16_t num_obj;
		IVAS_ISM_METADATA ism_metadata[IVAS_MAX_NUM_OBJECTS];
		float gain_bed;

		} IVAS_EDITABLE_PARAMETERS;
		#endif

		@@ -213,6 +214,18 @@ typedef struct _IVAS_JBM_TRACE_DATA

		} IVAS_JBM_TRACE_DATA;

		#ifdef FIX_HRTF_LOAD
		typedef enum _ivas_binaural_renderer_type
		{
		IVAS_BIN_RENDERER_TYPE_NONE,
		IVAS_BIN_RENDERER_TYPE_CREND,
		IVAS_BIN_RENDERER_TYPE_FASTCONV,
		IVAS_BIN_RENDERER_TYPE_PARAMBIN,
		IVAS_BIN_RENDERER_TYPE_TDREND,
		IVAS_BIN_RENDERER_TYPE_DEFAULT,

		} IVAS_BIN_RENDERER_TYPE;
		#endif

		/----------------------------------------------------------------------------------
		* Split rendering API constants, structures, and enums
		@@ -251,6 +264,7 @@ typedef enum

		} ISAR_SPLIT_REND_CODEC;

		#ifndef FIX_HRTF_LOAD
		typedef enum
		{
		ISAR_SPLIT_REND_RENDERER_SELECTION_CREND,
		@@ -260,6 +274,7 @@ typedef enum
		ISAR_SPLIT_REND_RENDERER_SELECTION_DEFAULT,

		} ISAR_SPLIT_REND_RENDERER_SELECTION;
		#endif

		typedef struct _ISAR_SPLIT_REND_BITS_DATA
		{
		@@ -291,7 +306,11 @@ typedef struct _ISAR_SPLIT_REND_CONFIG
		int16_t codec_frame_size_ms; /* Codec frame size in milliseconds, only relevant with LC3plus */
		ISAR_SPLIT_REND_POSE_CORRECTION_MODE poseCorrectionMode;
		ISAR_SPLIT_REND_CODEC codec;
		#ifdef FIX_HRTF_LOAD
		IVAS_BIN_RENDERER_TYPE rendererSelection;
		#else
		ISAR_SPLIT_REND_RENDERER_SELECTION rendererSelection;
		#endif
		int16_t lc3plus_highres;

		} ISAR_SPLIT_REND_CONFIG_DATA, *ISAR_SPLIT_REND_CONFIG_HANDLE;