Merge branch 'main' into philips/contribution-38-control-metadata-reverb (d26838f2) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitlab-ci.yml

+6 −5

Original line number	Diff line number	Diff line
		@@ -499,7 +499,7 @@ renderer-pytest-on-merge-request:
		- 123
		artifacts:
		name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--job-$CI_JOB_NAME--results"
		expire_in: 2 week
		expire_in: 1 week
		when: always
		paths:
		- report-junit.xml
		@@ -550,7 +550,7 @@ ivas-pytest-on-merge-request:
		- 123
		artifacts:
		name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results"
		expire_in: 2 week
		expire_in: 1 week
		when: always
		paths:
		- report-junit.xml
		@@ -597,7 +597,7 @@ evs-pytest-on-merge-request:
		- 123
		artifacts:
		name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results"
		expire_in: 2 week
		expire_in: 1 week
		when: always
		paths:
		- report-junit-evs.xml
		@@ -656,7 +656,7 @@ clang-format-check:

		- exit $format_problems
		artifacts:
		expire_in: 2 days
		expire_in: 1 day
		paths:
		- tmp-formatting-fix/
		when: on_failure
		@@ -859,7 +859,7 @@ codec-comparison-on-main-push:
		- 123
		artifacts:
		name: "main-push--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results"
		expire_in: 2 week
		expire_in: 1 week
		when: always
		paths:
		- report-junit.xml
		@@ -1322,6 +1322,7 @@ pages:
		artifacts:
		paths:
		- public
		expire_in: 1 day

		# Pull state of a branch on 3GPP repo, push to a mirror repo.
		pull-from-3gpp-forge:

Workspace_msvc/lib_util.vcxproj

+0 −2

Original line number	Diff line number	Diff line
		@@ -145,7 +145,6 @@
		<ClCompile Include="..\lib_util\cmdl_tools.c" />
		<ClCompile Include="..\lib_util\evs_rtp_payload.c" />
		<ClCompile Include="..\lib_util\g192.c" />
		<ClCompile Include="..\lib_util\head_rotation_file_reader.c" />
		<ClCompile Include="..\lib_util\vector3_pair_file_reader.c" />
		<ClCompile Include="..\lib_util\hrtf_file_reader.c" />
		<ClCompile Include="..\lib_util\ism_file_reader.c" />
		@@ -171,7 +170,6 @@
		<ClInclude Include="..\lib_util\evs_rtp_payload.h" />
		<ClInclude Include="..\lib_util\g192.h" />
		<ClInclude Include="..\lib_util\vector3_pair_file_reader.h" />
		<ClInclude Include="..\lib_util\head_rotation_file_reader.h" />
		<ClInclude Include="..\lib_util\hrtf_file_reader.h" />
		<ClInclude Include="..\lib_util\ism_file_reader.h" />
		<ClInclude Include="..\lib_util\ism_file_writer.h" />

lib_com/options.h

+17 −2

Original line number	Diff line number	Diff line
		@@ -134,9 +134,14 @@

		/* #################### End DEBUGGING switches ############################ */

		/* ################# Start DEVELOPMENT switches ######################## */

		/* keep as part of options.h */
		#define BASOP_NOGLOB /* Disable global symbols in BASOPs, Overflow/Carry in BASOPs disabled, additional BASOPs in case of Overflow */


		/* ################# Start BE DEVELOPMENT switches ######################## */
		/* only BE switches wrt operation points tested in selection */

		/#define FIX_I4_OL_PITCH/ /* fix open-loop pitch used for EVS core switching */
		#define CONTROL_METADATA_REVERB /* Philips: reverb configuration change to binary format */
		#ifdef CONTROL_METADATA_REVERB
		@@ -162,9 +167,19 @@
		#define FIX_575_LOW_OVERLAP_PLC_RECOVERY /* FhG: Issue 575 fix for PLC and transistion to TCX5*/
		#define ISM_FB_16k4 /* VA: Issue: 579: change BW from SWB to FB in NxISM conditions to match the EVS codec */
		#define FIX_580_PARAMMC_ENER_BURSTS /* FhG: issue 580: energy bursts due to ILD holding when energy relations change too much */
		#define FIX_593_STL_INCLUDE /* FhG: Issue 593: correct include of stl.h in lib_enc/ivas_stereo_eclvq_enc.c */
		#define FIX_583_CLANG_TRANS_DET /* FhG: Issue 583: clang left shift on ramp_up_flag in transient detector */

		/* ################## End BE DEVELOPMENT switches ######################### */


		/* #################### Start NON-BE CR switches ########################## */
		/* any switch which is non-be wrt operation points tested in selection */
		/* all switches in this category should start with "CR_" */


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

		/* ################## End DEVELOPMENT switches ######################### */
		/* clang-format on */

		#endif

lib_enc/ivas_stereo_eclvq_enc.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -41,7 +41,11 @@
		#include "prot.h"
		#include "wmc_auto.h"
		/* used only for norm_s in the code_length_from_count function */
		#ifdef FIX_593_STL_INCLUDE
		#include "stl.h"
		#else
		#include "basop32.h"
		#endif


		/*---------------------------------------------------------------

lib_enc/stat_enc.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -124,7 +124,11 @@ typedef struct
		float firState1;
		float firState2;

		#ifdef FIX_583_CLANG_TRANS_DET
		uint16_t ramp_up_flag; /* bit map flags to indicate a ramp up in beginning of TCX frame */
		#else
		int16_t ramp_up_flag; /* bit map flags to indicate a ramp up in beginning of TCX frame */
		#endif

		} SubblockEnergies;