HARM_HQ_CORE2 (25e294bd) · Commits · SA4 / Audio / IVAS BASOP

lib_com/interleave_spectrum_fx.c

+20 −0

Original line number	Diff line number	Diff line
		@@ -43,10 +43,17 @@
		#include "ivas_prot_fx.h"


		/--------------------------------------------------------------------------
		* interleave_spectrum()
		*
		* Interleave the spectrum
		--------------------------------------------------------------------------/

		void interleave_spectrum_fx(
		Word32 coefs, / i/o: input and output coefficients Q12 */
		const Word16 length /* i : length of spectrum Q0 */
		)
		#ifndef HARM_HQ_CORE2
		{
		Word16 i, j, k;
		Word32 p1, p2, p3, p4;
		@@ -131,6 +138,7 @@ void interleave_spectrum_ivas_fx(
		Word32 coefs, / i/o: input and output coefficients Q12 */
		const Word16 length /* i : length of spectrum Q0 */
		)
		#endif
		{
		Word16 i, j, k;
		Word32 p1, p2, p3, p4;
		@@ -213,7 +221,17 @@ void interleave_spectrum_ivas_fx(
		}


		/--------------------------------------------------------------------------
		* de_interleave_spectrum()
		*
		* Deinterleave the spectrum
		--------------------------------------------------------------------------/

		#ifdef HARM_HQ_CORE2
		void de_interleave_spectrum_fx(
		#else
		void ivas_de_interleave_spectrum_fx(
		#endif
		Word32 coefs, / i/o: input and output coefficients Q12 */
		const Word16 length /* i : length of spectrum Q0 */
		)
		@@ -307,6 +325,7 @@ void ivas_de_interleave_spectrum_fx(

		return;
		}
		#ifndef HARM_HQ_CORE2

		void de_interleave_spectrum_fx(
		Word32 coefs, / i/o: input and output coefficients Q12 */
		@@ -400,3 +419,4 @@ void de_interleave_spectrum_fx(

		return;
		}
		#endif

+2 −1

Original line number	Diff line number	Diff line
		@@ -1750,11 +1750,12 @@ void ivas_fill_spectrum_fx(
		const Word16 element_mode
		);
		#endif
		#ifndef HARM_HQ_CORE2
		void ivas_de_interleave_spectrum_fx(
		Word32 coefs, / i/o: input and output coefficients Q12 */
		const Word16 length /* i : length of spectrum Q0 */
		);

		#endif
		#ifndef HARM_HQ_CORE
		void ivas_harm_bwe_fx(
		const Word16 coeff_fine, / i : fine structure for BWE */

+2 −1

Original line number	Diff line number	Diff line
		@@ -1610,11 +1610,12 @@ void interleave_spectrum_fx(
		const Word16 length /* i : length of spectrum Q0 */
		);

		#ifndef HARM_HQ_CORE2
		void interleave_spectrum_ivas_fx(
		Word32 coefs, / i/o: input and output coefficients Q12 */
		const Word16 length /* i : length of spectrum Q0 */
		);

		#endif
		/* o : impulse response energy Q3 */
		Word16 findpulse_fx(
		const Word16 L_frame, /* i : length of the frame */

+4 −0

Original line number	Diff line number	Diff line
		@@ -405,7 +405,11 @@ void ivas_hq_hr_dec_fx(

		IF( EQ_16( *is_transient, 1 ) )
		{
		#ifdef HARM_HQ_CORE2
		de_interleave_spectrum_fx( t_audio_q, length );
		#else
		ivas_de_interleave_spectrum_fx( t_audio_q, length );
		#endif
		}

		/------------------------------------------------------------------

+9 −0

Original line number	Diff line number	Diff line
		@@ -357,8 +357,13 @@ void hq_hr_enc_ivas_fx(
		/* Interleave MLT coefficients of 4 sub-vectors in case of transient frame */
		IF( is_transient )
		{
		#ifdef HARM_HQ_CORE2
		interleave_spectrum_fx( t_audio_fx, length );
		#else
		interleave_spectrum_ivas_fx( t_audio_fx, length );
		#endif
		}

		test();
		IF( EQ_16( st->element_mode, IVAS_CPE_DFT ) \|\| EQ_16( st->element_mode, IVAS_CPE_TD ) )
		{
		@@ -512,7 +517,11 @@ void hq_hr_enc_ivas_fx(

		IF( is_transient )
		{
		#ifdef HARM_HQ_CORE2
		de_interleave_spectrum_fx( t_audio_q_fx, length );
		#else
		ivas_de_interleave_spectrum_fx( t_audio_q_fx, length );
		#endif
		}

		Copy32( t_audio_q_fx, t_audio_fx, length );