Merge branch 'main' into update-basop-ci-branch (bfde4bc5) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitlab-ci.yml

+12 −12

Original line number	Diff line number	Diff line
		@@ -2289,8 +2289,8 @@ complexity-stereo-in-stereo-out:
		- *complexity-measurements-setup
		- in_format=stereo
		- out_format=stereo
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format"
		- ret_val=$?
		- ret_val=0
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" \|\| ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		@@ -2307,8 +2307,8 @@ complexity-ism-in-binaural-out:
		- *complexity-measurements-setup
		- in_format=ISM
		- out_format=BINAURAL
		- bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format"
		- ret_val=$?
		- 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

		@@ -2325,8 +2325,8 @@ complexity-sba-hoa3-in-hoa3-out:
		- *complexity-measurements-setup
		- in_format=HOA3
		- out_format=HOA3
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format"
		- ret_val=$?
		- ret_val=0
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" \|\| ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		@@ -2343,8 +2343,8 @@ complexity-mc-in-7_1_4-out:
		- *complexity-measurements-setup
		- in_format=MC
		- out_format=7_1_4
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format"
		- ret_val=$?
		- ret_val=0
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" \|\| ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		@@ -2361,8 +2361,8 @@ complexity-masa-in-7_1_4-out:
		- *complexity-measurements-setup
		- in_format=MASA
		- out_format=7_1_4
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format"
		- ret_val=$?
		- ret_val=0
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" \|\| ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

		@@ -2379,8 +2379,8 @@ complexity-StereoDmxEVS-stereo-in-mono-out:
		- *complexity-measurements-setup
		- in_format=StereoDmxEVS
		- out_format=mono
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format"
		- ret_val=$?
		- ret_val=0
		- bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" \|\| ret_val=$?
		- *complexity-measurements-prepare-artifacts
		- exit $ret_val

ci/complexity_measurements/check_for_changes.py

+4 −1

Original line number	Diff line number	Diff line
		import argparse
		import csv
		import sys
		import numpy as np


		THRESH = 0.01
		@@ -32,6 +31,10 @@ def check_linewise_logfile(filepath, cols):
		change_ratios = [abs(float(curr[i]) / float(prev[i]) - 1) > THRESH for i in cols]
		changes_found = any(change_ratios)

		if changes_found:
		print("Previous log line:", prev)
		print("Current log line:", curr)

		return changes_found

lib_com/ivas_cnst.h

+6 −2

Original line number	Diff line number	Diff line
		@@ -1292,10 +1292,14 @@ typedef enum
		#define LFE_CHANNEL 3

		#define MIN_LFE_NRG 0.5f
		#define MCT_MAX_CHANNELS MAX_TRANSPORT_CHANNELS
		#ifdef ADJUST_MCT_CHANNELS_MAX
		#define MCT_MAX_CHANNELS 11 /* == 7.1.4 LS channels without the LFE channel */
		#define MCT_MAX_BLOCKS ( ( MCT_MAX_CHANNELS + 1 ) / CPE_CHANNELS ) /* max. number of channel pairs (MCT_MAX_CHANNELS/2) within MCT*/
		#else
		#define MCT_MAX_CHANNELS 12
		#define MCT_MAX_BLOCKS ( MCT_MAX_CHANNELS / CPE_CHANNELS ) /* max. number of channel pairs (MCT_MAX_CHANNELS/2) within MCT*/

		#define MAX_NUM_DATA max( MCT_MAX_CHANNELS, 4 )
		#endif

		#define NBBITS_MCT_RATIO 4
		#define BITRATE_MCT_RATIO_RANGE ( 1 << NBBITS_MCT_RATIO ) /* Range of the coded bitrate distribution ratio */

lib_com/ivas_prot.h

+11 −9

Original line number	Diff line number	Diff line
		@@ -84,7 +84,13 @@ void ivas_write_format(
		void ivas_write_format_sid(
		const IVAS_FORMAT ivas_format, /* i : IVAS format */
		const int16_t element_mode, /* i : element bitrate */
		#ifdef NONBE_FIX_1052_SBA_EXT_FIX
		BSTR_ENC_HANDLE hBstr, /* i/o: encoder bitstream handle */
		const int16_t sba_order, /* i : Ambisonic (SBA) order */
		const int16_t sba_planar /* i : SBA planar flag */
		#else
		BSTR_ENC_HANDLE hBstr /* i/o: encoder bitstream handle */
		#endif
		);

		ivas_error create_sce_enc(
		@@ -3039,11 +3045,7 @@ void mctStereoIGF_enc(
		MCT_ENC_HANDLE hMCT, /* i/o: MCT encoder structure */
		Encoder_State *sts, / i/o: encoder state structure */
		float orig_spectrum[MCT_MAX_CHANNELS][NB_DIV], / i : MDCT spectrum for ITF */
		#ifdef NONBE_FIX_1097_SBA_DTX_BRATE_SWITCHING_ENC
		float powerSpec[MCT_MAX_CHANNELS], / i/o: MDCT^2 + MDST^2 spectrum,or estimate */
		#else
		float powerSpec[MCT_MAX_CHANNELS][L_FRAME48k], /* i/o: MDCT^2 + MDST^2 spectrum,or estimate */
		#endif
		float powerSpecMsInv[MCT_MAX_CHANNELS][NB_DIV], / i : same as above but for inverse spect. */
		float inv_spectrum[MCT_MAX_CHANNELS][NB_DIV], / i : inverse spectrum */
		const int16_t sp_aud_decision0[MCT_MAX_CHANNELS] /* i : speech audio decision */
		@@ -3496,7 +3498,7 @@ int16_t ivas_sba_get_nchan_metadata(
		const int32_t ivas_total_brate /* i : IVAS total bitrate */
		);

		/! r: number of bits in SPAR SID frame /
		/! r: number of bits in SBA SPAR SID frame /
		int16_t ivas_sba_spar_sid_bitlen(
		const int16_t nchan_transport /* i : number of transport channels */
		);

lib_com/ivas_rom_com.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -2471,6 +2471,13 @@ const uint16_t ivas_param_mc_sym_freq_ild_delta_combined_48_16bits[2 * PARAM_MC_
		* MASA ROM tables
		----------------------------------------------------------------------------------/

		#ifdef FIX_1121_MASA_DESCRIPTOR
		const uint8_t ivasmasaFormatDescriptor[8] =
		{
		0x49, 0x56, 0x41, 0x53, 0x4D, 0x41, 0x53, 0x41 /* "IVASMASA" */
		};

		#endif
		const float diffuseness_reconstructions_hr[HR_MASA_ER_LEVELS] =
		{
		0.00f,