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

ci/complexity_measurements/index_complexity.html

+13 −20

Original line number	Diff line number	Diff line
		@@ -561,18 +561,17 @@ function WMOPS_perOP() {

		}

		function memTickFormatter(v, axis) {
		var decimals = axis.tickDecimals;
		var str_val = "";
		if (v > 1000000) {
		str_val = (v / 1000000).toFixed(decimals) + " MB";
		}
		else if (v > 1000) {
		str_val = (v / 1000).toFixed(decimals) + " kB";
		}
		else {
		str_val = v.toFixed(decimals) + " B";
		}
		function memTickFormatter(val_bytes, axis) {
		if (val_bytes == 0) return '0 B';

		const decimals = 2;
		const step = 1000;
		const unit = ['B', 'KB', 'MB'];

		var idx = Math.floor(Math.log(val_bytes) / Math.log(step));
		var val_decimal = (val_bytes / Math.pow(step, idx)).toFixed(decimals);
		var str_val = val_decimal + " " + unit[idx];

		return str_val;
		}

		@@ -629,10 +628,7 @@ function RAM() {
		var x = item.datapoint[0];
		var y = item.datapoint[1];
		var text = "<u><b>" + item.series.id + "</b></u><br>"
		text += 'Score: ' + y;

		text += " bytes";
		text += "<br>";
		text += 'Score: ' + memTickFormatter(y) + " (" + y + " B)" + "<br>";

		if (x > 0) {
		var thisValue = parseFloat(y);
		@@ -769,10 +765,7 @@ function ROM() {
		var x = item.datapoint[0];
		var y = item.datapoint[1];
		var text = "<u><b>" + item.series.id + "</b></u><br>"
		text += 'Score: ' + y;

		text += " bytes";
		text += "<br>";
		text += 'Score: ' + memTickFormatter(y) + " (" + y + " B)" + "<br>";

		if (x > 0) {
		var thisValue = parseFloat(y);

lib_com/options.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -160,6 +160,7 @@

		/#define FIX_I4_OL_PITCH/ /* fix open-loop pitch used for EVS core switching */
		#define TMP_FIX_1119_SPLIT_RENDERING_VOIP /* FhG: Add error check for unsupported config: split rendering with VoIP mode */
		#define FIX_1285_RENDER_CONFIG_PTR_COMPARE /* Philips: Warning about pointer comparison in the render config reader */

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

		@@ -172,9 +173,9 @@
		#define NONBE_1273_ISM_METADATA_COUNTER /* VA: issue 1273: fix counter overflow in ISM metadata encoder */
		#define NONBE_1279_COUNTER_OVERFLOW /* VA: issue 1279: Avoid possible overflow of counter st->Nb_ACELP_frames */
		#define NONBE_1244_FIX_SWB_BWE_MEMORY /* VA: issue 1244: fix to SWB BWE memory in case of switching from FB coding - pending a review by Huawei */
		#define NONBE_FIX_1180_HQMDCT_PHECU_LT_MUTING /* Ericsson: issue 1180, corrected long term mute loop attnuation after 200ms in PhECU-PLC */
		#define NONBE_FIX_1277_EVS_DTX_HIGH_RATE_THRESHOLD /* VA/Eri: issue 1277: Fix Mismatch in DTX high-rate threshold between EVS float and BASOP */


		#define NONBE_1231_BASOP_819_THRESHOLD_MASA2TOTAL /* Nokia: add fix for precision limitation in comparison with masa2total energy ratio threshold to be aligned with BASOP*/
		/* ##################### End NON-BE switches ########################### */

lib_dec/FEC_HQ_phase_ecu.c

+32 −4

Original line number	Diff line number	Diff line
		@@ -263,6 +263,9 @@ static void trans_ana(
		const int16_t time_offs, /* i : Time offset */
		const float est_mus_content, /* i : 0.0=speech_like ... 1.0=Music (==st->env_stab ) */
		const int16_t last_fec, /* i : signal that previous frame was concealed with fec_alg*/
		#ifdef NONBE_FIX_1180_HQMDCT_PHECU_LT_MUTING
		const int16_t element_mode, /* i : element_mode req to handle EVS_MONO specific BE path */
		#endif
		float alpha, / o : Magnitude modification factors for fade to average */
		float beta, / o : Magnitude modification factors for fade to average */
		float beta_mute, / o : Factor for long-term mute */
		@@ -416,10 +419,27 @@ static void trans_ana(
		{
		mag_chg[k] = 0;
		}
		#ifdef NONBE_FIX_1180_HQMDCT_PHECU_LT_MUTING
		if ( element_mode != EVS_MONO )
		{
		if ( k == 0 && burst_len > BETA_MUTE_THR ) /* beta_mute final long term attenuation adjusted only once per frame in the first sub-band, Ref Eq(184) in 26.447 */
		{
		beta_mute = BETA_MUTE_FAC;
		}
		}
		else
		{
		if ( burst_len > BETA_MUTE_THR ) /* legacy incorrect(too fast) EVS_MONO operation, still kept for BE. To be updated after EVS CR, ref Eq (184) in 26.447 */
		{
		beta_mute = BETA_MUTE_FAC;
		}
		}
		#else
		if ( burst_len > BETA_MUTE_THR )
		{
		beta_mute = BETA_MUTE_FAC;
		}
		#endif
		alpha[k] = mag_chg[k];
		beta[k] = (float) ( sqrt( 1.0f - SQR( alpha[k] ) ) * *beta_mute );
		if ( k >= LGW32k - 1 )
		@@ -2094,7 +2114,11 @@ static void hq_phase_ecu(
		time_offs = 0; / IVAS reset of offset time counter, timeoffset variable later also used to calculate burst length */
		}

		#ifdef NONBE_FIX_1180_HQMDCT_PHECU_LT_MUTING
		trans_ana( prevsynth + 2 * output_frame - Lprot - time_offs + ph_ecu_lookahead, mag_chg, &ph_dith, mag_chg_1st, output_frame, time_offs, env_stab, *last_fec, element_mode, alpha, beta, beta_mute, Xavg );
		#else
		trans_ana( prevsynth + 2 * output_frame - Lprot - time_offs + ph_ecu_lookahead, mag_chg, &ph_dith, mag_chg_1st, output_frame, time_offs, env_stab, *last_fec, alpha, beta, beta_mute, Xavg );
		#endif
		spec_ana( prevsynth + 2 * output_frame - Lprot - *time_offs + ph_ecu_lookahead, plocs, plocsi, num_p, X_sav, output_frame, bwidth, element_mode, &noise_fac, pcorr );

		if ( prev_bfi && *last_fec )
		@@ -2122,7 +2146,11 @@ static void hq_phase_ecu(
		time_offs = (int16_t) INT16_MAX; / high value --> continued muting will ensure that the now saturated seed is not creating tones */
		}

		#ifdef NONBE_FIX_1180_HQMDCT_PHECU_LT_MUTING
		trans_ana( prevsynth + 2 * output_frame - Lprot, mag_chg, &ph_dith, mag_chg_1st, output_frame, time_offs, env_stab, 0, element_mode, alpha, beta, beta_mute, Xavg ); / 1.0 stable-music, 0.0 speech-like */
		#else
		trans_ana( prevsynth + 2 * output_frame - Lprot, mag_chg, &ph_dith, mag_chg_1st, output_frame, time_offs, env_stab, 0, alpha, beta, beta_mute, Xavg ); / 1.0 stable-music, 0.0 speech-like */
		#endif
		}

		mvr2r( X_sav, X, Lprot );

lib_util/render_config_reader.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -2369,7 +2369,11 @@ ivas_error RenderConfigReader_read(
		errorHandler( item, ERROR_VALUE_INVALID );
		return IVAS_ERR_INVALID_RENDER_CONFIG;
		}
		#ifdef FIX_1285_RENDER_CONFIG_PTR_COMPARE
		if ( i >= pRenderConfigReader->nFG \|\| pRenderConfigReader->pFG[i].pFc == NULL )
		#else
		if ( i > pRenderConfigReader->nFG \|\| &pRenderConfigReader->pFG[i] == NULL )
		#endif
		{
		return IVAS_ERR_INVALID_RENDER_CONFIG;
		}

scripts/config/ivas_modes.json

+184 −0

Original line number	Diff line number	Diff line
		@@ -3601,6 +3601,52 @@
		]
		}
		},
		"ISM+1_b{bitrate}_{bandwidth}_rs": {
		"encmodeoption": [
		"-ism",
		"+1"
		],
		"encoptions": [
		"-max_band",
		"{bandwidth}"
		],
		"dec": {
		"7_1_4": [],
		"7_1": [],
		"5_1_4": [],
		"5_1_2": [],
		"5_1": [],
		"BINAURAL": [],
		"BINAURAL_ROOM_IR": [],
		"BINAURAL_ROOM_REVERB": [],
		"HOA3": [],
		"HOA2": [],
		"FOA": [],
		"mono": [],
		"stereo": [],
		"EXT": []
		},
		"in_config": "ISM1",
		"table_name": "ISM+1@{table_bitrate} RS {bandwidth}",
		"nummetadata": 1,
		"metadatafilenames": [
		"stvISM{mdi}.csv"
		],
		"rs": true,
		"amr": false,
		"mono": false,
		"bitrates": {
		"wb": {
		"all": "{sw_files_path}/sw_13k2_128k.bin"
		},
		"swb": {
		"all": "{sw_files_path}/sw_13k2_128k.bin"
		},
		"fb": {
		"all": "{sw_files_path}/sw_32k_128k.bin"
		}
		}
		},
		"ISM+1_b{bitrate}_dtx_{bandwidth}_cbr": {
		"encmodeoption": [
		"-ism",
		@@ -3745,6 +3791,52 @@
		]
		}
		},
		"ISM+2_b{bitrate}_{bandwidth}_rs": {
		"encmodeoption": [
		"-ism",
		"+2"
		],
		"encoptions": [
		"-max_band",
		"{bandwidth}"
		],
		"dec": {
		"7_1_4": [],
		"7_1": [],
		"5_1_4": [],
		"5_1_2": [],
		"5_1": [],
		"BINAURAL": [],
		"BINAURAL_ROOM_IR": [],
		"BINAURAL_ROOM_REVERB": [],
		"HOA3": [],
		"HOA2": [],
		"FOA": [],
		"mono": [],
		"stereo": [],
		"EXT": []
		},
		"in_config": "ISM2",
		"table_name": "ISM+2@{table_bitrate} RS {bandwidth}",
		"nummetadata": 2,
		"metadatafilenames": [
		"stvISM{mdi}.csv"
		],
		"rs": true,
		"amr": false,
		"mono": false,
		"bitrates": {
		"wb": {
		"all": "{sw_files_path}/sw_16k4_256k.bin"
		},
		"swb": {
		"all": "{sw_files_path}/sw_16k4_256k.bin"
		},
		"fb": {
		"all": "{sw_files_path}/sw_32k_256k.bin"
		}
		}
		},
		"ISM+2_b{bitrate}_dtx_{bandwidth}_cbr": {
		"encmodeoption": [
		"-dtx",
		@@ -3897,6 +3989,52 @@
		]
		}
		},
		"ISM+3_b{bitrate}_{bandwidth}_rs": {
		"encmodeoption": [
		"-ism",
		"+3"
		],
		"encoptions": [
		"-max_band",
		"{bandwidth}"
		],
		"dec": {
		"7_1_4": [],
		"7_1": [],
		"5_1_4": [],
		"5_1_2": [],
		"5_1": [],
		"BINAURAL": [],
		"BINAURAL_ROOM_IR": [],
		"BINAURAL_ROOM_REVERB": [],
		"HOA3": [],
		"HOA2": [],
		"FOA": [],
		"mono": [],
		"stereo": [],
		"EXT": []
		},
		"in_config": "ISM3",
		"table_name": "ISM+3@{table_bitrate} kbps RS {bandwidth}",
		"nummetadata": 3,
		"metadatafilenames": [
		"stvISM{mdi}.csv"
		],
		"rs": true,
		"amr": false,
		"mono": false,
		"bitrates": {
		"wb": {
		"all": "{sw_files_path}/sw_24k4_384k.bin"
		},
		"swb": {
		"all": "{sw_files_path}/sw_24k4_384k.bin"
		},
		"fb": {
		"all": "{sw_files_path}/sw_32k_384k.bin"
		}
		}
		},
		"ISM+3_b{bitrate}_dtx_{bandwidth}_cbr": {
		"encmodeoption": [
		"-dtx",
		@@ -4053,6 +4191,52 @@
		]
		}
		},
		"ISM+4_b{bitrate}_{bandwidth}_rs": {
		"encmodeoption": [
		"-ism",
		"+4"
		],
		"encoptions": [
		"-max_band",
		"{bandwidth}"
		],
		"dec": {
		"7_1_4": [],
		"7_1": [],
		"5_1_4": [],
		"5_1_2": [],
		"5_1": [],
		"BINAURAL": [],
		"BINAURAL_ROOM_IR": [],
		"BINAURAL_ROOM_REVERB": [],
		"HOA3": [],
		"HOA2": [],
		"FOA": [],
		"mono": [],
		"stereo": [],
		"EXT": []
		},
		"in_config": "ISM4",
		"table_name": "ISM+4@{table_bitrate} kbps RS {bandwidth}",
		"nummetadata": 4,
		"metadatafilenames": [
		"stvISM{mdi}.csv"
		],
		"rs": true,
		"amr": false,
		"mono": false,
		"bitrates": {
		"wb": {
		"all": "{sw_files_path}/sw_24k4_384k.bin"
		},
		"swb": {
		"all": "{sw_files_path}/sw_24k4_384k.bin"
		},
		"fb": {
		"all": "{sw_files_path}/sw_32k_384k.bin"
		}
		}
		},
		"ISM+4_b{bitrate}_dtx_{bandwidth}_cbr": {
		"encmodeoption": [
		"-dtx",