Merge branch 'main' into... (44d7d99b) · Commits · IVAS Codec Public Collaboration / IVAS Codec

.gitlab-ci.yml

+24 −1

Original line number	Diff line number	Diff line
		@@ -1031,7 +1031,7 @@ check-first-frame-is-sid:
		expose_as: "logs-sidstart"
		expire_in: "5 days"

		lc3plus-ensure-no-code-changes:
		.lc3plus-ensure-no-code-changes:
		extends:
		- .test-job-linux
		- .rules-merge-request
		@@ -1046,6 +1046,29 @@ lc3plus-ensure-no-code-changes:
		- modified_files=$(git status -s)
		- if [[ $modified_files ]]; then printf 'LC3plus codebase was modified!\n\n'"$modified_files"'\n\n'; exit $EXIT_CODE_FAIL; fi

		check-bitexactness-hrtf-rom-and-file:
		extends:
		- .test-job-linux
		- .rules-merge-request
		stage: test
		needs: ["build-codec-linux-cmake"]
		timeout: "5 minutes"
		script:
		- *print-common-info
		- cmake .
		- make -j
		- python3 tests/create_short_testvectors.py --which all --cut_len 1.0
		- python3 -m pytest tests/hrtf_binary_loading --html=report.html --junit-xml=report-junit.xml --self-contained-html
		artifacts:
		paths:
		- report.html
		- report-junit.xml
		when: always
		name: "$CI_JOB_NAME--$CI_MERGE_REQUEST_ID--sha-$CI_COMMIT_SHA--hrtf-loading"
		expose_as: "logs-hrtf-loading"
		expire_in: "5 days"


		# ---------------------------------------------------------------
		# Test jobs for main branch
		# ---------------------------------------------------------------

apps/decoder.c

+0 −65

