Merge branch 'main' into ci/fail-complexity-jobs-for-bigger-changes (dc104e24) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitignore

+75 −0

Original line number	Original line	Diff line number	Diff line
	@@ -88,3 +88,78 @@ coan_out_*
	/scripts/mem_analysis_enc_STEREO_sw.csv		/scripts/mem_analysis_enc_STEREO_sw.csv
	/scripts/mem_analysis_enc_STEREO_16k4_DTX.csv		/scripts/mem_analysis_enc_STEREO_16k4_DTX.csv
	*.pwv		*.pwv
			/dcr_ism1
			/bwe_clicks_ism1
			/BWD_issue
			/.ipynb_checkpoints
			/scripts/.ipynb_checkpoints
			/scripts/wmops_analysis
			/scripts/wmops_analysis_new
			/tcx_hq_problem_ism1
			/scripts/dly_error_profiles/dly_profile_19_.dat
			/build.txt
			/bit.64k
			/bit.32k
			/bit
			/binaural_loudness.ipynb
			/tmp.txt
			/syn.wav
			/syn.ref
			/syn.64k.0.csv
			/syn.64k
			/syn.32k
			/stvST32c_-stereo_32000_32.bit
			/split_renderer_config_768_3dof_cldfbpc.txt
			/split_out_sba_lcld_20ms_out.wav
			/split_out_sba_lcld_20ms.pkt
			/split_out_mc_lc3plus_20ms_out.wav
			/split_out_mc_lc3plus_20ms.pkt
			/run_ivas_codec.sh
			/report.html
			/report-junit.xm
			/out.wav
			/ltv48_1ISM.cut14.wav.0.csv
			/ltv48_1ISM.cut14.pcm
			/ltv48_1ISM.cut14.dec.pcm.0.csv
			/ltv48_1ISM.cut14.64k.dec.pcm.0.csv
			/ltv48_1ISM.cut14.64k.dec.pcm
			/ltv48_1ISM.cut14.32k.dec.pcm
			/IvasBuilder.txt
			/ivas.192
			/ism_loudness_stv48_48kHz.md
			/ism_loudness_stv48_32kHz.md
			/ism_loudness_sel48_48kHz.md
			/ism_loudness_old.xlsx
			/ism_loudness_ltv48_ISM4.md
			/ism_loudness_ltv48_ISM3.md
			/ism_loudness_ltv48_ISM2.md
			/ism_loudness_ltv48_ISM1.md
			/ism_loudness_ltv48_48kHz.md
			/ism_loudness.xlsx
			/ism_loudness.py
			/HOA2_to_BINAURAL_ROOM_REVERBNone_rend_config_combined_20msNone_0-1000_2-500_1-500.wav
			/git_blame_string.sh
			/get_license_table.py
			/enc_out_mc.pkt
			/enc_out.pkt
			/cut_ism.py
			/scripts/Vlad_mergeNewsletters.py
			/scripts/Vlad_extract_max_num_ind.py
			/scripts/tables_obj.txt
			/scripts/tables_exe.txt
			/scripts/requirements.txt
			/scripts/parseNewsletterWmops.py
			/scripts/output.xlsx
			/scripts/functions_obj.txt
			/scripts/functions_exe.txt
			/scripts/dep_tree.txt
			/scripts/cmplx_evs_in_ivas.xlsx
			/scripts/bit
			/scripts/binaural_loudness.ipynb
			/scripts/config/Vlad_self_test_ltv.prm
			/scripts/config/Vlad_self_test.prm
			/scripts/config/Vlad_ci_linux_ltv.json
			/scripts/config/Vlad_ci_linux.json
			/cmake-build
			/bit.fix
			/syn

CMakeLists.txt

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -74,14 +74,14 @@ if(UNIX)
	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=address")		set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=address")
	elseif("${CLANG}" MATCHES "3" OR "${CLANG}" MATCHES "usan")		elseif("${CLANG}" MATCHES "3" OR "${CLANG}" MATCHES "usan")
	# NOTE: keep in sync with list in Makefile		# NOTE: keep in sync with list in Makefile
	set(USAN_CHECKS_ENABLE		set(USAN_CHECKS_LIST
	undefined # Default checks		undefined # Default checks
	# Extra checks		# Extra checks
	float-divide-by-zero		float-divide-by-zero
	implicit-conversion		implicit-conversion
	local-bounds		local-bounds
	)		)
	list(JOIN USAN_CHECKS_ENABLE "," USAN_CHECKS_ENABLE)		string(JOIN , USAN_CHECKS_ENABLE ${USAN_CHECKS_LIST})

	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=${USAN_CHECKS_ENABLE} -fsanitize-recover=${USAN_CHECKS_ENABLE}")		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=${USAN_CHECKS_ENABLE} -fsanitize-recover=${USAN_CHECKS_ENABLE}")
	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=${USAN_CHECKS_ENABLE} -fsanitize-recover=${USAN_CHECKS_ENABLE}")		set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=${USAN_CHECKS_ENABLE} -fsanitize-recover=${USAN_CHECKS_ENABLE}")

