Merge branch 'main' into ci/fix-exit-codes (24176a8e) · Commits · SA4 / Audio / IVAS BASOP

.gitlab-ci.yml

+253 −163

Original line number	Diff line number	Diff line
		@@ -974,10 +974,10 @@ ivas-pytest-renderer:
		.complexity-template:
		extends:
		- .test-job-linux
		timeout: 3 hours 30 minutes
		stage: test
		variables:
		ret_val: 0
		timeout: 3 hours 30 minutes
		before_script:
		- *print-common-info
		- *update-scripts-repo
		@@ -988,7 +988,7 @@ ivas-pytest-renderer:
		artifacts:
		name: "$CI_JOB_NAME--$CI_COMMIT_REF_NAME--sha-$CI_COMMIT_SHA"
		when: always
		expire_in: 1 week
		expire_in: 2 week
		paths:
		- $CI_JOB_NAME-public

		@@ -1004,200 +1004,290 @@ complexity-stereo-in-stereo-out:
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		# complexity-stereo-in-7_1_4-out:
		# extends:
		# - .complexity-template
		# rules:
		# - if: $MEASURE_COMPLEXITY_LINUX
		# script:
		# - in_format=stereo
		# - out_format=7_1_4
		# - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" \|\| ret_val=$?
		# - *complexity-measurements-prepare-artifacts
		# - exit $ret_val
		complexity-ism-in-binaural-out:
		extends:
		- .complexity-template
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 1 hour
		script:
		- in_format=ISM
		- out_format=BINAURAL
		- ret_val=0
		- bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format" \|\| ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		# complexity-ism-in-ext-out:
		# extends:
		# - .complexity-template
		# rules:
		# - if: $MEASURE_COMPLEXITY_LINUX
		# # when: delayed:
		# # start_in: 1 hours
		# script:
		# - in_format=ISM
		# - out_format=EXT
		# - bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format" \|\| ret_val=$?
		# - *complexity-measurements-prepare-artifacts
		# - exit $ret_val
		complexity-ism-in-binaural_room_ir-out:
		extends:
		- .complexity-template
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 2 hours
		script:
		- in_format=ISM
		- out_format=BINAURAL_ROOM_IR
		- ret_val=0
		- bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format" \|\| ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		# complexity-ism-in-binaural-out:
		# extends:
		# - .complexity-template
		# rules:
		# - if: $MEASURE_COMPLEXITY_LINUX
		# # when: delayed:
		# # start_in: 1 hours
		# script:
		# - in_format=ISM
		# - out_format=BINAURAL BINAURAL_ROOM_IR BINAURAL_ROOM_REVERB
		# - bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format" \|\| ret_val=$?
		# - *complexity-measurements-prepare-artifacts
		# - exit $ret_val
		complexity-ism-in-ext-out:
		extends:
		- .complexity-template
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 3 hours 30 minutes
		script:
		- in_format=ISM
		- out_format=EXT
		- ret_val=0
		- bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format" \|\| ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		# complexity-hoa3-in-hoa3-out:
		# extends:
		# - .complexity-template
		# rules:
		# - if: $MEASURE_COMPLEXITY_LINUX
		# # when: delayed:
		# # start_in: 2 hours
		# script:
		# - in_format=HOA3
		# - out_format=HOA3
		# - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" \|\| ret_val=$?
		# - *complexity-measurements-prepare-artifacts
		# - exit $ret_val
		complexity-sba-hoa3-in-hoa3-out:
		extends:
		- .complexity-template
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 4 hours 30 minutes
		script:
		- in_format=HOA3
		- out_format=HOA3
		- ret_val=0
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" \|\| ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		# complexity-hoa3-in-binaural-out:
		# extends:
		# - .complexity-template
		# rules:
		# - if: $MEASURE_COMPLEXITY_LINUX
		# # when: delayed:
		# # start_in: 2 hours
		# script:
		# - in_format=HOA3
		# - out_format=BINAURAL BINAURAL_ROOM_IR BINAURAL_ROOM_REVERB
		# - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" \|\| ret_val=$?
		# - *complexity-measurements-prepare-artifacts
		# - exit $ret_val
		complexity-sba-hoa3-in-binaural-out:
		extends:
		- .complexity-template
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 5 hours 30 minutes
		script:
		- in_format=HOA3
		- out_format=BINAURAL
		- ret_val=0
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" \|\| ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		# complexity-osba-in-ext-out:
		# extends:
		# - .complexity-template
		# rules:
		# - if: $MEASURE_COMPLEXITY_LINUX
		# # when: delayed:
		# # start_in: 2 hours
		# script:
		# - in_format=OSBA
		# - out_format=EXT
		# - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" \|\| ret_val=$?
		# - *complexity-measurements-prepare-artifacts
		# - exit $ret_val
		complexity-sba-hoa3-in-binaural_room_ir-out:
		extends:
		- .complexity-template
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 6 hours 30 minutes
		script:
		- in_format=HOA3
		- out_format=BINAURAL_ROOM_IR
		- ret_val=0
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" \|\| ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		# complexity-osba-in-binaural-out:
		# extends:
		# - .complexity-template
		# rules:
		# - if: $MEASURE_COMPLEXITY_LINUX
		# # when: delayed:
		# # start_in: 2 hours
		# script:
		# - in_format=OSBA
		# - out_format=BINAURAL BINAURAL_ROOM_IR BINAURAL_ROOM_REVERB
		# - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" \|\| ret_val=$?
		# - *complexity-measurements-prepare-artifacts
		# - exit $ret_val
		complexity-mc-in-7_1_4-out:
		extends:
		- .complexity-template
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 7 hours 30 minutes
		script:
		- in_format=MC
		- out_format=7_1_4
		- ret_val=0
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" \|\| ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		# complexity-mc-in-7_1_4-out:
		# extends:
		# - .complexity-template
		# rules:
		# - if: $MEASURE_COMPLEXITY_LINUX
		# # when: delayed:
		# # start_in: 2 hours
		# script:
		# - in_format=MC
		# - out_format=7_1_4
		# - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" \|\| ret_val=$?
		# - *complexity-measurements-prepare-artifacts
		# - exit $ret_val
		complexity-mc-in-binaural-out:
		extends:
		- .complexity-template
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 10 hours
		script:
		- in_format=MC
		- out_format=BINAURAL
		- ret_val=0
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" \|\| ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		# complexity-mc-in-binaural-out:
		# extends:
		# - .complexity-template
		# rules:
		# - if: $MEASURE_COMPLEXITY_LINUX
		# # when: delayed:
		# # start_in: 2 hours
		# script:
		# - in_format=MC
		# - out_format=BINAURAL BINAURAL_ROOM_IR BINAURAL_ROOM_REVERB
		# - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" \|\| ret_val=$?
		# - *complexity-measurements-prepare-artifacts
		# - exit $ret_val
		complexity-mc-in-binaural_room_ir-out:
		extends:
		- .complexity-template
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 12 hours 30 minutes
		script:
		- in_format=MC
		- out_format=BINAURAL_ROOM_IR
		- ret_val=0
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" \|\| ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		# complexity-masa-in-ext-out:
		# extends:
		# - .complexity-template
		# rules:
		# - if: $MEASURE_COMPLEXITY_LINUX
		# # when: delayed:
		# # start_in: 2 hours
		# script:
		# - in_format=MASA
		# - out_format=EXT
		# - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" \|\| ret_val=$?
		# - *complexity-measurements-prepare-artifacts
		# - exit $ret_val
		complexity-masa-in-ext-out:
		extends:
		- .complexity-template
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 15 hours
		script:
		- in_format=MASA
		- out_format=EXT
		- ret_val=0
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" \|\| ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		# complexity-masa-in-binaural-out:
		# extends:
		# - .complexity-template
		# rules:
		# - if: $MEASURE_COMPLEXITY_LINUX
		# # when: delayed:
		# # start_in: 2 hours
		# script:
		# - in_format=MASA
		# - out_format="BINAURAL BINAURAL_ROOM_IR BINAURAL_ROOM_REVERB"
		# - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" \|\| ret_val=$?
		# - *complexity-measurements-prepare-artifacts
		# - exit $ret_val
		complexity-masa-in-binaural-out:
		extends:
		- .complexity-template
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 16 hours
		script:
		- in_format=MASA
		- out_format=BINAURAL
		- ret_val=0
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" \|\| ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		complexity-masa-in-hoa3-out:
		extends:
		- .complexity-template
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 17 hours
		script:
		- in_format=MASA
		- out_format=HOA3
		- ret_val=0
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" \|\| ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		# complexity-omasa-in-ext-out:
		# extends:
		# - .complexity-template
		# rules:
		# - if: $MEASURE_COMPLEXITY_LINUX
		# # when: delayed:
		# # start_in: 2 hours
		# when: delayed
		# start_in: 13 hours
		# script:
		# - in_format=OMASA
		# - out_format=EXT
		# - ret_val=0
		# - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" \|\| ret_val=$?
		# - *complexity-measurements-prepare-artifacts
		# - exit $ret_val

		# complexity-omasa-in-binaural-out:
		# extends:
		# - .complexity-template
		# rules:
		# - if: $MEASURE_COMPLEXITY_LINUX
		# # when: delayed:
		# # start_in: 2 hours
		# script:
		# - in_format=OMASA
		# - out_format="BINAURAL BINAURAL_ROOM_IR BINAURAL_ROOM_REVERB"
		# - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" \|\| ret_val=$?
		# - *complexity-measurements-prepare-artifacts
		# - exit $ret_val
		complexity-omasa-in-binaural-out:
		extends:
		- .complexity-template
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 18 hours
		script:
		- in_format=OMASA
		- out_format=BINAURAL
		- ret_val=0
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" \|\| ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		# complexity-StereoDmxEVS-stereo-in-mono-out:
		complexity-omasa-in-hoa3-out:
		extends:
		- .complexity-template
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 20 hours
		script:
		- in_format=OMASA
		- out_format=HOA3
		- ret_val=0
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" \|\| ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		complexity-StereoDmxEVS-stereo-in-mono-out:
		extends:
		- .complexity-template
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 22 hours
		script:
		- in_format=StereoDmxEVS
		- out_format=mono
		- ret_val=0
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" \|\| ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		# complexity-osba-in-ext-out:
		# extends:
		# - .complexity-template
		# rules:
		# - if: $MEASURE_COMPLEXITY_LINUX
		# # when: delayed:
		# # start_in: 2 hours
		# when: delayed
		# start_in: 17 hours
		# script:
		# - in_format=StereoDmxEVS
		# - out_format=mono
		# - in_format=OSBA
		# - out_format=EXT
		# - ret_val=0
		# - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" \|\| ret_val=$?
		# - *complexity-measurements-prepare-artifacts
		# - exit $ret_val

		complexity-osba-in-binaural-out:
		extends:
		- .complexity-template
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 22 hours 30 minutes
		script:
		- in_format=OSBA
		- out_format=BINAURAL
		- ret_val=0
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" \|\| ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		complexity-osba-in-binaural_room_ir-out:
		extends:
		- .complexity-template
		rules:
		- if: $MEASURE_COMPLEXITY_LINUX
		when: delayed
		start_in: 25 hours
		script:
		- in_format=OSBA
		- out_format=BINAURAL_ROOM_IR
		- ret_val=0
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" \|\| ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		# job that sets up gitlab pages website
		pages:

