Merge remote-tracking branch 'remotes/origin/main' into 1704_basop_PortFlpMR1487 (9df55471) · Commits · SA4 / Audio / IVAS BASOP

.gitlab-ci.yml

+10 −2637

File changed.

Preview size limit exceeded, changes collapsed.

.gitlab-ci/variables.yml

+27 −5

Original line number	Diff line number	Diff line
		variables:
		TESTV_DIR: "/usr/local/testv"
		LTV_DIR: "/usr/local/ltv"
		EVS_BE_TEST_DIR_BASOP: "/usr/local/be_2_evs_basop"
		# TODO: cleanup and use global var defined in ivas-codec-ci
		FLOAT_REF_BRANCH: "ivas-float-update"
		FLOAT_REF_BRANCH_MERGE_SOURCE: ""
		BUILD_OUTPUT: "build_output.txt"
		SCRIPTS_DIR: "/usr/local/scripts"
		EXIT_CODE_NON_BE: 123
		EXIT_CODE_FAIL: 1
		LONG_TEST_SUITE: "tests/codec_be_on_mr_nonselection tests/renderer --param_file scripts/config/self_test_ltv.prm --use_ltv"
		LONG_TEST_SUITE_NO_RENDERER: "tests/codec_be_on_mr_nonselection --param_file scripts/config/self_test_ltv.prm --use_ltv"
		SHORT_TEST_SUITE: "tests/codec_be_on_mr_nonselection"
		@@ -10,10 +17,10 @@ variables:
		TEST_SUITE: ""
		# These path variables are used by the pytest calls.
		# 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"
		DUT_ENCODER_PATH: "./IVAS_cod_dut"
		DUT_DECODER_PATH: "./IVAS_dec_dut"
		DUT_RENDERER_PATH: "./IVAS_rend_dut"
		DUT_POST_RENDERER_PATH: "./ISAR_post_rend_dut"
		REF_ENCODER_PATH: "./IVAS_cod_ref"
		REF_DECODER_PATH: "./IVAS_dec_ref"
		REF_RENDERER_PATH: "./IVAS_rend_ref"
		@@ -22,8 +29,16 @@ variables:
		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"
		MERGE_SOURCE_FLOAT_REF_ENCODER_PATH: "./IVAS_cod_merge_source_float_ref"
		MERGE_SOURCE_FLOAT_REF_DECODER_PATH: "./IVAS_dec_merge_source_float_ref"
		MERGE_SOURCE_FLOAT_REF_RENDERER_PATH: "./IVAS_rend_merge_source_float_ref"
		MERGE_SOURCE_FLOAT_REF_POST_RENDERER_PATH: "./ISAR_post_rend_merge_source_float_ref"
		# These path variables are used for building the binaries
		# They should never be overwritten!
		DUT_ENCODER_PATH_FOR_BUILD_DO_NOT_MODIFY: "./IVAS_cod_dut"
		DUT_DECODER_PATH_FOR_BUILD_DO_NOT_MODIFY: "./IVAS_dec_dut"
		DUT_RENDERER_PATH_FOR_BUILD_DO_NOT_MODIFY: "./IVAS_rend_dut"
		DUT_POST_RENDERER_PATH_FOR_BUILD_DO_NOT_MODIFY: "./ISAR_post_rend_dut"
		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"
		@@ -32,8 +47,12 @@ variables:
		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"
		MERGE_SOURCE_FLOAT_REF_ENCODER_PATH_FOR_BUILD_DO_NOT_MODIFY: "./IVAS_cod_merge_source_float_ref"
		MERGE_SOURCE_FLOAT_REF_DECODER_PATH_FOR_BUILD_DO_NOT_MODIFY: "./IVAS_dec_merge_source_float_ref"
		MERGE_SOURCE_FLOAT_REF_RENDERER_PATH_FOR_BUILD_DO_NOT_MODIFY: "./IVAS_rend_merge_source_float_ref"
		MERGE_SOURCE_FLOAT_REF_POST_RENDERER_PATH_FOR_BUILD_DO_NOT_MODIFY: "./ISAR_post_rend_merge_source_float_ref"
		LEVEL_SCALING: "1.0"
		BASOP_CI_BRANCH_PC_REPO: "basop-ci-branch"
		IVAS_PIPELINE_NAME: ''
		PRM_FILES: "scripts/config/self_test.prm scripts/config/self_test_ltv.prm"
		TESTCASE_TIMEOUT_STV: 900
		TESTCASE_TIMEOUT_LTV: 2400
		@@ -42,7 +61,9 @@ variables:
		CI_REGRESSION_THRESH_MAX_ABS_DIFF: "50"
		CI_REGRESSION_THRESH_SSNR: "-1"
		CI_REGRESSION_THRESH_ODG: "-0.05"
		GIT_CLEAN_FLAGS: -ffdxq
		INSTR_DIR: "scripts/c-code_instrument"
		TESTS_DIR_CODEC_BE_ON_MR: "tests/codec_be_on_mr_nonselection"
		BUILD_WITH_DEBUG_MODE_INFO: ""
		ENCODER_TEST: ""
		DELTA_ODG: ""
		@@ -56,6 +77,7 @@ 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"
		MERGE_SOURCE_FLOAT_REF_COMMIT_FILE: "merge-source-float-ref-git-sha.txt"
		RUNNER_TAG: "ivas-basop-linux"
		LOGS_BACKUP_SOURCE_DIR: ""
		LOGS_BACKUP_TARGET_DIR: ""

