accept FIX_854_ARRAY_SIZE_MISMATCH (2ba8826f) · Commits · IVAS Codec Public Collaboration / IVAS Codec

lib_com/ivas_prot.h

+25 −51

Original line number	Diff line number	Diff line
		@@ -430,7 +430,6 @@ ivas_error ivas_core_enc(
		CPE_ENC_HANDLE hCPE, /* i/o: CPE encoder structure */
		MCT_ENC_HANDLE hMCT, /* i/o: MCT encoder structure */
		const int16_t n_CoreChannels, /* i : number of core channels to be coded */
		#ifdef FIX_854_ARRAY_SIZE_MISMATCH
		float old_inp_12k8[][L_INP_12k8], /* i : buffer of old input signal */
		float old_inp_16k[][L_INP], /* i : buffer of old input signal */
		float ener[], /* i : residual energy from Levinson-Durbin */
		@@ -449,26 +448,6 @@ ivas_error ivas_core_enc(
		const int16_t vad_flag_dtx[], /* i : HE-SAD flag with additional DTX HO */
		float enerBuffer[][CLDFB_NO_CHANNELS_MAX], /* i : energy buffer */
		float fft_buff[][2 * L_FFT], /* i : FFT buffer */
		#else
		float old_inp_12k8[CPE_CHANNELS][L_INP_12k8], /* i : buffer of old input signal */
		float old_inp_16k[CPE_CHANNELS][L_INP], /* i : buffer of old input signal */
		float ener[CPE_CHANNELS], /* i : residual energy from Levinson-Durbin */
		float A[CPE_CHANNELS][NB_SUBFR16k * ( M + 1 )], /* i : A(z) unquantized for the 4 subframes */
		float Aw[CPE_CHANNELS][NB_SUBFR16k * ( M + 1 )], /* i : weighted A(z) unquantized for subframes */
		float epsP[CPE_CHANNELS][M + 1], /* i : LP prediction errors */
		float lsp_new[CPE_CHANNELS][M], /* i : LSPs at the end of the frame */
		float lsp_mid[CPE_CHANNELS][M], /* i : LSPs in the middle of the frame */
		const int16_t vad_hover_flag[CPE_CHANNELS], /* i : VAD hanglover flag */
		int16_t attack_flag[CPE_CHANNELS], /* i : attack flag (GSC or TC) */
		float realBuffer[CPE_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i/o: real buffer */
		float imagBuffer[CPE_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i/o: imag buffer */
		float old_wsp[CPE_CHANNELS][L_WSP], /* i : weighted input signal buffer */
		const int16_t loc_harm[CPE_CHANNELS], /* i : harmonicity flag */
		const float cor_map_sum[CPE_CHANNELS], /* i : speech/music clasif. parameter */
		const int16_t vad_flag_dtx[CPE_CHANNELS], /* i : HE-SAD flag with additional DTX HO */
		float enerBuffer[CPE_CHANNELS][CLDFB_NO_CHANNELS_MAX], /* i : energy buffer */
		float fft_buff[CPE_CHANNELS][2 * L_FFT], /* i : FFT buffer */
		#endif
		const int16_t tdm_SM_flag, /* i : channel combination scheme flag */
		const int16_t ivas_format, /* i : IVAS format */
		const int16_t flag_16k_smc /* i : flag to indicate if the OL SMC is run at 16 kHz */
		@@ -480,13 +459,8 @@ ivas_error ivas_core_dec(
		CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */
		MCT_DEC_HANDLE hMCT, /* i/o: MCT decoder structure */
		const int16_t n_channels, /* i : number of channels to be decoded */
		#ifdef FIX_854_ARRAY_SIZE_MISMATCH
		float output[], / o : output synthesis signal */
		float outputHB[][L_FRAME48k], /* o : output HB synthesis signal */
		#else
		float output[CPE_CHANNELS], / o : output synthesis signal */
		float outputHB[CPE_CHANNELS][L_FRAME48k], /* o : output HB synthesis signal */
		#endif
		float DFT[CPE_CHANNELS][STEREO_DFT_BUF_MAX], /* o : DFT buffers */
		const int16_t sba_dirac_stereo_flag /* i : signal stereo output for SBA DirAC */
		);

lib_com/options.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -151,7 +151,6 @@
		/#define SPLIT_REND_WITH_HEAD_ROT / /* Dlb,FhG: Split Rendering contributions 21 and 35 */

		#define FIX_820_DOUBLE_PREC_MACROS /* VA: issue 820: Double precision arithmetic in IVAS_CALCULATE_ABS() */
		#define FIX_854_ARRAY_SIZE_MISMATCH /* VA: issue 854: correct the mismatch between definition and declaration of `ivas_core_dec() */
		#define FIX_785_REMOVE_DEAD_CODE /* VA: issue 785: remove dead code */
		#define FIX_852_FIX_HANDLE_DEREF /* VA: issue 852: Fix missing handle dereferencing of hIsmMetadaData in ivas_ism_metadata_close() */
		#define FIX_520_REMOVE_MEMMOVE_JBM /* VA: issue 520: Remove memmove() from JBM code */

lib_dec/ivas_core_dec.c

+7 −12

Original line number	Diff line number	Diff line
		@@ -60,13 +60,8 @@ ivas_error ivas_core_dec(
		CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */
		MCT_DEC_HANDLE hMCT, /* i/o: MCT decoder structure */
		const int16_t n_channels, /* i : number of channels to be decoded */
		#ifdef FIX_854_ARRAY_SIZE_MISMATCH
		float output[], / o : output synthesis signal */
		float hb_synth[][L_FRAME48k], /* o : output HB synthesis signal */
		#else
		float output[L_FRAME48k], / o : output synthesis signal */
		float hb_synth[CPE_CHANNELS][L_FRAME48k], /* o : output HB synthesis signal */
		#endif
		float DFT[CPE_CHANNELS][STEREO_DFT_BUF_MAX], /* o : DFT buffers */
		const int16_t sba_dirac_stereo_flag /* i : signal stereo output for SBA DirAC */
		)

lib_enc/ivas_core_enc.c

+7 −28

Original line number	Diff line number	Diff line
		@@ -59,7 +59,6 @@ ivas_error ivas_core_enc(
		CPE_ENC_HANDLE hCPE, /* i/o: CPE encoder structure */
		MCT_ENC_HANDLE hMCT, /* i/o: MCT encoder structure */
		const int16_t n_CoreChannels, /* i : number of core channels to be coded */
		#ifdef FIX_854_ARRAY_SIZE_MISMATCH
		float old_inp_12k8[][L_INP_12k8], /* i : buffer of old input signal */
		float old_inp_16k[][L_INP], /* i : buffer of old input signal */
		float ener[], /* i : residual energy from Levinson-Durbin */
		@@ -78,26 +77,6 @@ ivas_error ivas_core_enc(
		const int16_t vad_flag_dtx[], /* i : HE-SAD flag with additional DTX HO */
		float enerBuffer[][CLDFB_NO_CHANNELS_MAX], /* i : energy buffer */
		float fft_buff[][2 * L_FFT], /* i : FFT buffer */
		#else
		float old_inp_12k8[CPE_CHANNELS][L_INP_12k8], /* i : buffer of old input signal */
		float old_inp_16k[CPE_CHANNELS][L_INP], /* i : buffer of old input signal */
		float ener[CPE_CHANNELS], /* i : residual energy from Levinson-Durbin */
		float A[CPE_CHANNELS][NB_SUBFR16k * ( M + 1 )], /* i : A(z) unquantized for the 4 subframes */
		float Aw[CPE_CHANNELS][NB_SUBFR16k * ( M + 1 )], /* i : weighted A(z) unquantized for subframes */
		float epsP[CPE_CHANNELS][M + 1], /* i : LP prediction errors */
		float lsp_new[CPE_CHANNELS][M], /* i : LSPs at the end of the frame */
		float lsp_mid[CPE_CHANNELS][M], /* i : LSPs in the middle of the frame */
		const int16_t vad_hover_flag[CPE_CHANNELS], /* i : VAD hanglover flag */
		int16_t attack_flag[CPE_CHANNELS], /* i : attack flag (GSC or TC) */
		float realBuffer[CPE_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i/o: real buffer */
		float imagBuffer[CPE_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX], /* i/o: imag buffer */
		float old_wsp[CPE_CHANNELS][L_WSP], /* i : weighted input signal buffer */
		const int16_t loc_harm[CPE_CHANNELS], /* i : harmonicity flag */
		const float cor_map_sum[CPE_CHANNELS], /* i : speech/music clasif. parameter */
		const int16_t vad_flag_dtx[CPE_CHANNELS], /* i : HE-SAD flag with additional DTX HO */
		float enerBuffer[CPE_CHANNELS][CLDFB_NO_CHANNELS_MAX], /* i : energy buffer */
		float fft_buff[CPE_CHANNELS][2 * L_FFT], /* i : FFT buffer */
		#endif
		const int16_t tdm_SM_or_LRTD_Pri, /* i : channel combination scheme flag */
		const int16_t ivas_format, /* i : IVAS format */
		const int16_t flag_16k_smc /* i : flag to indicate if the OL SMC is run at 16 kHz */