Merge remote-tracking branch 'remotes/origin/main' into 1701_basop_PortFlpMR1516 (27b6eaf5) · Commits · SA4 / Audio / IVAS BASOP

.gitlab-ci.yml

+10 −2696

File changed.

Preview size limit exceeded, changes collapsed.

.gitlab-ci/variables.yml

+42 −3

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,20 +17,42 @@ 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_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"
		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"
		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"
		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"
		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
		@@ -32,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: ""
		@@ -46,6 +77,10 @@ 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: ""
		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 +89,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 +98,7 @@ variables:
		- 'complexity'
		- 'coverage'
		- 'voip-be-test'
		- 'renderer-framesize-be'
		- 'peaq-enc-passthrough'
		- 'long-term-logs'
		- 'backup-long-term-logs'

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

+142 −73

Original line number	Diff line number	Diff line
		@@ -166,9 +166,7 @@ int main(
		IVAS_RENDER_FRAMESIZE asked_frame_size;
		IVAS_DEC_HRTF_HANDLE *hHrtfTD = NULL;
		IVAS_DEC_HRTF_CREND_HANDLE *hSetOfHRTF = NULL;
		#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES
		IVAS_DEC_HRTF_STATISTICS_HANDLE *hHrtfStatistics = NULL;
		#endif

		#ifdef WMOPS
		reset_wmops();
		@@ -497,7 +495,8 @@ int main(

		if ( ( error = IVAS_DEC_SetRenderFramesize( hIvasDec, arg.renderFramesize ) ) != IVAS_ERR_OK )
		{
		return error;
		fprintf( stderr, "\nIVAS_DEC_PrintConfig failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		}

		if ( arg.renderFramesize != asked_frame_size )
		@@ -572,20 +571,6 @@ int main(
		goto cleanup;
		}

		if ( ( error = load_HRTF_binary( *hHrtfTD, hrtfReader ) ) != IVAS_ERR_OK )
		{
		if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
		{
		#ifdef FIX_OLD_BINARY_FORMAT
		hrtfFileReader_close( &hrtfReader );
		strcat( arg.hrtfFileName, "new" );

		if ( hrtfFileReader_open( arg.hrtfFileName, &hrtfReader ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", arg.hrtfFileName );
		goto cleanup;
		}

		if ( ( error = load_HRTF_binary( *hHrtfTD, hrtfReader ) ) != IVAS_ERR_OK )
		{
		if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
		@@ -598,29 +583,7 @@ int main(
		destroy_td_hrtf( hHrtfTD );
		}
		}
		#else
		fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", arg.hrtfFileName );
		goto cleanup;
		#endif
		}
		else
		{
		destroy_td_hrtf( hHrtfTD );
		}
		}

		#ifndef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES
		#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES
		if ( ( hHrtfTD != NULL ) && ( error = load_reverb_binary( hHrtfTD, hrtfReader ) ) != IVAS_ERR_OK )
		{
		if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
		{
		fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", arg.hrtfFileName );
		goto cleanup;
		}
		}
		#endif
		#endif
		if ( ( error = IVAS_DEC_GetHrtfCRendHandle( hIvasDec, &hSetOfHRTF ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nIVAS_DEC_GetHrtfCRendHandle failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		@@ -629,18 +592,6 @@ int main(

		if ( ( error = create_SetOfHRTF_from_binary( *hSetOfHRTF, hrtfReader, arg.output_Fs ) ) != IVAS_ERR_OK )
		{
		#ifdef FIX_OLD_BINARY_FORMAT
		cleanup_SetOfHRTF( hSetOfHRTF );
		hrtfFileReader_close( &hrtfReader );
		strcat( arg.hrtfFileName, "new" );

		if ( hrtfFileReader_open( arg.hrtfFileName, &hrtfReader ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", arg.hrtfFileName );
		goto cleanup;
		}
		if ( ( error = create_SetOfHRTF_from_binary( *hSetOfHRTF, hrtfReader, arg.output_Fs ) ) != IVAS_ERR_OK )
		{
		if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
		{
		fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", arg.hrtfFileName );
		@@ -651,18 +602,6 @@ int main(
		destroy_SetOfHRTF( hSetOfHRTF );
		}
		}
		#else
		if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )
		{
		fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", arg.hrtfFileName );
		goto cleanup;
		}
		else
		{
		destroy_SetOfHRTF( hSetOfHRTF );
		}
		#endif
		}

		IVAS_DEC_HRTF_FASTCONV_HANDLE *hHrtfFastConv = NULL;
		if ( ( error = IVAS_DEC_GetHrtfFastConvHandle( hIvasDec, &hHrtfFastConv ) ) != IVAS_ERR_OK )
		@@ -703,8 +642,6 @@ int main(
		destroy_parambin_hrtf( hHrtfParambin );
		}
		}
		#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES
		#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES
		if ( ( error = IVAS_DEC_GetHrtfStatisticsHandle( hIvasDec, &hHrtfStatistics ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nIVAS_DEC_GetHrtfHandle failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		@@ -722,14 +659,6 @@ int main(
		destroy_hrtf_statistics( hHrtfStatistics );
		}
		}
		#else
		if ( ( hHrtfTD != NULL ) && ( error = load_reverb_binary( hHrtfTD, hrtfReader ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", arg.hrtfFileName );
		goto cleanup;
		}
		#endif
		#endif
		}

		/------------------------------------------------------------------------------------------
		@@ -1788,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;
		@@ -2172,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;
		@@ -2304,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;
		@@ -2856,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;
		@@ -2878,7 +2856,14 @@ static ivas_error decodeVoIP(
		}
		vec_pos_update = ( vec_pos_update + 1 ) % vec_pos_len;
		frame++;
		#ifdef NONBE_FIX_864_JBM_RENDER_FRAMESIZE
		if ( vec_pos_update == 0 )
		{
		systemTime_ms += vec_pos_len * systemTimeInc_ms;
		}
		#else
		systemTime_ms += systemTimeInc_ms;
		#endif

		#ifdef WMOPS
		update_mem();
		@@ -2886,6 +2871,90 @@ static ivas_error decodeVoIP(
		#endif
		}


		#ifdef NONBE_FIX_864_JBM_RENDER_FRAMESIZE
		int16_t nSamplesFlushed = 0;

		/* decode and get samples */
		if ( ( error = IVAS_DEC_Flush( hIvasDec, nOutSamples, pcmBuf, &nSamplesFlushed ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError in IVAS_DEC_VoIP_Flush: %s\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		}

		if ( nSamplesFlushed )
		{
		/* Write current frame */
		if ( ( error = AudioFileWriter_write( afWriter, pcmBuf, nSamplesFlushed * nOutChannels ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nOutput audio file writer error\n" );
		goto cleanup;
		}

		/* Write ISm metadata to external file(s) */
		if ( decodedGoodFrame && arg.outputConfig == IVAS_AUDIO_CONFIG_EXTERNAL )
		{
		if ( bsFormat == IVAS_DEC_BS_OBJ \|\| bsFormat == IVAS_DEC_BS_MASA_ISM \|\| bsFormat == IVAS_DEC_BS_SBA_ISM )
		{
		if ( ( error = IVAS_DEC_GetNumObjects( hIvasDec, &numObj ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError in IVAS_DEC_GetNumObjects: %s\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		}

		for ( i = 0; i < numObj; ++i )
		{
		IVAS_ISM_METADATA IsmMetadata;

		if ( ( error = IVAS_DEC_GetObjectMetadata( hIvasDec, &IsmMetadata, 0, i ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError in IVAS_DEC_GetObjectMetadata: %s\n", IVAS_DEC_GetErrorMessage( error ) );
		goto cleanup;
		}

		if ( ( IsmFileWriter_writeFrame( IsmMetadata, ismWriters[i] ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nError writing ISM metadata to file %s\n", IsmFileWriter_getFilePath( ismWriters[i] ) );
		goto cleanup;
		}
		}
		}

		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;
		}
		}
		}
		}
		#endif


		/------------------------------------------------------------------------------------------
		* Add zeros at the end to have equal length of synthesized signals
		------------------------------------------------------------------------------------------/

apps/encoder.c

+1 −6

Original line number	Diff line number	Diff line
		@@ -758,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;