Merge main into basop-2336-duplications-of-dot_product (1a112a44) · Commits · SA4 / Audio / IVAS BASOP

lib_com/options.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -97,6 +97,8 @@
		#define FIX_2437_HARMONIZE_ENCODERINDEX /* FhG: basop issue 2437 EncoderIndex_ivas_fx() and EncoderIndex_fx()*/
		#define FIX_2385_GETTCXONLY /* FhG: issue 2385 : harmonizing getTcxonly_ivas_fx() and getTcxonly_ivas_fx() functions */
		#define FIX_2196_UNREACHABLE_CODE_IN_OSBA_STEREO_OUTPUT /* FhG: remove unreachable code in ivas_osba_stereo_add_channels */
		#define FIX_OUTPUT_FRAME /* VA: harmonize "output_frame" parameter usage to correspond to FLP */
		#define HARMONIZE_ISSUE_2435_WRITETNSDATA /* FhG basop 2435: Harmonize WriteTnsData_fx(), EncodeTnsData_fx() */
		#define HARM_2336_DOTP /* VA: basop 2336; Harmonisation of some dot_product function + some BE optimisation */

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

lib_com/prot_fx.h

+13 −0

Original line number	Diff line number	Diff line
		@@ -8188,6 +8188,7 @@ void GetParameters_fx(
		Word16 *pnBits // Q0
		);

		#ifndef HARMONIZE_ISSUE_2435_WRITETNSDATA
		void EncodeTnsData_ivas_fx(
		STnsConfig const pTnsConfig, / i : TNS Configuration struct */
		STnsData const pTnsData, / i : TNS data struct (quantized param) */
		@@ -8195,6 +8196,15 @@ void EncodeTnsData_ivas_fx(
		Word16 pnSize, / o : number of written parameters Q0*/
		Word16 pnBits / o : number of written bits Q0*/
		);
		#else
		void EncodeTnsData_ivas_fx(
		STnsConfig const pTnsConfig, / i : TNS Configuration struct */
		STnsData const pTnsData, / i : TNS data struct (quantized param) */
		Word16 stream, / o : internal data stream Q0 */
		Word16 pnSize, / o : number of written parameters Q0 */
		Word16 pnBits / o : number of written bits Q0 */
		);
		#endif

		void SetParameters(
		ParamsBitMap const *paramsBitMap,
		@@ -10808,6 +10818,7 @@ void ResetTnsData_flt(
		void ClearTnsFilterCoefficients_flt(
		STnsFilter *pTnsFilter );

		#ifndef HARMONIZE_ISSUE_2435_WRITETNSDATA
		void EncodeTnsData(
		STnsConfig const pTnsConfig, / i : TNS Configuration struct */
		STnsData const pTnsData, / i : TNS data struct (quantized param) */
		@@ -10815,6 +10826,7 @@ void EncodeTnsData(
		Word16 pnSize, / o : number of written parameters */
		Word16 pnBits / o : number of written bits */
		);
		#endif

		void WriteTnsData(
		const STnsConfig pTnsConfig, / i : TNS Configuration struct */
		@@ -10823,6 +10835,7 @@ void WriteTnsData(
		BSTR_ENC_HANDLE hBstr, /* o : bitstream */
		Word16 pnBits / o : number of written bits */
		);

		#ifndef HARMONIZE_READ_DECODE_TNS
		void ReadTnsData_ivas(
		STnsConfig const *pTnsConfig,

lib_dec/amr_wb_dec_fx.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -136,8 +136,12 @@ ivas_error amr_wb_dec_fx(
		move16();
		st_fx->coder_type = GENERIC;
		move16();
		#ifdef FIX_OUTPUT_FRAME
		output_frame = extract_l( Mult_32_16( st_fx->output_Fs, INV_FRAME_PER_SEC_Q15 ) );
		#else
		output_frame = st_fx->output_frame_fx; /Q0/
		move16(); /* frame length of the input signal */
		#endif

		st_fx->bpf_off = 0;
		move16();

lib_dec/core_dec_init_fx.c

+10 −0

Original line number	Diff line number	Diff line
		@@ -747,7 +747,11 @@ void open_decoder_LPD_fx(
		test();
		IF( EQ_16( st->core, ACELP_CORE ) && EQ_16( st->last_core, HQ_CORE ) )
		{
		#ifdef FIX_OUTPUT_FRAME
		frame_ener_fx( st->hTcxDec->L_frameTCX, UNVOICED_CLAS, st->previoussynth_fx, -1, &st->enr_old_fx, 1, 0, 0, 0 );
		#else
		frame_ener_fx( st->output_frame_fx, UNVOICED_CLAS, st->previoussynth_fx, -1, &st->enr_old_fx, 1, 0, 0, 0 );
		#endif
		}
		}
		ELSE
		@@ -1182,8 +1186,10 @@ void open_decoder_LPD_ivas_fx(
		{
		st->hTcxDec->L_frameTCX = extract_l( Mult_32_16( st->output_Fs, INV_FRAME_PER_SEC_Q15 ) );
		move16();
		#ifndef FIX_OUTPUT_FRAME
		st->output_frame_fx = st->hTcxDec->L_frameTCX; /* Q0 */
		move16();
		#endif
		if ( st->ini_frame == 0 )
		{
		st->L_frameTCX_past = st->hTcxDec->L_frameTCX;
		@@ -1806,9 +1812,13 @@ void open_decoder_LPD_ivas_fx(
		test();
		IF( st->core == ACELP_CORE && EQ_16( st->last_core, HQ_CORE ) )
		{
		#ifdef FIX_OUTPUT_FRAME
		frame_ener_fx( st->hTcxDec->L_frameTCX, UNVOICED_CLAS, st->previoussynth_fx, -1, &st->enr_old_fx, 1, 0, 0, 0 );
		#else
		st->output_frame_fx = st->hTcxDec->L_frameTCX; /* Q0 */
		move16();
		frame_ener_fx( st->output_frame_fx, UNVOICED_CLAS, st->previoussynth_fx, -1, &st->enr_old_fx, 1, 0, 0, 0 );
		#endif
		}
		}
		ELSE

lib_dec/core_dec_switch_fx.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -338,8 +338,10 @@ void mode_switch_decoder_LPD_ivas_fx(
		{
		st->hTcxDec->L_frameTCX = extract_l( Mult_32_16( st->output_Fs, INV_FRAME_PER_SEC_Q15 ) ); /* Q0 */
		move16();
		#ifndef FIX_OUTPUT_FRAME
		st->output_frame_fx = st->hTcxDec->L_frameTCX; /* Q0 */
		move16();
		#endif
		}

		IF( st->hTcxCfg != NULL )