Clean up failed attemps to fix things (27b7de2f) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/ivas_prot.h

+0 −3

Original line number	Diff line number	Diff line
		@@ -2907,9 +2907,6 @@ void ivas_mct_core_dec(
		const int16_t nCPE, /* i : number of CPEs */
		#ifdef FLOAT_INTERFACE_DEC_REND
		float* signal_out[] /* o : synthesis @internal_FS */
		#ifndef FLOAT_INTERFACE_DEC_REND_MCT_TMP_FIX
		,const int16_t output_frame /* i : output frame length per channel */
		#endif
		#else
		float signal_out[][L_FRAME48k] /* o : synthesis @internal_FS */
		#endif

lib_com/options.h

+0 −1

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

		#define FLOAT_INTERFACE_DEC_REND
		#ifdef FLOAT_INTERFACE_DEC_REND
		// #define FLOAT_INTERFACE_DEC_REND_MCT_TMP_FIX
		#define FLOAT_INTERFACE_DEC_REND_DBG_OOB_WRITES
		#endif

lib_dec/ivas_mct_core_dec.c

+1 −8

Original line number	Diff line number	Diff line
		@@ -167,9 +167,6 @@ void ivas_mct_core_dec(
		const int16_t nCPE, /* i : number of CPEs */
		#ifdef FLOAT_INTERFACE_DEC_REND
		float* signal_out[] /* o : synthesis @internal_FS */
		#ifndef FLOAT_INTERFACE_DEC_REND_MCT_TMP_FIX
		,const int16_t output_frame /* i : output frame length per channel */
		#endif
		#else
		float signal_out[][L_FRAME48k] /* o : synthesis @internal_FS */
		#endif
		@@ -224,11 +221,7 @@ void ivas_mct_core_dec(
		/* Initialization or re-configuration of Stereo TCX */
		sts[ch]->enablePlcWaveadjust = 0;
		x[ch][0] = &signal_out[ch][0];
		#if defined FLOAT_INTERFACE_DEC_REND && !defined FLOAT_INTERFACE_DEC_REND_MCT_TMP_FIX
		x[ch][1] = &signal_out[ch][0] + output_frame / 2;
		#else
		x[ch][1] = &signal_out[ch][0] + L_FRAME48k / 2;
		#endif
		}

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

lib_dec/ivas_mct_dec.c

+1 −47

Original line number	Diff line number	Diff line
		@@ -88,16 +88,6 @@ ivas_error ivas_mct_dec(
		float synth[CPE_CHANNELS][L_FRAME_PLUS];
		int32_t ivas_total_brate;
		ivas_error error;
		#ifdef FLOAT_INTERFACE_DEC_REND_MCT_TMP_FIX
		float *outputAlias[MAX_OUTPUT_CHANNELS];
		float tmp[MAX_OUTPUT_CHANNELS][L_FRAME48k]; /* TODO(sgi): Optimize RAM usage */

		for ( int16_t i = 0; i < MAX_OUTPUT_CHANNELS; ++i )
		{
		outputAlias[i] = output[i];
		output[i] = tmp[i];
		}
		#endif

		error = IVAS_ERR_OK;

		@@ -165,16 +155,9 @@ ivas_error ivas_mct_dec(
		for ( n = 0; n < CPE_CHANNELS; n++ )
		{
		x[n][0] = &output[n + cpe_id * CPE_CHANNELS][0];
		#if defined FLOAT_INTERFACE_DEC_REND && !defined FLOAT_INTERFACE_DEC_REND_MCT_TMP_FIX
		/* TODO(sgi): Consult with MCT expert */
		x[n][1] = &output[n + cpe_id * CPE_CHANNELS][output_frame / 2];
		set_zero( x[n][0], output_frame / 2 );
		set_zero( x[n][1], output_frame / 2 );
		#else
		x[n][1] = &output[n + cpe_id * CPE_CHANNELS][L_FRAME48k / 2];
		set_zero( x[n][0], L_FRAME48k / 2 );
		set_zero( x[n][1], L_FRAME48k / 2 );
		#endif
		}

		ivas_mdct_core_invQ( st_ivas->hCPE[cpe_id], hMCT->LFE_off, nTnsBitsTCX10[cpe_id], p_param[cpe_id], param_lpc[cpe_id], param[cpe_id],
		@@ -185,12 +168,7 @@ ivas_error ivas_mct_dec(
		}

		/* MCT core decoder */
		ivas_mct_core_dec( hMCT, st_ivas->hCPE, nCPE, output
		#if defined FLOAT_INTERFACE_DEC_REND && !defined FLOAT_INTERFACE_DEC_REND_MCT_TMP_FIX
		,
		output_frame
		#endif
		);
		ivas_mct_core_dec( hMCT, st_ivas->hCPE, nCPE, output );

		/* MCT reconstruction and CoreCoder updates */
		for ( cpe_id = 0; cpe_id < nCPE; cpe_id++ )
		@@ -200,12 +178,7 @@ ivas_error ivas_mct_dec(
		for ( n = 0; n < CPE_CHANNELS; n++ )
		{
		x[n][0] = &output[n + cpe_id * CPE_CHANNELS][0];
		#if defined FLOAT_INTERFACE_DEC_REND && !defined FLOAT_INTERFACE_DEC_REND_MCT_TMP_FIX
		/* TODO(sgi): Consult with MCT expert */
		x[n][1] = &output[n + cpe_id * CPE_CHANNELS][output_frame / 2];
		#else
		x[n][1] = &output[n + cpe_id * CPE_CHANNELS][L_FRAME48k / 2];
		#endif
		}

		ivas_mdct_core_tns_ns( hCPE, hMCT->LFE_off, fUseTns[cpe_id], tnsData[cpe_id], x, Aq[cpe_id], 1 );
		@@ -225,12 +198,7 @@ ivas_error ivas_mct_dec(
		for ( n = 0; n < CPE_CHANNELS; n++ )
		{
		x_all[n + cpe_id * CPE_CHANNELS][0] = &output[n + cpe_id * CPE_CHANNELS][0];
		#if defined FLOAT_INTERFACE_DEC_REND && !defined FLOAT_INTERFACE_DEC_REND_MCT_TMP_FIX
		/* TODO(sgi): Consult with MCT expert */
		x_all[n + cpe_id * CPE_CHANNELS][1] = &output[n + cpe_id * CPE_CHANNELS][output_frame / 2];
		#else
		x_all[n + cpe_id * CPE_CHANNELS][1] = &output[n + cpe_id * CPE_CHANNELS][L_FRAME48k / 2];
		#endif
		}
		}

		@@ -245,12 +213,7 @@ ivas_error ivas_mct_dec(
		for ( n = 0; n < CPE_CHANNELS; n++ )
		{
		x[n][0] = &output[n + cpe_id * CPE_CHANNELS][0];
		#if defined FLOAT_INTERFACE_DEC_REND && !defined FLOAT_INTERFACE_DEC_REND_MCT_TMP_FIX
		/* TODO(sgi): Consult with MCT expert */
		x[n][1] = &output[n + cpe_id * CPE_CHANNELS][output_frame / 2];
		#else
		x[n][1] = &output[n + cpe_id * CPE_CHANNELS][L_FRAME48k / 2];
		#endif
		}

		ivas_mdct_core_reconstruct( hCPE, x, synth, hMCT->LFE_off, fUseTns[cpe_id], 1 );
		@@ -312,15 +275,6 @@ ivas_error ivas_mct_dec(
		}
		#endif

		#ifdef FLOAT_INTERFACE_DEC_REND_MCT_TMP_FIX
		/* Revert overwritten pointers in output buffer, copy audio from tmp buffer to output */
		for ( int16_t i = 0; i < MAX_OUTPUT_CHANNELS; ++i )
		{
		output[i] = outputAlias[i];
		mvr2r( tmp[i], output[i], output_frame );
		}
		#endif

		pop_wmops();
		return error;
		}