port FIX_997_REMOVE_SPAR_DEC_UPMIXER (d753fc4e) · Commits · SA4 / Audio / IVAS BASOP

lib_com/ivas_prot.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -4378,7 +4378,7 @@ void ivas_spar_dec_upmixer_sf(
		float output[], / o : output audio channels */
		const int16_t nchan_internal /* i : number of internal channels */
		);

		#ifndef FIX_997_REMOVE_SPAR_DEC_UPMIXER
		void ivas_spar_dec_upmixer(
		Decoder_Struct st_ivas, / i/o: IVAS decoder handle */
		float output[], / i/o: input/output audio channels */
		@@ -4386,6 +4386,7 @@ void ivas_spar_dec_upmixer(
		const int16_t output_frame /* i : output frame length */
		);

		#endif
		/* MD module */
		ivas_error ivas_spar_md_enc_open(
		ivas_spar_md_enc_state_t *hMdEnc, / i/o: SPAR MD encoder handle */

+2 −0

Original line number	Diff line number	Diff line
		@@ -188,6 +188,8 @@
		#define NONBE_FIX_968_ISM_BRIR_WITH_HEADROTATION_5MS_FIX /* FhG : issue #968: differences between 5ms and 20ms rendering for discrete ISM with BRIR and head rotation*/
		#define FIX_969_USAN_IGF_ARITH /* FhG: issue 969: fix USAN error in igf_sce_dec; same issue as #962 */
		#define FIX_959_MASA_LINEAR_REND /* VA: issue 959: remove unused calling of ivas_sba_linear_renderer() in MASA rendering */
		#define FIX_997_REMOVE_SPAR_DEC_UPMIXER /* VA: issue 997: remove obsolete function ivas_spar_dec_upmixer() */


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

+10 −0

Original line number	Diff line number	Diff line
		@@ -1249,11 +1249,19 @@ void ivas_spar_dec_set_render_map(
		}


		#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(
		Decoder_Struct st_ivas, / i/o: IVAS decoder handle */
		@@ -1360,6 +1368,7 @@ void ivas_spar_dec_digest_tc(
		return;
		}

		#ifndef FIX_997_REMOVE_SPAR_DEC_UPMIXER

		/-------------------------------------------------------------------
		* ivas_spar_dec_upmixer()
		@@ -1486,6 +1495,7 @@ void ivas_spar_dec_upmixer(
		return;
		}

		#endif

		/-------------------------------------------------------------------
		* ivas_spar_dec_upmixer_sf()