ci/thirdPartyLegalNotices/thirdPartyLegalNotices.txt

0 → 100755

+2539 −0

File added.

Preview size limit exceeded, changes collapsed.

lib_com/options.h

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -174,6 +174,8 @@
	#define NONBE_FIX_1070_USAN_SEGFAULT_MC_TO_BIN_BTSW_HEADROT /* fix 1070 USAN: nullptr-with-offset and Segfaults in 7_1_4 to BINAURAL and BINAURAL_ROOM_REVERB decoding with bitrate switching and head rotation*/		#define NONBE_FIX_1070_USAN_SEGFAULT_MC_TO_BIN_BTSW_HEADROT /* fix 1070 USAN: nullptr-with-offset and Segfaults in 7_1_4 to BINAURAL and BINAURAL_ROOM_REVERB decoding with bitrate switching and head rotation*/
	#define REVERT_ZERO_FLUSH_TRESH /* FhG: issue 1069: revert threshold value introduced with !1518 due to significant complexity increase*/		#define REVERT_ZERO_FLUSH_TRESH /* FhG: issue 1069: revert threshold value introduced with !1518 due to significant complexity increase*/
	#define NONBE_FIX_1097_SBA_DTX_BRATE_SWITCHING_ENC /* FhG: fix out-of-bound errors when switching from SID frame to active frame*/		#define NONBE_FIX_1097_SBA_DTX_BRATE_SWITCHING_ENC /* FhG: fix out-of-bound errors when switching from SID frame to active frame*/
			#define NONBE_FIX_1110_STEREO_DTX_BRATE_SWITCHING /* VA: issue 1110: fix encoder crash in the stereo DTX bitrate switching condition */
			#define NONBE_1131_ACELP_OOB /* VA: issue 1131: fix division-by-zero in acelp gain decoding caused by wrong length of buffer update when switching from HQ core to ACELP core */

	/* ##################### End NON-BE switches ########################### */		/* ##################### End NON-BE switches ########################### */

lib_dec/acelp_core_dec.c

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -231,7 +231,11 @@ ivas_error acelp_core_dec(
	st->hGSCDec->Last_frame_ener = (float) MAX_32;		st->hGSCDec->Last_frame_ener = (float) MAX_32;
	}		}

			#ifdef NONBE_FIX_1110_STEREO_DTX_BRATE_SWITCHING
			if ( st->hFdCngDec != NULL && ( st->element_mode == IVAS_CPE_DFT \|\| st->element_mode == IVAS_CPE_TD ) && ( st->last_core_brate == SID_2k40 \|\| st->last_core_brate == FRAME_NO_DATA ) )
			#else
	if ( ( st->element_mode == IVAS_CPE_DFT \|\| st->element_mode == IVAS_CPE_TD ) && ( st->last_core_brate == SID_2k40 \|\| st->last_core_brate == FRAME_NO_DATA ) )		if ( ( st->element_mode == IVAS_CPE_DFT \|\| st->element_mode == IVAS_CPE_TD ) && ( st->last_core_brate == SID_2k40 \|\| st->last_core_brate == FRAME_NO_DATA ) )
			#endif
	{		{
	set_zero( st->hFdCngDec->hFdCngCom->olapBufferSynth2, FFTLEN );		set_zero( st->hFdCngDec->hFdCngCom->olapBufferSynth2, FFTLEN );
	set_zero( hStereoCng->olapBufferSynth22, FFTLEN );		set_zero( hStereoCng->olapBufferSynth22, FFTLEN );
	@@ -699,7 +703,11 @@ ivas_error acelp_core_dec(
	old_exc_s = st->old_exc + L_EXC_MEM_DEC - st->L_frame;		old_exc_s = st->old_exc + L_EXC_MEM_DEC - st->L_frame;
	tmpF = *old_exc_s;		tmpF = *old_exc_s;
	st->mem_deemph = old_exc_s[st->L_frame - 1];		st->mem_deemph = old_exc_s[st->L_frame - 1];
			#ifdef NONBE_1131_ACELP_OOB
			preemph( old_exc_s, st->preemph_fac, st->L_frame, &tmpF );
			#else
	preemph( old_exc_s, st->preemph_fac, L_FRAME16k, &tmpF );		preemph( old_exc_s, st->preemph_fac, L_FRAME16k, &tmpF );
			#endif
	mvr2r( old_exc_s + st->L_frame - M, st->mem_syn2, M );		mvr2r( old_exc_s + st->L_frame - M, st->mem_syn2, M );
	residu( Aq, M, old_exc_s, old_exc + L_EXC_MEM_DEC - st->L_frame, st->L_frame );		residu( Aq, M, old_exc_s, old_exc + L_EXC_MEM_DEC - st->L_frame, st->L_frame );
	}		}