Merge remote-tracking branch 'origin/main' into fix_pages_job (58ce7c41) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitlab-ci.yml

+1 −68

Original line number	Diff line number	Diff line
		@@ -1080,82 +1080,15 @@ complexity-StereoDmxEVS-stereo-in-mono-out:
		# Other jobs
		# ---------------------------------------------------------------


		# helper for pages job
		.unzip-or-cat: &unzip-or-cat
		- unzip -t $ARTIFACTS >> /dev/null
		- if [ $? -eq 0 ]; then unzip -o $ARTIFACTS; rm $ARTIFACTS; else cat $ARTIFACTS; rm $ARTIFACTS; fi

		# job that sets up gitlab pages website
		# is run on a separate schedule and collects artifacts from other jobs (currently
		# only the complexity measurements) multiple times a day
		pages:
		stage: deploy
		tags:
		- ivas-linux
		rules:
		- if: $UPDATE_PAGES
		# TODO: add coverage job
		script:

		- API_URL_BASE=https://forge.3gpp.org/rep/api/v4/projects/$CI_PROJECT_ID/jobs
		- branch=$CI_COMMIT_REF_NAME

		- mkdir public
		- ARTIFACTS=artifacts.zip

		### fetch artifacts from latest run of complexity jobs
		- job_id=$(python3 ci/get_id_of_last_job_occurence.py $branch complexity-stereo-in-stereo-out)
		- echo $job_id
		- echo "$API_URL_BASE/$job_id/artifacts"
		- curl --request GET "$API_URL_BASE/$job_id/artifacts" --output $ARTIFACTS
		- *unzip-or-cat
		- mv complexity-stereo-in-stereo-out-public ./public/

		- job_id=$(python3 ci/get_id_of_last_job_occurence.py $branch complexity-ism-in-binaural-out)
		- echo $job_id
		- echo "$API_URL_BASE/$job_id/artifacts"
		- curl --request GET "$API_URL_BASE/$job_id/artifacts" --output $ARTIFACTS
		- *unzip-or-cat
		- mv complexity-ism-in-binaural-out-public ./public/

		- job_id=$(python3 ci/get_id_of_last_job_occurence.py $branch complexity-sba-hoa3-in-hoa3-out)
		- echo $job_id
		- echo "$API_URL_BASE/$job_id/artifacts"
		- curl --request GET "$API_URL_BASE/$job_id/artifacts" --output $ARTIFACTS
		- *unzip-or-cat
		- mv complexity-sba-hoa3-in-hoa3-out-public ./public/

		- job_id=$(python3 ci/get_id_of_last_job_occurence.py $branch complexity-mc-in-7_1_4-out)
		- echo $job_id
		- echo "$API_URL_BASE/$job_id/artifacts"
		- curl --request GET "$API_URL_BASE/$job_id/artifacts" --output $ARTIFACTS
		- *unzip-or-cat
		- mv complexity-mc-in-7_1_4-out-public ./public/

		- job_id=$(python3 ci/get_id_of_last_job_occurence.py $branch complexity-masa-in-7_1_4-out)
		- echo $job_id
		- echo "$API_URL_BASE/$job_id/artifacts"
		- curl --request GET "$API_URL_BASE/$job_id/artifacts" --output $ARTIFACTS
		- *unzip-or-cat
		- mv complexity-masa-in-7_1_4-out-public ./public/

		- job_id=$(python3 ci/get_id_of_last_job_occurence.py $branch complexity-StereoDmxEVS-stereo-in-mono-out)
		- echo $job_id
		- echo "$API_URL_BASE/$job_id/artifacts"
		- curl --request GET "$API_URL_BASE/$job_id/artifacts" --output $ARTIFACTS
		- *unzip-or-cat
		- mv complexity-StereoDmxEVS-stereo-in-mono-out-public ./public/

		### collect artifacts from coverage job
		- job_id=$(python3 ci/get_id_of_last_job_occurence.py $branch coverage-test-on-main-scheduled)
		- echo $job_id
		- echo "$API_URL_BASE/$job_id/artifacts"
		- curl --request GET "$API_URL_BASE/$job_id/artifacts" --output $ARTIFACTS
		- *unzip-or-cat
		- mv coverage ./public

		- cp ci/index-pages.html public/index.html
		- python3 ci/setup_pages.py
		artifacts:
		paths:
		- public

Workspace_msvc/lib_debug.vcxproj

+1 −2

Original line number	Diff line number	Diff line
		@@ -145,7 +145,6 @@
		<ClCompile Include="..\lib_debug\debug.c" />
		<ClCompile Include="..\lib_debug\memory.c" />
		<ClCompile Include="..\lib_debug\mem_count.c" />
		<ClCompile Include="..\lib_debug\segsnr.c" />
		<ClCompile Include="..\lib_debug\snr.c" />
		<ClCompile Include="..\lib_debug\sba_debug.c" />
		<ClCompile Include="..\lib_debug\wmops.c" />

apps/renderer.c

+0 −19

Original line number	Diff line number	Diff line
		@@ -62,25 +62,6 @@
		#include <stdio.h>
		#include <string.h>

		#ifndef count_malloc
		#ifdef RAM_COUNTING_TOOL
		#define count_malloc( n1 ) MALLOC_FCT_CALL( n1 )
		#define count_calloc( n1, n2 ) CALLOC_FCT_CALL( n1, n2 )
		#define count_free( ptr ) FREE_FCT_CALL( ptr )
		#else
		#define count_malloc( n1 ) malloc( n1 )
		#define count_calloc( n1, n2 ) calloc( n1, n2 )
		#define count_free( ptr ) free( ptr )
		#endif
		#endif

		#ifndef min
		#define min( x, y ) ( ( x ) < ( y ) ? ( x ) : ( y ) )
		#endif

		#ifndef max
		#define max( x, y ) ( ( x ) > ( y ) ? ( x ) : ( y ) )
		#endif

		#define RENDERER_MAX_CLI_ARG_LENGTH ( FILENAME_MAX )
		#define RENDERER_MAX_METADATA_LENGTH 8192

ci/setup_pages.py

100644 → 100755

+4 −0

Original line number	Diff line number	Diff line
		#!/usr/bin/env python3
		import os
		import sys
		import pathlib
		@@ -36,6 +37,9 @@ def main():
		if failed_count == len(JOBS):
		sys.exit(1)

		pathlib.Path("ci/index-pages.html").rename(public_folder.joinpath("index.html"))
		sys.exit(0)


		def curl_for_artifacts(job_id):
		cmd = [

lib_com/bitstream.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -2948,14 +2948,17 @@ void evs_dec_previewFrame(

		void dtx_read_padding_bits(
		DEC_CORE_HANDLE st,
		int16_t num_bits )
		const int16_t num_bits )
		{
		/* TODO: temporary hack, need to decide what to do with core-coder bitrate */
		int32_t tmp;

		tmp = st->total_brate;
		st->total_brate = st->total_brate + num_bits * FRAMES_PER_SEC;
		get_next_indice( st, num_bits );
		st->total_brate = tmp;

		return;
		}

		#undef WMC_TOOL_MAN