apps/encoder.c

+18 −1

Original line number	Diff line number	Diff line
		@@ -937,7 +937,19 @@ static bool parseCmdlIVAS_enc(
		return false;
		}
		}

		#ifdef DEBUG_MODE_INFO
		#ifdef DEBUG_MODE_INFO_TWEAK
		/-----------------------------------------------------------------
		* Define additional subfolder for debug info output in ./res
		-----------------------------------------------------------------/
		else if ( strcmp( argv_to_upper, "-INFO" ) == 0 )
		{
		extern char infoFolder[FILENAME_MAX];
		strncpy( infoFolder, argv[i + 1], sizeof( infoFolder ) );
		i += 2;
		}
		#endif /* #ifdef DEBUG_MODE_INFO_TWEAK */
		#endif /* #ifdef DEBUG_MODE_INFO */

		/-----------------------------------------------------------------
		* deactivate delay compensation
		@@ -1637,6 +1649,11 @@ static void usage_enc( void )
		fprintf( stdout, "-pca : activate PCA in SBA format FOA at 256 kbps \n" );
		fprintf( stdout, "-level level : Complexity level, level = (1, 2, 3), will be defined after characterisation. \n" );
		fprintf( stdout, " Currently, all values default to level 3 (full functionality).\n" );
		#ifdef DEBUG_MODE_INFO
		#ifdef DEBUG_MODE_INFO_TWEAK
		fprintf( stdout, "-info <folder> : specify subfolder name for debug output\n" );
		#endif
		#endif
		fprintf( stdout, "-q : Quiet mode, no frame counters\n" );
		fprintf( stdout, " default is deactivated\n" );
		fprintf( stdout, "\n" );

