Merge branch '1023-unused-function-ivas_param_mc_dec' into 'main' (ae7812db) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/ivas_prot.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -3867,11 +3867,13 @@ void ivas_param_mc_dec_render(
		float output_f[] / o : rendered time signal */
		);

		#ifndef FIX_1023_REMOVE_PARAMMC_DEC
		void ivas_param_mc_dec(
		Decoder_Struct st_ivas, / i/o: IVAS decoder handle */
		float output_f[] / i/o: synthesized core-coder transport channels/DirAC output */
		);

		#endif
		/! r: number of cldfb synthesis instances /
		int16_t param_mc_get_num_cldfb_syntheses(
		Decoder_Struct st_ivas / i : IVAS decoder structure */

+1 −0

Original line number	Diff line number	Diff line
		@@ -158,6 +158,7 @@

		#define FIX_1027_GSC_INT_OVERFLOW /* VA: issue 2207: overflow in GSC */
		#define FIX_1024_REMOVE_PARAMMC_MIXING_MAT /* VA: issue 1024: remove unused function ivas_param_mc_get_mono_stereo_mixing_matrices() */
		#define FIX_1023_REMOVE_PARAMMC_DEC /* VA: issue 1023: remove unused function ivas_param_mc_dec() */

		/* #################### End BE switches ################################## */

+5 −2

Original line number	Diff line number	Diff line
		@@ -1477,9 +1477,9 @@ void ivas_param_mc_dec_digest_tc(


		/*-------------------------------------------------------------------------
		* ivas_param_mc_dec()
		* ivas_param_mc_dec_render()
		*
		* Parametric MC decoding process
		* Parametric MC rendering process
		------------------------------------------------------------------------/

		void ivas_param_mc_dec_render(
		@@ -1815,6 +1815,8 @@ void ivas_param_mc_dec_render(
		return;
		}


		#ifndef FIX_1023_REMOVE_PARAMMC_DEC
		/*-------------------------------------------------------------------------
		* ivas_param_mc_dec()
		*
		@@ -1854,6 +1856,7 @@ void ivas_param_mc_dec(
		pop_wmops();
		return;
		}
		#endif

		/*-------------------------------------------------------------------------
		* param_mc_dec_init()