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

.gitlab-ci.yml

+1 −1

Original line number	Diff line number	Diff line
		@@ -1379,7 +1379,7 @@ split-rendering-pytest-on-merge-request:
		- .test-job-linux-needs-testv-dir
		- .rules-merge-request-to-main-pc
		needs: ["build-codec-linux-make"]
		timeout: "45 minutes"
		timeout: "60 minutes"
		stage: compare
		script:
		- *print-common-info

apps/encoder.c

+4 −0

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

lib_com/options.h

+7 −1

Original line number	Diff line number	Diff line
		@@ -115,10 +115,13 @@
		#define FIX_983_DISC_ISM_DIGEST_NUM_OBJS /* FhG: issue #983: the discrete ISM digest function uses the wrong number of objects */

		#define NONBE_FIX_974_OSBA_JBM_MONO_RS_USAN /* FhG : issue #974: usan in mono and stereo output in OSBA JBM RS */
		#define FIX_944_REMOVE_LS_RENDERER_CALL_IN_STEREO /* VA: issue 994: remove an obsolete call of function ivas_ls_setup_conversion() in stereo */
		#define NONBE_FIX_982_OMASA_DELAY_COMP_5MS /* FhG : issue #982 : 5ms and 20ms output different for OMASA */
		#define FIX_ACCESS_WITHIN_NULL_STRUCT_MC_BW_SWITCHING /* FhG: fix usan error in MCT with bw swicthing */
		#define NONBE_FIX_986_MC_BW_SWITCHING /* FhG: fix crash in bw and br switching with MC */
		#define NONBE_FIX_975_JBM_USAN /* FhG: Fix issue #975, USAN in JBM decoding ad 13.2kbps */
		#define FIX_699_FILE_READER_JBM_TSM /* VA: issue 699: complement FileReader_getFilePath() logic for TSM and JBM */
		#define FIX_997_REMOVE_SPAR_DEC_UPMIXER /* VA: issue 997: remove obsolete function ivas_spar_dec_upmixer() */

		#define NONBE_FIX_947_STEREO_DMX_EVS_POC /* Orange: Fix clicks on POC */
		#ifdef NONBE_FIX_947_STEREO_DMX_EVS_POC
		@@ -129,6 +132,9 @@
		#define NONBE_FIX_947_STEREO_DMX_FADOPT /* Orange: Fading optimisation */
		#endif
		#define NONBE_FIX_999_JBM_MCT_FLUSH /* FhG: issue #999: fix wrong flushing for MCT at a JBM rate switch */
		#define FIX_1003_PARAMISM_BINAURAL_RECONFIG_USAN /* FhG: fix for #1003: fix USAN caused by ParamISM reconfig */
		#define FIX_1001_ARI_HM_OVERFLOW /* FhG: (no changes needed in BASOP) fix for undef behaviour in in the harmonic TCX model arithmetic coder */
		#define NONBE_FIX_1005_MC_RS_TCBUFFER_UPDATE /* FhG: issue #1005: fix TC Buffer update at a MC rate switch */

		/* #################### End BASOP porting switches ############################ */

lib_dec/ivas_ism_dec_fx.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -369,6 +369,7 @@ static ivas_error ivas_ism_bitrate_switching_dec_fx(
		tc_nchan_full_new = tc_nchan_tc_new;
		move16();

		#ifndef FIX_1003_PARAMISM_BINAURAL_RECONFIG_USAN
		test();
		test();
		IF( EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_PARAMETRIC ) \|\| EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_PARAMETRIC_ROOM ) \|\| EQ_32( st_ivas->renderer_type, RENDERER_STEREO_PARAMETRIC ) )
		@@ -379,6 +380,7 @@ static ivas_error ivas_ism_bitrate_switching_dec_fx(
		move16();
		}

		#endif
		test();
		test();
		test();

lib_dec/ivas_jbm_dec_fx.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -175,6 +175,7 @@ ivas_error ivas_jbm_dec_tc_fx(
		{
		hp20_fx_32( p_output_fx[n], output_frame, st_ivas->mem_hp20_out_fx[n], output_Fs );
		}
		#ifndef FIX_944_REMOVE_LS_RENDERER_CALL_IN_STEREO

		test();
		IF( EQ_32( st_ivas->renderer_type, RENDERER_MC ) && EQ_16( st_ivas->hDecoderConfig->nchan_out, 1 ) )
		@@ -192,6 +193,7 @@ ivas_error ivas_jbm_dec_tc_fx(
		Scale_sig32( p_output_fx[i], output_frame, negate( s ) ); // Q11
		}
		}
		#endif
		}
		ELSE IF( EQ_32( st_ivas->ivas_format, ISM_FORMAT ) )
		{