Merge remote-tracking branch 'origin/main-pc' into 1631_basop-port-mr-1498-from-float (4d5b9f9a) · Commits · SA4 / Audio / IVAS BASOP

.gitlab-ci.yml

+138 −178

File changed.

Preview size limit exceeded, changes collapsed.

.gitlab-ci/variables.yml

+17 −0

Original line number	Diff line number	Diff line
		@@ -12,16 +12,26 @@ variables:
		# They can be overwritten in the job templates to e.g. only test encoder or decoder in the chain
		DUT_ENCODER_PATH: "./IVAS_cod"
		DUT_DECODER_PATH: "./IVAS_dec"
		DUT_RENDERER_PATH: "./IVAS_rend"
		DUT_POST_RENDERER_PATH: "./ISAR_post_rend"
		REF_ENCODER_PATH: "./IVAS_cod_ref"
		REF_DECODER_PATH: "./IVAS_dec_ref"
		REF_RENDERER_PATH: "./IVAS_rend_ref"
		REF_POST_RENDERER_PATH: "./ISAR_post_rend_ref"
		MERGE_TARGET_ENCODER_PATH: "./IVAS_cod_merge_target"
		MERGE_TARGET_DECODER_PATH: "./IVAS_dec_merge_target"
		MERGE_TARGET_RENDERER_PATH: "./IVAS_rend_merge_target"
		MERGE_TARGET_POST_RENDERER_PATH: "./ISAR_post_rend_merge_target"
		# These path variables are used for building the binaries
		# They should never be overwritten!
		REF_ENCODER_PATH_FOR_BUILD_DO_NOT_MODIFY: "./IVAS_cod_ref"
		REF_DECODER_PATH_FOR_BUILD_DO_NOT_MODIFY: "./IVAS_dec_ref"
		REF_RENDERER_PATH_FOR_BUILD_DO_NOT_MODIFY: "./IVAS_rend_ref"
		REF_POST_RENDERER_PATH_FOR_BUILD_DO_NOT_MODIFY: "./ISAR_post_rend_ref"
		MERGE_TARGET_ENCODER_PATH_FOR_BUILD_DO_NOT_MODIFY: "./IVAS_cod_merge_target"
		MERGE_TARGET_DECODER_PATH_FOR_BUILD_DO_NOT_MODIFY: "./IVAS_dec_merge_target"
		MERGE_TARGET_RENDERER_PATH_FOR_BUILD_DO_NOT_MODIFY: "./IVAS_rend_merge_target"
		MERGE_TARGET_POST_RENDERER_PATH_FOR_BUILD_DO_NOT_MODIFY: "./ISAR_post_rend_merge_target"
		LEVEL_SCALING: "1.0"
		BASOP_CI_BRANCH_PC_REPO: "basop-ci-branch"
		PRM_FILES: "scripts/config/self_test.prm scripts/config/self_test_ltv.prm"
		@@ -46,6 +56,9 @@ variables:
		FLOAT_REF_COMMIT_FILE: "float-ref-git-sha.txt"
		CUT_COMMIT_FILE: "CuT-git-sha.txt"
		MERGE_TARGET_COMMIT_FILE: "merge-target-git-sha.txt"
		RUNNER_TAG: "ivas-basop-linux"
		LOGS_BACKUP_SOURCE_DIR: ""
		LOGS_BACKUP_TARGET_DIR: ""
		MANUAL_PIPELINE_TYPE:
		description: "Type for the manual pipeline run. Use 'pytest-compare' to run comparison test against reference float codec."
		value: 'default'
		@@ -54,6 +67,7 @@ variables:
		- 'pytest-compare'
		- 'pytest-compare-enc-dmx'
		- 'pytest-compare-long'
		- 'pytest-compare-long-fx-fx'
		- 'pytest-compare-to-input'
		- 'pytest-saturation-smoke-test'
		- 'evs-26444'
		@@ -62,4 +76,7 @@ variables:
		- 'complexity'
		- 'coverage'
		- 'voip-be-test'
		- 'renderer-framesize-be'
		- 'peaq-enc-passthrough'
		- 'long-term-logs'
		- 'backup-long-term-logs'

Workspace_msvc/lib_com.vcxproj.filters

+40 −12

Original line number	Diff line number	Diff line
		@@ -508,6 +508,12 @@
		<ClCompile Include="..\lib_com\tec_com_fx.c">
		<Filter>common_all_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_com\ivas_limiter_fx.c">
		<Filter>common_ivas_c</Filter>
		</ClCompile>
		<ClCompile Include="..\lib_com\ivas_rotation_com.c">
		<Filter>common_ivas_c</Filter>
		</ClCompile>
		</ItemGroup>
		<ItemGroup>
		<ClInclude Include="..\lib_com\basop_proto_func.h">
		@@ -588,17 +594,39 @@
		<ClInclude Include="..\lib_com\prot_fx.h">
		<Filter>common_h</Filter>
		</ClInclude>
		<ClInclude Include="..\lib_com\complex_basop.h" />
		<ClInclude Include="..\lib_com\enh32.h" />
		<ClInclude Include="..\lib_com\enh64.h" />
		<ClInclude Include="..\lib_com\ivas_rom_com_fx.h" />
		<ClInclude Include="..\lib_com\log2.h" />
		<ClInclude Include="..\lib_com\math_32.h" />
		<ClInclude Include="..\lib_com\math_op.h" />
		<ClInclude Include="..\lib_com\mime.h" />
		<ClInclude Include="..\lib_com\oper_32b.h" />
		<ClInclude Include="..\lib_com\rom_basic_math.h" />
		<ClInclude Include="..\lib_com\typedefs.h" />
		<ClInclude Include="..\lib_com\complex_basop.h">
		<Filter>common_h</Filter>
		</ClInclude>
		<ClInclude Include="..\lib_com\enh32.h">
		<Filter>common_h</Filter>
		</ClInclude>
		<ClInclude Include="..\lib_com\enh64.h">
		<Filter>common_h</Filter>
		</ClInclude>
		<ClInclude Include="..\lib_com\ivas_rom_com_fx.h">
		<Filter>common_h</Filter>
		</ClInclude>
		<ClInclude Include="..\lib_com\log2.h">
		<Filter>common_h</Filter>
		</ClInclude>
		<ClInclude Include="..\lib_com\math_32.h">
		<Filter>common_h</Filter>
		</ClInclude>
		<ClInclude Include="..\lib_com\math_op.h">
		<Filter>common_h</Filter>
		</ClInclude>
		<ClInclude Include="..\lib_com\mime.h">
		<Filter>common_h</Filter>
		</ClInclude>
		<ClInclude Include="..\lib_com\oper_32b.h">
		<Filter>common_h</Filter>
		</ClInclude>
		<ClInclude Include="..\lib_com\rom_basic_math.h">
		<Filter>common_h</Filter>
		</ClInclude>
		<ClInclude Include="..\lib_com\typedefs.h">
		<Filter>common_h</Filter>
		</ClInclude>
		</ItemGroup>
		<ItemGroup>
		<Filter Include="common_evs_c">

apps/decoder.c

+129 −234

File changed.

Preview size limit exceeded, changes collapsed.

apps/encoder.c

+1 −10

Original line number	Diff line number	Diff line
		@@ -681,11 +681,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;
		}

		@@ -762,12 +758,7 @@ int main(
		}

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