rename HARM_BWE -> HARMONIZE_TBE (94edac5f) · Commits · SA4 / Audio / IVAS BASOP

lib_com/ivas_prot_fx.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -1865,7 +1865,7 @@ void stereoFdCngCoherence_fx(
		Word16 fft_exp
		);

		#ifndef HARM_BWE
		#ifndef HARMONIZE_TBE
		void ivas_wb_tbe_dec_fx(
		Decoder_State st_fx, / i/o: decoder state structure */
		const Word16 coder_type, /* i : coding type */

+1 −1

Original line number	Diff line number	Diff line
		@@ -103,7 +103,7 @@
		#define FIX_BASOP_2357_OBJECT_EDIT_MSAN /* Nokia: basop issue 2357: initialize missing exponents in object edit */
		#define FIX_BASOP_2354_MSAN_DIFF_Q_VALUE /* Nokia: Initialize Q value of diffuseness in rendering to Q30 */
		#define FIX_2371_REMOVE_UNUSED_ISAR_FCNS /* Dolby: basop issue 2371: remove unused ISAR-related functions */
		#define HARM_BWE
		#define HARMONIZE_TBE /* VA: harmonize core-coder TBE function duplications */

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -5775,7 +5775,7 @@ void swb_tbe_dec_fx(
		Word16 *Q_synth,
		Word16 *pitch_buf );

		#ifndef HARM_BWE
		#ifndef HARMONIZE_TBE
		void ivas_dequantizeSHBparams_fx_9_1(
		Decoder_State *st_fx,
		const Word16 extl, /* i : extension layer */
		@@ -5790,7 +5790,7 @@ void ivas_dequantizeSHBparams_fx_9_1(
		Word16 *MSFlag );
		#endif
		void fb_tbe_dec_fx(
		#ifndef HARM_BWE
		#ifndef HARMONIZE_TBE
		Decoder_State st, / i/o: encoder state structure */
		const Word16 fb_exc[], /* i : FB excitation from the SWB part */
		Word16 Q_fb_exc,
		@@ -5802,7 +5802,7 @@ void fb_tbe_dec_ivas_fx(
		Decoder_State st, / i/o: encoder state structure */
		const Word16 fb_exc[], /* i : FB excitation from the SWB part */
		Word16 Q_fb_exc,
		#ifdef HARM_BWE
		#ifdef HARMONIZE_TBE
		Word16 hb_synth16, / o : high-band synthesis Q(15 - hb_synth_exp) */
		#endif
		Word32 hb_synth, / o : high-band synthesis */

+2 −2

Original line number	Diff line number	Diff line
		@@ -408,7 +408,7 @@ ivas_error evs_dec_fx(
		test();
		IF( EQ_16( output_frame, L_FRAME48k ) && EQ_16( st_fx->extl, FB_TBE ) )
		{
		#ifdef HARM_BWE
		#ifdef HARMONIZE_TBE
		fb_tbe_dec_fx( st_fx, fb_exc_fx, Q_fb_exc, hb_synth_fx, NULL, hb_synth_fx_exp, NULL, -1, output_frame );
		#else
		fb_tbe_dec_fx( st_fx, fb_exc_fx, Q_fb_exc, hb_synth_fx, hb_synth_fx_exp );
		@@ -847,7 +847,7 @@ ivas_error evs_dec_fx(
		test();
		IF( EQ_16( st_fx->extl, FB_TBE ) && EQ_16( output_frame, L_FRAME48k ) )
		{
		#ifdef HARM_BWE
		#ifdef HARMONIZE_TBE
		fb_tbe_dec_fx( st_fx, fb_exc_fx, Q_fb_exc, hb_synth_fx, NULL, hb_synth_fx_exp, NULL, -1, output_frame );
		#else
		fb_tbe_dec_fx( st_fx, fb_exc_fx, Q_fb_exc, hb_synth_fx, hb_synth_fx_exp );

+2 −2

Original line number	Diff line number	Diff line
		@@ -1013,7 +1013,7 @@ ivas_error ivas_core_dec_fx(
		IF( EQ_16( st->extl, WB_TBE ) )
		{
		/* WB TBE decoder */
		#ifdef HARM_BWE
		#ifdef HARMONIZE_TBE
		wb_tbe_dec_fx( st, st->coder_type, bwe_exc_extended_fx[n], st->Q_exc, voice_factors_fx[n], hb_synth_16_fx[n], &Q_hb_synth_fx );
		#else
		ivas_wb_tbe_dec_fx( st, st->coder_type, bwe_exc_extended_fx[n], st->Q_exc, voice_factors_fx[n], hb_synth_16_fx[n], &Q_hb_synth_fx );
		@@ -1081,7 +1081,7 @@ ivas_error ivas_core_dec_fx(
		/* FB TBE decoder */
		IF( EQ_16( st->extl, FB_TBE ) )
		{
		#ifdef HARM_BWE
		#ifdef HARMONIZE_TBE
		fb_tbe_dec_fx( st, tmp_buffer_fx /fb_exc/, Q_white_exc, NULL, hb_synth_32_fx[n], 0, tmp_buffer_fx /fb_synth_ref/, Q_white_exc, output_frame );
		#else