lib_com/bits_alloc_fx.c

+170 −19

File changed.

Preview size limit exceeded, changes collapsed.

lib_com/cnst.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -2251,8 +2251,11 @@ typedef enum _DCTTYPE
		#define HVQ_NSUB_24k 7 /* HVQ Classifier number of subbands */

		#define HQ_CREST_THRESHOLD 7.0f /* HQ harmonic high band classifier, crest threshold */
		#define HQ_CREST_THRESHOLD_FX 1879048192 //7.0f in Q28 /* HQ harmonic high band classifier, crest threshold */
		#define HQ_CREST_MOD_THRESHOLD 2.128f /* HQ harmonic high band classifier, modified crest threshold */
		#define HQ_CREST_MOD_THRESHOLD_FX 1142461301 //2.128f in Q29 /* HQ harmonic high band classifier, modified crest threshold */
		#define HQ_CREST_FAC_SM 0.97f /* HQ harmonic high band classifier, smoothing factor */
		#define HQ_CREST_FAC_SM_FX 2083059139 //0.97f in Q31 /* HQ harmonic high band classifier, smoothing factor */

		#define HVQ_BWE_NOISE_BANDS 2 /* Number of BWE noise bands */
		#define HVQ_BWE_WEIGHT1 0.95f

lib_com/hq_bit_allocation_fx.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -227,7 +227,6 @@ move16();

		return;
		}

		void hq_bit_allocation_fx(
		const Word32 core_brate, /* i : Core bit-rate Q0 */
		const Word16 length, /* i : Frame length Q0 */