CMakeLists.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -58,7 +58,7 @@ if(UNIX)
		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ffp-contract=off") # disable floating point operation contraction
		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pedantic -Wcast-qual -Wall -W -Wextra -Wno-long-long")
		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes")
		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-parameter")
		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-parameter -Wno-implicit-fallthrough")
		# to be uncommented in CI
		# set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")

apps/decoder.c

+49 −0

Original line number	Diff line number	Diff line
		@@ -1717,7 +1717,12 @@ static ivas_error initOnFirstGoodFrame(

		for ( int16_t j = 0; j < numInitialBadFrames; ++j )
		{
		#ifdef NONBE_FIX_984_OMASA_EXT_OUTPUT
		float delayMs = (float) ( pFullDelayNumSamples[0] ) / (float) ( *delayTimeScale );
		if ( ( error = MasaFileWriter_writeFrame( *ppMasaWriter, hMasaExtOutMeta, &delayMs ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = MasaFileWriter_writeFrame( *ppMasaWriter, hMasaExtOutMeta ) ) != IVAS_ERR_OK )
		#endif
		{
		fprintf( stderr, "\nError writing MASA metadata to file: %s\n", MasaFileWriter_getFilePath( *ppMasaWriter ) );
		return error;
		@@ -2101,13 +2106,28 @@ static ivas_error decodeG192(
		if ( bsFormat == IVAS_DEC_BS_MASA \|\| bsFormat == IVAS_DEC_BS_MASA_ISM )
		{
		IVAS_MASA_DECODER_EXT_OUT_META_HANDLE hMasaExtOutMeta;
		#ifdef NONBE_FIX_984_OMASA_EXT_OUTPUT
		int16_t fullDelayNumSamples[3];
		float delayMs;

		/* delayNumSamples is zeroed, and delayNumSamples_orig is updated only on first good frame, so need to re-fetch delay info */
		if ( ( error = IVAS_DEC_GetDelay( hIvasDec, fullDelayNumSamples, &delayTimeScale ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nUnable to get delay of decoder: %s\n", ivas_error_to_string( error ) );
		}
		#endif
		if ( ( error = IVAS_DEC_GetMasaMetadata( hIvasDec, &hMasaExtOutMeta, 0 ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError in IVAS_DEC_GetMasaMetadata: %s\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		}

		#ifdef NONBE_FIX_984_OMASA_EXT_OUTPUT
		delayMs = (float) ( fullDelayNumSamples[0] ) / (float) ( delayTimeScale );
		if ( ( error = MasaFileWriter_writeFrame( masaWriter, hMasaExtOutMeta, &delayMs ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = MasaFileWriter_writeFrame( masaWriter, hMasaExtOutMeta ) ) != IVAS_ERR_OK )
		#endif
		{
		fprintf( stderr, "\nError writing MASA metadata to file: %s\n", MasaFileWriter_getFilePath( masaWriter ) );
		goto cleanup;
		@@ -2233,13 +2253,27 @@ static ivas_error decodeG192(
		if ( bsFormat == IVAS_DEC_BS_MASA \|\| bsFormat == IVAS_DEC_BS_MASA_ISM )
		{
		IVAS_MASA_DECODER_EXT_OUT_META_HANDLE hMasaExtOutMeta;
		#ifdef NONBE_FIX_984_OMASA_EXT_OUTPUT
		int16_t fullDelayNumSamples[3];
		float delayMs;

		if ( ( error = IVAS_DEC_GetDelay( hIvasDec, fullDelayNumSamples, &delayTimeScale ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nUnable to get delay of decoder: %s\n", ivas_error_to_string( error ) );
		}
		#endif
		if ( ( error = IVAS_DEC_GetMasaMetadata( hIvasDec, &hMasaExtOutMeta, 0 ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError in IVAS_DEC_GetMasaMetadata: %s\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		}

		#ifdef NONBE_FIX_984_OMASA_EXT_OUTPUT
		delayMs = (float) ( fullDelayNumSamples[0] ) / (float) ( delayTimeScale );
		if ( ( error = MasaFileWriter_writeFrame( masaWriter, hMasaExtOutMeta, &delayMs ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = MasaFileWriter_writeFrame( masaWriter, hMasaExtOutMeta ) ) != IVAS_ERR_OK )
		#endif
		{
		fprintf( stderr, "\nError writing MASA metadata to file: %s\n", MasaFileWriter_getFilePath( masaWriter ) );
		goto cleanup;
		@@ -2785,13 +2819,28 @@ static ivas_error decodeVoIP(
		if ( bsFormat == IVAS_DEC_BS_MASA \|\| bsFormat == IVAS_DEC_BS_MASA_ISM )
		{
		IVAS_MASA_DECODER_EXT_OUT_META_HANDLE hMasaExtOutMeta;
		#ifdef NONBE_FIX_984_OMASA_EXT_OUTPUT
		int16_t fullDelayNumSamples[3];
		float delayMs;

		/* delayNumSamples_orig is fetched only for the first good frame, but here the delay can change between frames, so need to re-fetch */
		if ( ( error = IVAS_DEC_GetDelay( hIvasDec, fullDelayNumSamples, &delayTimeScale ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nUnable to get delay of decoder: %s\n", ivas_error_to_string( error ) );
		}
		#endif
		if ( ( error = IVAS_DEC_GetMasaMetadata( hIvasDec, &hMasaExtOutMeta, 1 ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError in IVAS_DEC_GetMasaMetadata: %s\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		}

		#ifdef NONBE_FIX_984_OMASA_EXT_OUTPUT
		delayMs = (float) ( fullDelayNumSamples[0] ) / (float) ( delayTimeScale );
		if ( ( error = MasaFileWriter_writeFrame( masaWriter, hMasaExtOutMeta, &delayMs ) ) != IVAS_ERR_OK )
		#else
		if ( ( error = MasaFileWriter_writeFrame( masaWriter, hMasaExtOutMeta ) ) != IVAS_ERR_OK )
		#endif
		{
		fprintf( stderr, "\nError writing MASA metadata to file: %s\n", MasaFileWriter_getFilePath( masaWriter ) );
		goto cleanup;

apps/renderer.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -1987,8 +1987,11 @@ int main(
		}
		}
		}

		#ifdef NONBE_FIX_984_OMASA_EXT_OUTPUT
		if ( ( error = MasaFileWriter_writeFrame( masaWriter, hMetaOutput, NULL ) ) != IVAS_ERR_OK ) /* NULL -> use default metadata delay settings */
		#else
		if ( ( error = MasaFileWriter_writeFrame( masaWriter, hMetaOutput ) ) != IVAS_ERR_OK )
		#endif
		{
		fprintf( stderr, "\nError writing MASA metadata to file: %s\n", MasaFileWriter_getFilePath( masaWriter ) );
		}