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

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

100644 → 100755

+2 −0

Original line number	Diff line number	Diff line
		@@ -120,6 +120,8 @@
		#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

+8 −0

Original line number	Diff line number	Diff line
		@@ -1534,12 +1534,20 @@ void ivas_spar_dec_set_render_map_fx(
		return;
		}

		#ifdef FIX_997_REMOVE_SPAR_DEC_UPMIXER

		/-------------------------------------------------------------------
		* ivas_spar_dec_set_render_params()
		*
		* IVAS SPAR set rendering parameters
		-------------------------------------------------------------------/
		#else
		/-------------------------------------------------------------------
		* ivas_spar_dec_upmixer()
		*
		* IVAS SPAR upmixer
		-------------------------------------------------------------------/
		#endif

		void ivas_spar_dec_set_render_params_fx(
		Decoder_Struct st_ivas, / i/o: IVAS decoder handle */