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

.gitlab-ci.yml

+1 −1

Original line number	Diff line number	Diff line
		@@ -872,7 +872,7 @@ lc3-wrapper-unit-test:
		script:
		- cmake -B cmake-build -G "Unix Makefiles" -DCOPY_EXECUTABLES_FROM_BUILD_DIR=true
		- 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
		split-rendering-pytest-on-merge-request:

CMakeLists.txt

+2 −2

Original line number	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)

		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)
		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 ISAR_post_rend POST_BUILD VERBATIM COMMAND "${CMAKE_COMMAND}" -E copy "$<TARGET_FILE:ISAR_post_rend>" "${CMAKE_CURRENT_SOURCE_DIR}/")
		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()

ci/run-first-frame-is-sid-test.sh

+8 −3

Original line number	Diff line number	Diff line
		@@ -6,9 +6,10 @@ make -j IVAS_cod
		mv IVAS_cod IVAS_cod_nosan

		# run all modes and cut bitstream to start with an SID. Use mono output to limit runtime, test is only about decoding the first frame
		modes_no_sba=$(scripts/runIvasCodec.py -l \| grep dtx \| grep -vE "FOA\|HOA" )
		modes_no_sba=$(scripts/runIvasCodec.py -l \| grep dtx \| grep -vE "stereo\|FOA\|HOA" )
		modes_hoa=$(scripts/runIvasCodec.py -l \| grep dtx \| grep -E "HOA")
		modes_foa=$(scripts/runIvasCodec.py -l \| grep dtx \| grep "FOA")
		modes_stereo=$(scripts/runIvasCodec.py -l \| grep dtx \| grep "stereo")

		# config vars
		testcase_timeout=20
		@@ -25,12 +26,14 @@ cp IVAS_cod_nosan CLANG1/IVAS_cod

		exit_code_msan=0
		echo "-------------- 1. Encoder + Msan decoder -------------- "
		echo "-------------- 1.1 all DTX modes except SBA -------------- "
		echo "-------------- 1.1 all DTX modes except SBA and stereo -------------- "
		scripts/IvasBuildAndRunChecks.py --checks CLANG1 -m $modes_no_sba -U 0:20 $common_args \|\| exit_code_msan=$?
		echo "-------------- 1.2 HOA2 + HOA3 DTX modes -------------- "
		scripts/IvasBuildAndRunChecks.py --checks CLANG1 -m $modes_hoa -U 70:80 $common_args \|\| exit_code_msan=$?
		echo "-------------- 1.3 FOA DTX modes -------------- "
		scripts/IvasBuildAndRunChecks.py --checks CLANG1 -m $modes_foa -U 75:110 $common_args \|\| exit_code_msan=$?
		echo "-------------- 1.4 stereo DTX modes -------------- "
		scripts/IvasBuildAndRunChecks.py --checks CLANG1 -m $modes_stereo -U 40:60 $common_args \|\| exit_code_msan=$?
		# archive encoder logs separately
		mkdir logs_enc logs_dec_msan
		mv CLANG1/logs/*.enc.txt logs_enc/
		@@ -44,12 +47,14 @@ cp -r CLANG1/enc CLANG3/enc

		exit_code_asan_usan=0
		echo "-------------- 2. Asan + Usan decoder -------------- "
		echo "-------------- 2.1 all DTX modes except SBA -------------- "
		echo "-------------- 2.1 all DTX modes except SBA and stereo -------------- "
		scripts/IvasBuildAndRunChecks.py --checks CLANG2 CLANG3 --decoder_only -m $modes_no_sba -U 0:20 $common_args \|\| exit_code_asan_usan=$?
		echo "-------------- 2.2 HOA2 + HOA3 DTX modes -------------- "
		scripts/IvasBuildAndRunChecks.py --checks CLANG2 CLANG3 --decoder_only -m $modes_hoa -U 70:80 $common_args \|\| exit_code_asan_usan=$?
		echo "-------------- 2.3 FOA DTX modes -------------- "
		scripts/IvasBuildAndRunChecks.py --checks CLANG2 CLANG3 --decoder_only -m $modes_foa -U 75:110 $common_args \|\| exit_code_asan_usan=$?
		echo "-------------- 2.4 stereo DTX modes -------------- "
		scripts/IvasBuildAndRunChecks.py --checks CLANG2 CLANG3 --decoder_only -m $modes_stereo -U 40:60 $common_args \|\| exit_code_asan_usan=$?
		mv CLANG2/logs logs_dec_asan
		mv CLANG3/logs logs_dec_usan

lib_com/ivas_cnst.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -1142,8 +1142,12 @@ enum
		#define MASA_TRANSP_BITS 1
		#define NO_BITS_MASA_ISM_NO_OBJ 2
		#define MASA2TOTAL_THR 0.98f

		#define BITS_MASA2TOTTAL_DCT0 6
		#define STEP_M2T 0.1f
		#ifdef NONBE_1231_BASOP_819_THRESHOLD_MASA2TOTAL
		#define STEP_M2T_FX 214748365 // Q31
		#endif
		#define MASA_HEADER_BITS 2
		#define MASA_SUBFRAME_BITS 1
		#define MASA_LOWBITRATE_MODE_BITS 1

lib_com/ivas_prot.h

+26 −0

Original line number	Diff line number	Diff line
		@@ -756,6 +756,32 @@ int16_t get_igf_startline(

		float rand_triangular_signed(
		int16_t *seed );
		#ifdef NONBE_1231_BASOP_819_THRESHOLD_MASA2TOTAL
		Word16 matrix_product_fx(
		const Word32 X_fx, / i : left hand matrix Qx*/
		const Word16 rowsX, /* i : number of rows of the left hand matrix Q0*/
		const Word16 colsX, /* i : number of columns of the left hand matrix Q0*/
		const Word16 transpX, /* i : flag indicating the transposition of the left hand matrix prior to the multiplication Q0*/
		const Word32 Y_fx, / i : right hand matrix Qy*/
		const Word16 rowsY, /* i : number of rows of the right hand matrix Q0*/
		const Word16 colsY, /* i : number of columns of the right hand matrix Q0*/
		const Word16 transpY, /* i : flag indicating the transposition of the right hand matrix prior to the multiplication Q0*/
		Word32 Z_fx / o : resulting matrix after the matrix multiplication Qx + Qy - 31*/
		);

		Word16 matrix_product_q30_fx(
		const Word32 X_fx, / i : left hand matrix Q31*/
		const Word16 rowsX, /* i : number of rows of the left hand matrix Q0*/
		const Word16 colsX, /* i : number of columns of the left hand matrix Q0*/
		const Word16 transpX, /* i : flag indicating the transposition of the left hand matrix prior to the multiplication Q0*/
		const Word32 Y_fx, / i : right hand matrix Q25*/
		const Word16 rowsY, /* i : number of rows of the right hand matrix Q0*/
		const Word16 colsY, /* i : number of columns of the right hand matrix Q0*/
		const Word16 transpY, /* i : flag indicating the transposition of the right hand matrix prior to the multiplication Q0*/
		Word32 Z_fx / o : resulting matrix after the matrix multiplication Q30*/
		);
		#endif


		void dtx_read_padding_bits(
		DEC_CORE_HANDLE st,