Merge branch 'float-pc' of ssh://forge.3gpp.org:29419/sa4/audio/ivas-basop... (5369ebb5) · Commits · SA4 / Audio / IVAS BASOP

.gitattributes

0 → 100644

+24 −0

Original line number	Diff line number	Diff line
		# Default behavior. Converts all text files to use LF in repository.
		* text=auto

		# List all known generic text files
		*.c text
		*.csv text
		*.h text
		*.json text
		*.m text
		*.md text
		*.prm text
		*.py text
		*.txt text

		# Set Windows specific text files to always use CRLF in working tree.
		*.bat text eol=crlf
		*.cmd text eol=crlf
		*.sln text eol=crlf
		*.vcxproj text eol=crlf
		*.vcxproj.filters text eol=crlf

		# Set Unix specific text files to always use LF (also covers Windows subsystem for Linux) in working tree
		*.sh text eol=lf

.gitlab-ci.yml

+5 −9

Original line number	Diff line number	Diff line
		@@ -236,6 +236,7 @@ stages:
		- sed -i '/fetch/d' .git/config # Remove all fetch lines to clean out dead links
		- git remote set-branches --add origin "$BASOP_CI_BRANCH_PC_REPO" # Add currently used branch
		- git fetch
		- git restore --staged . # Needed if HRTF model files were updated.
		- git restore . # Just as a precaution
		- git checkout "$BASOP_CI_BRANCH_PC_REPO"
		- git reset --hard origin/"$BASOP_CI_BRANCH_PC_REPO"
		@@ -487,7 +488,7 @@ stages:

		.build-job-linux:
		stage: build
		timeout: "2 minutes"
		timeout: "20 minutes"
		needs: []
		tags:
		- ivas-basop-linux
		@@ -1705,7 +1706,7 @@ codec-smoke-test:
		# LTV update needed as ltv ISM metadata files are used
		- *update-ltv-repo
		- python3 scripts/smoketest-basop-filter.py scripts/config/ivas_modes.json --inline
		- bash ci/smoke_test.sh
		- bash ci/smoke_test.sh \|\| true
		- tar cJf logs.tar.xz out/logs/
		- ls -al logs.tar.*
		### analyze for failures
		@@ -2122,13 +2123,11 @@ ivas-interop-on-merge-request:

		- 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
		- ls
		- curl --silent --show-error --request GET "https://forge.3gpp.org/rep/api/v4/projects/$CI_PROJECT_ID/jobs/$job_id/artifacts" --output artifacts.zip
		- unzip -qq artifacts.zip \|\| true # this may fail on first run, when there are no artifacts there and the zip file is actually just "404"-html
		- public_dir="$CI_JOB_NAME-public"
		# if is needed to catch case when no artifact is there (first run), similarly as above
		- if [[ -d $public_dir ]]; then mv $public_dir/* wmops/; fi
		- ls wmops
		- rm artifacts.zip
		- rm -rf $public_dir

		@@ -2141,8 +2140,6 @@ ivas-interop-on-merge-request:
		- mkdir $public_dir/logs
		# first move logs
		- log_files=$(cat $public_dir/graphs.js \| grep logFile \| sed "s/.$wmops_newsletter_.\.csv$./\1/g")
		- echo $log_files
		- ls wmops/logs
		- for f in $log_files; do [ -f wmops/logs/$f ] && mv wmops/logs/$f $public_dir/logs/$f; done
		- mv wmops/logs/latest_WMOPS.csv $public_dir/logs/
		# copy index page blueprint
		@@ -2151,7 +2148,6 @@ ivas-interop-on-merge-request:
		- sed -i "s/IVAS FORMAT/IVAS $in_format to $out_format/g" ${public_dir}/index.html
		# do separately here to avoid overwrite complaints by mv
		- mv -f ci/complexity_measurements/style.css ${public_dir}/
		- ls $public_dir

		.complexity-template:
		extends:

apps/decoder.c

+57 −195

File changed.

Preview size limit exceeded, changes collapsed.

apps/encoder.c

+6 −5

Original line number	Diff line number	Diff line
		@@ -709,11 +709,7 @@ int main(
		{
		if ( ( error = JbmFileReader_readCAconfig( jbmReader, &caConfig ) ) != IVAS_ERR_OK )
		{
		#ifdef FIX_699_FILE_READER_JBM_TSM
		fprintf( stderr, "\nError (%s) while reading Channel-Aware Config. from: %s\n\n", IVAS_ENC_GetErrorMessage( error ), JbmFileReader_getFilePath( jbmReader ) );
		#else
		fprintf( stderr, "JbmFileReader_readCAconfig() failed: %s\n\n", IVAS_ENC_GetErrorMessage( error ) );
		#endif
		goto cleanup;
		}

		@@ -789,7 +785,12 @@ int main(
		}

		/* * Encode one frame * */
		if ( ( error = IVAS_ENC_EncodeFrameToSerial( hIvasEnc, pcmBuf, pcmBufSize, bitStream, &numBits ) ) != IVAS_ERR_OK )
		if ( ( error = IVAS_ENC_EncodeFrameToSerial( hIvasEnc, pcmBuf, pcmBufSize, bitStream, &numBits
		#ifdef DBG_BITSTREAM_ANALYSIS
		,
		frame
		#endif
		) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nencodeFrame failed: %s\n\n", IVAS_ENC_GetErrorMessage( error ) );
		goto cleanup;

apps/isar_post_rend.c

+7 −44

Original line number	Diff line number	Diff line
		@@ -32,17 +32,6 @@

		#include "lib_isar_post_rend.h"

		#ifndef SPLIT_REND_WITH_HEAD_ROT

		int main( int argc, char **argv )
		{
		(void) argc;
		(void) argv;
		ISAR_POST_REND_void_func();
		return 0;
		}

		#else

		#include <assert.h>
		#include <math.h>
		@@ -730,13 +719,9 @@ int main(
		bitsBuffer.config.bufLenInBytes = 0;
		bitsBuffer.config.codec = ISAR_SPLIT_REND_CODEC_DEFAULT;
		bitsBuffer.config.poseCorrection = ISAR_SPLIT_REND_POSE_CORRECTION_MODE_NONE;
		#ifdef ISAR_BITSTREAM_UPDATE_LC3PLUS
		bitsBuffer.config.codec_frame_size_ms = 5;
		bitsBuffer.config.isar_frame_size_ms = 20;
		bitsBuffer.config.lc3plusHighRes = 0;
		#else
		bitsBuffer.config.codec_frame_size_ms = 20;
		#endif


		CmdlnArgs args = parseCmdlnArgs( argc, argv );
		@@ -760,9 +745,7 @@ int main(
		SplitRendBFIFileReader_open( args.splitRendBFIFilePath, &splitRendBFIReader );
		}

		#ifdef ISAR_BITSTREAM_UPDATE_LC3PLUS
		int32_t inFileSampleRate = 0;
		#endif
		strncpy( audioFilePath, args.inputFilePath, FILENAME_MAX - 1 );
		hSplitRendFileReadWrite = NULL;
		if ( ( args.inConfig.numBinBuses > 0 ) && ( args.inConfig.binBuses[0].audioConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) )
		@@ -771,14 +754,10 @@ int main(
		args.inMetadataFilePaths[0],
		&bitsBuffer.config.codec,
		&bitsBuffer.config.poseCorrection,
		&bitsBuffer.config.codec_frame_size_ms
		#ifdef ISAR_BITSTREAM_UPDATE_LC3PLUS
		,
		&bitsBuffer.config.codec_frame_size_ms,
		&bitsBuffer.config.isar_frame_size_ms,
		&inFileSampleRate,
		&bitsBuffer.config.lc3plusHighRes
		#endif
		);
		&bitsBuffer.config.lc3plusHighRes );
		if ( error != IVAS_ERR_OK )
		{
		fprintf( stderr, "Could not open split rend metadata file %s\n", args.inMetadataFilePaths[0] );
		@@ -799,14 +778,10 @@ int main(
		args.inputFilePath,
		&bitsBuffer.config.codec,
		&bitsBuffer.config.poseCorrection,
		&bitsBuffer.config.codec_frame_size_ms
		#ifdef ISAR_BITSTREAM_UPDATE_LC3PLUS
		,
		&bitsBuffer.config.codec_frame_size_ms,
		&bitsBuffer.config.isar_frame_size_ms,
		&inFileSampleRate,
		&bitsBuffer.config.lc3plusHighRes
		#endif
		);
		&bitsBuffer.config.lc3plusHighRes );
		if ( error != IVAS_ERR_OK )
		{
		fprintf( stderr, "Could not open split rend metadata file %s\n", args.inputFilePath );
		@@ -815,17 +790,11 @@ int main(
		audioReader = NULL;
		}

		#ifndef ISAR_BITSTREAM_UPDATE_LC3PLUS
		int32_t inFileSampleRate = 0;
		#endif
		if ( audioReader != NULL )
		{
		error = AudioFileReader_getSamplingRate( audioReader, &inFileSampleRate );
		}
		else
		#ifdef ISAR_BITSTREAM_UPDATE_LC3PLUS
		if ( hSplitRendFileReadWrite == NULL )
		#endif
		else if ( hSplitRendFileReadWrite == NULL )
		{
		inFileSampleRate = args.sampleRate;
		}
		@@ -887,13 +856,9 @@ int main(
		if ( ( error = ISAR_REND_SetSplitRendBitstreamHeader( hIsarPostRend,
		bitsBuffer.config.codec,
		bitsBuffer.config.poseCorrection,
		bitsBuffer.config.codec_frame_size_ms
		#ifdef ISAR_BITSTREAM_UPDATE_LC3PLUS
		,
		bitsBuffer.config.codec_frame_size_ms,
		bitsBuffer.config.isar_frame_size_ms,
		bitsBuffer.config.lc3plusHighRes
		#endif
		) ) != IVAS_ERR_OK )
		bitsBuffer.config.lc3plusHighRes ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Error in getting split renderer bitstream header: %s\n", ivas_error_to_string( error ) );
		exit( -1 );
		@@ -1249,5 +1214,3 @@ int main(


		#undef WMC_TOOL_SKIP

		#endif /* SPLIT_REND_WITH_HEAD_ROT */