Merge branch 'main' into fix_hrtf_processing_scripts_for_3rd_party_sofa_support (75abeb69) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/renderer.c

+0 −8

Original line number	Diff line number	Diff line
		@@ -1235,15 +1235,11 @@ int main(
		masaIds[i] = 0u;
		}

		#ifdef FIX_1377_HANDLE_ERROR_CODE
		if ( ( error = IVAS_REND_SetObjectIDs( hIvasRend ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nIVAS_REND_SetObjectIDs: %s\n", ivas_error_to_string( error ) );
		goto cleanup;
		}
		#else
		IVAS_REND_SetObjectIDs( hIvasRend );
		#endif

		for ( i = 0; i < args.inConfig.numMultiChannelBuses; ++i )
		{
		@@ -2617,14 +2613,10 @@ static CmdlnArgs defaultArgs(
		args.outConfig.audioConfig = IVAS_AUDIO_CONFIG_INVALID;
		args.outConfig.outSetupCustom.num_spk = 0;
		args.outConfig.outSetupCustom.num_lfe = 0;
		#ifdef FIX_HRTF_LEFTOVERS
		for ( i = 0; i < RENDERER_MAX_SBA_INPUTS; ++i )
		{
		args.inConfig.ambisonicsBuses[i].audioConfig = IVAS_AUDIO_CONFIG_INVALID;
		}
		#else
		args.inConfig.ambisonicsBuses->audioConfig = IVAS_AUDIO_CONFIG_INVALID;
		#endif

		for ( i = 0; i < RENDERER_MAX_ISM_INPUTS + RENDERER_MAX_MASA_INPUTS; ++i )
		{

ci/create_trajectories.py

+19 −2

Original line number	Diff line number	Diff line
		import numpy as np
		from scipy.spatial.transform import Rotation


		FRAMES_PER_SEC = 50
		MAGIC_VAL_TO_SIGNAL_EULER_ANGLES = -3


		def random_trajectory(duration_sec):
		n_frames = int(FRAMES_PER_SEC * duration_sec)
		trj = np.random.random((n_frames, 4))
		trj[:, 0] = -3
		trj[:, 0] = MAGIC_VAL_TO_SIGNAL_EULER_ANGLES
		trj[:, 1] *= 180
		trj[:, 2] *= 90
		trj[:, 3] *= 180
		@@ -17,9 +19,24 @@ def random_trajectory(duration_sec):
		def constant_trajectory(duration_sec, yaw=0, pitch=0, roll=0):
		n_frames = int(FRAMES_PER_SEC * duration_sec)
		trj = np.empty((n_frames, 4))
		trj[:, 0] = -3
		trj[:, 0] = MAGIC_VAL_TO_SIGNAL_EULER_ANGLES
		trj[:, 1] = yaw
		trj[:, 2] = pitch
		trj[:, 3] = roll
		return trj


		def random_trajectory_quat(duration_sec):
		n_frames = int(FRAMES_PER_SEC * duration_sec)
		trj = Rotation.random(n_frames).as_quat()
		return trj


		def constant_trajectory_quat(duration_sec, w=1, x=0, y=0, z=0):
		n_frames = int(FRAMES_PER_SEC * duration_sec)
		trj = np.empty((n_frames, 4))
		trj[:, 0] = w
		trj[:, 1] = x
		trj[:, 2] = y
		trj[:, 3] = z
		return trj

ci/run_scheduled_sanitizer_test.py

+46 −37

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@ import argparse
		import pathlib
		import subprocess
		import sys
		import os
		import numpy as np
		import json

		@@ -43,7 +44,7 @@ from collect_artifacts import (
		find_failed_files_for_sanitizer_test,
		)
		from combine_genpatt_and_jbm_profile import combine_error_profiles
		from create_trajectories import random_trajectory
		from create_trajectories import random_trajectory, random_trajectory_quat


		SCRIPT_DIR = pathlib.Path("./scripts").resolve()
		@@ -75,12 +76,17 @@ ARGS_FOR_OC = {
		"BINAURAL_ROOM_REVERB": BINAURAL_OUT_ARGS,
		}

		SEED_FOR_RANDOM = int(os.environ.get("CI_JOB_ID", 0))


		def main(args):
		in_format = args.in_format
		out_formats = args.out_formats
		tests = args.tests
		run_fec = not args.skip_fec
		seed = SEED_FOR_RANDOM if args.inject_seed is None else args.inject_seed

		np.random.seed(seed)

		assert all([t in SUPPORTED_TESTS for t in tests])

		@@ -92,7 +98,6 @@ def main(args):


		def get_modes(in_format: str) -> list:

		in_format_for_script = in_format
		if in_format in MC_MODES:
		in_format_for_script = "MC"
		@@ -134,7 +139,6 @@ def assemble_oc_dict(out_formats: list):


		def get_md_file_command(in_format: str) -> list:

		cmd = list()
		if "ISM" in in_format:
		cmd.append("--ism_metadata_files")
		@@ -145,8 +149,7 @@ def get_md_file_command(in_format: str) -> list:
		return cmd


		def run_check(in_format: str, out_formats: list, tests: list, run_fec: bool = True):

		def run_check(in_format: str, out_formats: list, tests: list, run_fec: bool):
		modes = get_modes(in_format)
		if len(modes) == 0:
		return 0
		@@ -156,10 +159,10 @@ def run_check(in_format: str, out_formats: list, tests: list, run_fec: bool = Tr

		# create random trajectory files
		if "BINAURAL" in oc_str:
		trajectory_files = [HEAD_TRAJ_FILE, EXOF_TRAJ_FILE]
		for tf in trajectory_files:
		traj = random_trajectory(int(DURATION))
		np.savetxt(tf, traj, fmt="%.2f", delimiter=",")
		np.savetxt(HEAD_TRAJ_FILE, traj, fmt="%.2f", delimiter=",")
		traj_exof = random_trajectory_quat(int(DURATION))
		np.savetxt(EXOF_TRAJ_FILE, traj_exof, fmt="%.2f", delimiter=",")

		### always run encoder and decoder with no frameloss
		cmd_no_fec = [
		@@ -187,7 +190,7 @@ def run_check(in_format: str, out_formats: list, tests: list, run_fec: bool = Tr
		# resue decoder part of StereDmxEVS mode (it is basically a duplicate of "normal" mono run)
		if in_format == "StereoDmxEVS":
		panning = np.random.randint(-90, 91)
		cmd_no_fec += [f'-D=-non_diegetic_pan {panning}']
		cmd_no_fec += [f"-D=-non_diegetic_pan {panning}"]

		print(
		"======== Script command line WITHOUT plc: ========\n{}".format(
		@@ -277,5 +280,11 @@ if __name__ == "__main__":
		parser.add_argument("out_formats", type=str, nargs="+")
		parser.add_argument("--tests", type=str, nargs="+", default=["CLANG1", "CLANG2"])
		parser.add_argument("--skip_fec", action="store_true")
		parser.add_argument(
		"--inject_seed",
		type=int,
		default=None,
		help="Value to use for seeding random generators",
		)

		sys.exit(main(parser.parse_args()))

lib_com/edct.c

+3 −38

Original line number	Diff line number	Diff line
		@@ -44,6 +44,7 @@
		#include "prot.h"
		#include "wmc_auto.h"
		#include <math.h> /* for cosf, sinf */
		#include <assert.h>

		static ivas_error get_edct_table(
		const float **edct_table,
		@@ -226,7 +227,6 @@ void edst(
		return;
		}

		#define FAST_EDXT /* optimized FFT-based DCT/DST algorithm */

		/-------------------------------------------------------------------------
		* edxt()
		@@ -243,9 +243,8 @@ void edxt(
		)
		{
		const float pi_len = EVS_PI / length;
		int16_t k, m;
		int16_t k;

		#ifdef FAST_EDXT
		if ( kernelType == MDST_II \|\| kernelType == MDCT_II )
		{
		const int16_t Nm1 = length - 1;
		@@ -351,42 +350,8 @@ void edxt(
		}
		}
		else
		#endif
		if ( kernelType & 1 ) /* DST */
		{
		const float offK = ( kernelType == MDST_II && synthesis ? 0.5f : 1.0f - 0.5f * ( kernelType >> 1 ) );
		const float offM = ( kernelType == MDST_II && synthesis ? 1.0f : 0.5f );

		for ( k = 0; k < length; k++ )
		{
		y[k] = 0.f;
		for ( m = 0; m < length; m++ )
		{
		y[k] += x[m] * sinf( pi_len * ( m + offM ) * ( k + offK ) );
		}
		}
		if ( offK == 1.f )
		{
		y[length - 1] = 0.5f; / scale Nyquist sample */
		}
		}
		else /* kernelType 0, 2: DCT */
		{
		const float offK = ( kernelType == MDCT_II && synthesis ? 0.5f : 0.5f - 0.5f * ( kernelType >> 1 ) );
		const float offM = ( kernelType == MDCT_II && synthesis ? 0.0f : 0.5f );

		for ( k = 0; k < length; k++ )
		{
		y[k] = 0.f;
		for ( m = 0; m < length; m++ )
		{
		y[k] += x[m] * cosf( pi_len * ( m + offM ) * ( k + offK ) );
		}
		}
		if ( offK == 0.f )
		{
		y[0] = 0.5f; / scale lowest (i.e. DC) sample */
		}
		assert( !"Unsupported Kernel type in edxt()" );
		}

		v_multc( y, ( kernelType == MDCT_II ? -1.f : 1.f ) * sqrtf( 2.f / length ), y, length );

lib_com/ivas_cnst.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -229,9 +229,7 @@ typedef enum
		/* format signaling in SID frames */
		#define SID_FORMAT_NBITS 3 /* Bit 0 \| Bit 1 \| Bit 2 */
		/-------\|-------\|------ /
		#ifdef FIX_1384_MSAN_ivas_spar_dec_open
		#define SID_FORMAT_NONE (-0x1) /* n/a\| n/a\| n/a*/
		#endif
		#define SID_DFT_STEREO 0x0 /* 0\| 0\| 0 */
		#define SID_MDCT_STEREO 0x1 /* 1\| 0\| 0 */
		#define SID_ISM 0x2 /* 0\| 1\| 0 */