Merge branch 'main' into... (e48c72bf) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitlab-ci.yml

+1 −1

Original line number	Diff line number	Diff line
		@@ -2233,7 +2233,7 @@ coverage-test-on-main-scheduled:
		&complexity-measurements-setup # create necessary environment
		- mkdir -p wmops/logs

		- job_id=$(python3 ci/get_id_of_last_job_occurence.py $CI_COMMIT_REF_NAME $CI_JOB_NAME $CI_PROJECT_ID --success_only)
		- job_id=$(python3 ci/get_id_of_last_job_occurence.py $CI_COMMIT_REF_NAME $CI_JOB_NAME $CI_PROJECT_ID)
		- echo $job_id
		- curl --request GET "https://forge.3gpp.org/rep/api/v4/projects/$CI_PROJECT_ID/jobs/$job_id/artifacts" --output artifacts.zip
		- unzip artifacts.zip \|\| true # this may fail on first run, when there are no artifacts there and the zip file is actually just "404"-html

Workspace_msvc/lib_util.vcxproj

+2 −0

Original line number	Diff line number	Diff line
		@@ -101,6 +101,7 @@
		</ItemDefinitionGroup>
		<ItemGroup>
		<ClCompile Include="..\lib_util\aeid_file_reader.c" />
		<ClCompile Include="..\lib_util\ambi_convert.c" />
		<ClCompile Include="..\lib_util\audio_file_reader.c" />
		<ClCompile Include="..\lib_util\audio_file_writer.c" />
		<ClCompile Include="..\lib_util\bitstream_reader.c" />
		@@ -128,6 +129,7 @@
		</ItemGroup>
		<ItemGroup>
		<ClInclude Include="..\lib_util\aeid_file_reader.h" />
		<ClInclude Include="..\lib_util\ambi_convert.h" />
		<ClInclude Include="..\lib_util\audio_file_reader.h" />
		<ClInclude Include="..\lib_util\audio_file_writer.h" />
		<ClInclude Include="..\lib_util\bitstream_reader.h" />

ci/basop-pages/create_report_pages.py

+25 −6

Original line number	Diff line number	Diff line
		@@ -3,6 +3,7 @@ import pathlib
		import argparse
		from functools import partial

		FORMATS = ["Stereo", "ISM", "Multichannel", "MASA", "SBA", "OSBA", "OMASA", "Renderer"]

		CSV_DELIM = ";"
		SUBPAGE_TMPL_CSS = """
		@@ -25,7 +26,7 @@ SUBPAGE_TMPL_CSS = """

		SUBPAGE_TMPL_HTML = """

		<h1>Report for job {job_name}</h1
		<h1>Report for job {job_name}</h1>

		Comparing:
		<ul>
		@@ -35,6 +36,10 @@ Comparing:
		</ul>

		<br>
		<h2><a href="summary_{job_name}.html">Summary page</a></h2>
		<br>
		<br>

		<b>How is the table sorted?</b>
		<ul>
		<li>Cases with result ERROR or invalid/missing values for the numerical measures are given first</li>
		@@ -92,9 +97,17 @@ ARROW_DOWN = '<span class="arrowdown">⬂</span>'

		# expected columns. actual columns are filtered from the incoming data later, this
		# is mainly for controlling the order in the output table
		COLUMNS = ["testcase", "Result", "MLD", "MAXIMUM ABS DIFF", "MIN_SSNR"]
		COLUMNS = [
		"testcase",
		"Format",
		"Category",
		"Result",
		"MLD",
		"MAXIMUM ABS DIFF",
		"MIN_SSNR",
		]
		COLUMNS_GLOBAL = COLUMNS[:1]
		COLUMNS_DIFFERENTIAL = COLUMNS[1:]
		COLUMNS_DIFFERENTIAL = COLUMNS[3:]
		COLUMNS_DIFFERENTIAL_NOT_MLD = COLUMNS_DIFFERENTIAL[2:]


		@@ -128,6 +141,7 @@ def create_subpage(
		table_body = "\n".join(
		tr_from_row(row, id_current, id_previous) for row in merged_reports
		)

		new_subpage = SUBPAGE_TMPL_CSS + SUBPAGE_TMPL_HTML.format(
		id_current=id_current,
		id_previous=id_previous,
		@@ -226,8 +240,9 @@ def merge_and_cleanup_mld_reports(
		are uninteresting and are put last.
		"""
		try:
		float(x[mld_col_curr])
		float(x[mld_col_prev])
		cols = [mld_col_curr, mld_col_prev] + [p[1] for p in other_col_pairs]
		for c in cols:
		float(x[c])
		except ValueError:
		# Value is no valid floating point value
		return float("inf")
		@@ -276,7 +291,10 @@ def merge_tables(tbl1, tbl2, suffix1, suffix2, merge_key, other_keys):
		if row1[merge_key] == row2[merge_key]:
		new_row[merge_key] = row1[merge_key]
		for key in other_keys:
		if key in row2: # In case key is missing, just insert a blank
		new_row[f"{key}-{suffix2}"] = row2[key]
		else:
		new_row[f"{key}-{suffix2}"] = ""
		break

		merged.append(new_row)
		@@ -284,6 +302,7 @@ def merge_tables(tbl1, tbl2, suffix1, suffix2, merge_key, other_keys):
		return merged



		if __name__ == "__main__":
		parser = argparse.ArgumentParser()
		parser.add_argument("html_out")

ci/basop-pages/create_summary_page.py

0 → 100644

+55 −0

Original line number	Diff line number	Diff line
		import argparse

		from create_report_pages import SUBPAGE_TMPL_CSS, FORMATS

		MEASURES = ["MLD","DIFF","SSNR"]

		SUMMARY_PAGE_TMPL_HTML = """

		<h1>Summary for job {job_name}, ID: {id_current}</h1>

		{images}

		"""

		def create_summary_page(
		html_out,
		id_current: int,
		job_name: str,
		):
		images = histogram_summary(job_name)

		new_summary_page = SUBPAGE_TMPL_CSS + SUMMARY_PAGE_TMPL_HTML.format(
		id_current=id_current,
		job_name=job_name,
		images=images,
		)
		with open(html_out, "w") as f:
		f.write(new_summary_page)

		def histogram_summary(
		job_name:str,
		):
		images = "<hr>"
		for m in MEASURES:
		images += (
		f"<h2>{m} summary {job_name}</h2>\n"
		+ " ".join(
		[f"<img src=images_{job_name}/summary_{m}_{x}.png>" for x in FORMATS]
		)
		+ f'\n<br><a href="images_{job_name}/summary_{m}.csv">summary_{m}.csv</a><hr>\n\n'
		)
		return images

		if __name__ == "__main__":
		parser = argparse.ArgumentParser()
		parser.add_argument("html_out")
		parser.add_argument("id_current", type=int)
		parser.add_argument("job_name")
		args = parser.parse_args()

		create_summary_page(
		args.html_out,
		args.id_current,
		args.job_name,
		)

lib_com/ivas_cnst.h

+0 −6

Original line number	Diff line number	Diff line
		@@ -1289,14 +1289,8 @@ typedef enum
		#define LFE_CHANNEL 3

		#define MIN_LFE_NRG 0.5f
		#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 */