Original line number	Diff line number	Diff line
		@@ -455,14 +455,9 @@ int main(
		------------------------------------------------------------------------------------------/

		#ifdef SPLIT_REND_WITH_HEAD_ROT
		#ifdef SPLIT_REND_LCLD_5MS
		asked_frame_size = arg.renderFramesize;
		#endif
		if ( arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED \|\| arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )
		{
		#ifndef SPLIT_REND_LCLD_5MS
		asked_frame_size = arg.renderFramesize;
		#endif
		if ( ( error = IVAS_DEC_EnableSplitRendering( hIvasDec ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "\nConfigure failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
		@@ -475,12 +470,6 @@ int main(
		goto cleanup;
		}

		#ifndef SPLIT_REND_LCLD_5MS
		if ( arg.renderFramesize != asked_frame_size )
		{
		fprintf( stderr, "\nChanged render framesize, only 20ms are allowed for split rendering!\n" );
		}
		#endif
		arg.enableHeadRotation = true;
		}
		#endif
		@@ -633,26 +622,6 @@ int main(
		goto cleanup;
		}

		#ifdef SPLIT_REND_WITH_HEAD_ROT
		#ifndef SPLIT_REND_LCLD_5MS
		if ( arg.renderFramesize == IVAS_RENDER_FRAMESIZE_5MS && ( renderConfig.split_rend_config.poseCorrectionMode == IVAS_SPLIT_REND_POSE_CORRECTION_MODE_NONE \|\|
		renderConfig.split_rend_config.dof == 0 ) )
		{
		/TODO : needs to be refined as this wont work with LCLD codec/
		arg.renderFramesize = IVAS_RENDER_FRAMESIZE_5MS;
		}
		else
		{
		arg.renderFramesize = IVAS_RENDER_FRAMESIZE_20MS;
		}

		if ( ( error = IVAS_DEC_SetRenderFramesize( hIvasDec, arg.renderFramesize ) ) != IVAS_ERR_OK )
		{
		return error;
		}

		#endif
		#endif
		if ( RenderConfigReader_read( renderConfigReader, arg.renderConfigFilename, &renderConfig ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Failed to read renderer configuration from file %s\n\n", arg.renderConfigFilename );
		@@ -665,7 +634,6 @@ int main(
		goto cleanup;
		}

		#ifdef SPLIT_REND_LCLD_5MS
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		if ( asked_frame_size != IVAS_RENDER_FRAMESIZE_20MS && ( renderConfig.split_rend_config.poseCorrectionMode == IVAS_SPLIT_REND_POSE_CORRECTION_MODE_NONE \|\|
		renderConfig.split_rend_config.dof == 0 ) )
		@@ -686,7 +654,6 @@ int main(
		{
		fprintf( stderr, "\nChanged render framesize, only 20ms are allowed for non-0dof split rendering!\n" );
		}
		#endif
		#endif

		if ( arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )
		@@ -2023,12 +1990,8 @@ 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;
		@@ -2334,11 +2297,7 @@ static ivas_error decodeG192(
		{
		if ( ( error = TsmScaleFileReader_readScale( tsmScaleFileReader, &scale ) ) != IVAS_ERR_OK )
		{
		#ifdef FIX_699_FILE_READER_JBM_TSM
		fprintf( stderr, "\nError (%s) when reading TSM data from %s \n\n", arg.inputBitstreamFilename, TsmScaleFileReader_getFilePath( tsmScaleFileReader ) );
		#else
		fprintf( stderr, "\nError: input bitstream file couldn't be read: %s \n\n", arg.inputBitstreamFilename );
		#endif
		goto cleanup;
		}
		int16_t maxScaling;
		@@ -2538,7 +2497,6 @@ 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;

		@@ -2547,19 +2505,14 @@ static ivas_error decodeG192(
		{
		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;
		@@ -2694,7 +2647,6 @@ 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;

		@@ -2702,19 +2654,14 @@ static ivas_error decodeG192(
		{
		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;
		@@ -3389,7 +3336,6 @@ 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;

		@@ -3398,19 +3344,14 @@ static ivas_error decodeVoIP(
		{
		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;
		@@ -3496,7 +3437,6 @@ 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;

		@@ -3505,19 +3445,14 @@ static ivas_error decodeVoIP(
		{
		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;

apps/encoder.c

+0 −4

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

apps/renderer.c

+0 −22

Original line number	Diff line number	Diff line
		@@ -1889,7 +1889,6 @@ int main(
		#ifdef SPLIT_REND_WITH_HEAD_ROT
		for ( i = 0; i < args.inConfig.numBinBuses; ++i )
		{
		#ifdef SPLIT_REND_LCLD_5MS
		if ( numSamplesRead > 0 )
		{
		if ( ( error = IVAS_REND_GetInputNumChannels( hIvasRend, splitBinIds[i], &numChannels ) ) != IVAS_ERR_OK )
		@@ -1905,23 +1904,8 @@ int main(
		exit( -1 );
		}
		}
		#endif
		if ( splitBinNeedsNewFrame )
		{
		#ifndef SPLIT_REND_LCLD_5MS
		if ( ( error = IVAS_REND_GetInputNumChannels( hIvasRend, splitBinIds[i], &numChannels ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Error: %s\n", ivas_error_to_string( error ) );
		exit( -1 );
		}
		IVAS_REND_ReadOnlyAudioBuffer tmpBuffer = getReadOnlySubBuffer( inBuffer, (int16_t) args.inConfig.binBuses[i].inputChannelIndex, numChannels );

		if ( ( error = IVAS_REND_FeedInputAudio( hIvasRend, splitBinIds[i], tmpBuffer ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Error: %s\n", ivas_error_to_string( error ) );
		exit( -1 );
		}
		#endif
		if ( ( error = IVAS_REND_FeedSplitBinauralBitstream( hIvasRend, splitBinIds[i], &bitsBuffer ) ) != IVAS_ERR_OK )
		{
		fprintf( stderr, "Error: %s\n", ivas_error_to_string( error ) );
		@@ -2126,11 +2110,7 @@ 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 ) );
		}
		@@ -2225,9 +2205,7 @@ cleanup:
		}

		split_rend_reader_writer_close( &hSplitRendFileReadWrite );
		#ifdef SPLIT_REND_LCLD_5MS
		SplitRendBFIFileReader_close( &splitRendBFIReader );
		#endif
		#endif

		for ( i = 0; i < RENDERER_MAX_MC_INPUTS; ++i )

lib_com/ari_hm.c

+1 −13

Original line number	Diff line number	Diff line
		@@ -205,11 +205,7 @@ int16_t CountIndexBits(
		-------------------------------------------------------------------/

		int16_t tcx_hm_render(
		#ifdef FIX_1001_ARI_HM_OVERFLOW
		const int32_t lag, /* i : pitch lag */
		#else
		const int16_t lag, /* i : pitch lag */
		#endif
		const int16_t fract_res, /* i : fractional resolution of the lag */
		Word16 p[] /* o : harmonic model (Q13) */
		)
		@@ -269,22 +265,14 @@ int16_t tcx_hm_render(

		void tcx_hm_modify_envelope(
		const Word16 gain, /* i : HM gain (Q11) */
		#ifdef FIX_1001_ARI_HM_OVERFLOW
		const int32_t lag,
		#else
		const int16_t lag,
		#endif
		const int16_t fract_res,
		const Word16 p[], /* i : harmonic model (Q13) */
		Word32 env[], /* i/o: envelope (Q16) */
		const int16_t L_frame /* i : number of spectral lines */
		)
		{
		#ifdef FIX_966_VAR_OVERFLOW_IN_HARM_MODEL_ARI
		int32_t h, x, k;
		#else
		int16_t k, h, x;
		#endif
		Word16 inv_shape[2 * kTcxHmParabolaHalfWidth + 1]; /* Q15 */

		if ( gain == 0 )

Admin message