From 84b4877241e32b83d4128cdad67be2f4ef39c01d Mon Sep 17 00:00:00 2001 From: malenov Date: Wed, 1 Nov 2023 10:15:28 +0100 Subject: [PATCH 1/5] fix array size mismatch in DFT/MDCT stereo functions --- lib_com/ivas_prot.h | 26 ++++++++++++++++++++++++++ lib_com/options.h | 2 +- lib_dec/ivas_mdct_core_dec.c | 4 ++++ lib_dec/ivas_stereo_dft_dec.c | 8 ++++++++ lib_dec/ivas_stereo_mdct_stereo_dec.c | 9 +++++++-- lib_enc/cod_tcx.c | 9 +++++++++ 6 files changed, 55 insertions(+), 3 deletions(-) diff --git a/lib_com/ivas_prot.h b/lib_com/ivas_prot.h index b37a31268c..c3ecd1e35c 100755 --- a/lib_com/ivas_prot.h +++ b/lib_com/ivas_prot.h @@ -1450,7 +1450,11 @@ int16_t stereo_dft_sg_recovery( void stereo_dft_dec_res( CPE_DEC_HANDLE hCPE, /* i/o: decoder CPE handle */ +#ifdef FIX_887_ARRAY_SIZE_DFT_MDCT_STEREO + float res_buf[STEREO_DFT_N_8k], /* i : residual buffer */ +#else float res_buf[STEREO_DFT_BUF_MAX], /* i : residual buffer */ +#endif float *output /* o : output frame */ ); @@ -1474,7 +1478,11 @@ void stereo_dft_dec_read_BS( STEREO_DFT_DEC_DATA_HANDLE hStereoDft, /* i/o: decoder DFT stereo handle */ const int16_t bwidth, /* i : bandwidth */ const int16_t output_frame, /* i : output frame length */ +#ifdef FIX_887_ARRAY_SIZE_DFT_MDCT_STEREO + float res_buf[STEREO_DFT_N_8k], /* o : residual buffer */ +#else float res_buf[STEREO_DFT_BUF_MAX], /* o : residual buffer */ +#endif int16_t *nb_bits, /* o : number of bits read */ float *coh, /* i/o: Coherence */ const int16_t ivas_format /* i : ivas format */ @@ -2249,10 +2257,19 @@ void EstimateStereoTCXNoiseLevel( void TNSAnalysisStereo( Encoder_State **sts, /* i : state handle */ +#ifdef FIX_887_ARRAY_SIZE_DFT_MDCT_STEREO + float *mdst_spectrum[CPE_CHANNELS][NB_DIV], /* o : MDST spectrum */ +#else float *mdst_spectrum[MCT_MAX_CHANNELS][NB_DIV], /* o : MDST spectrum */ +#endif const int16_t bWhitenedDomain, /* i : whitened domain flag */ +#ifdef FIX_887_ARRAY_SIZE_DFT_MDCT_STEREO + int16_t tnsSize[CPE_CHANNELS][NB_DIV], /* i : number of tns parameters put into prm */ + int16_t tnsBits[CPE_CHANNELS][NB_DIV], /* i : number of tns bits in the frame */ +#else int16_t tnsSize[MCT_MAX_CHANNELS][NB_DIV], /* i : number of tns parameters put into prm */ int16_t tnsBits[MCT_MAX_CHANNELS][NB_DIV], /* i : number of tns bits in the frame */ +#endif int16_t param_core[][NB_DIV * NPRM_DIV], /* o : quantized noise filling level */ const int16_t mct_on /* i : flag mct block (1) or stereo (0) */ ); @@ -2535,8 +2552,13 @@ void stereo_decoder_tcx( STEREO_MDCT_DEC_DATA *hStereoMdct, /* i/o: MDCT stereo decoder structure */ int16_t ms_mask[NB_DIV][MAX_SFB], /* i : bandwise MS mask */ float *spec_r_0[NB_DIV], /* i/o: spectrum right channel */ +#ifdef FIX_887_ARRAY_SIZE_DFT_MDCT_STEREO + float **spec_l, /* i/o: spectrum left channel [NB_DIV][N] */ + float **spec_r, /* i/o: spectrum right channel [NB_DIV][N] */ +#else float *spec_l[NB_DIV], /* i/o: spectrum left channel */ float *spec_r[NB_DIV], /* i/o: spectrum right channel */ +#endif const int16_t mdct_stereo_mode[], /* i : stereo mode (FB/band wise MS, dual mono */ const int16_t core_l, /* i : core for left channel (TCX20/TCX10) */ const int16_t core_r, /* i : core for right channel (TCX20/TCX10) */ @@ -3068,7 +3090,11 @@ void mctStereoIGF_enc( void ivas_mdct_dec_side_bits_frame_channel( CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */ +#ifdef FIX_887_ARRAY_SIZE_DFT_MDCT_STEREO + int16_t param_lpc[CPE_CHANNELS][NPRM_LPC_NEW], /* o : lpc_parameters */ +#else int16_t param_lpc[MCT_MAX_CHANNELS][NPRM_LPC_NEW], /* o : lpc_parameters */ +#endif int16_t p_param[CPE_CHANNELS][NB_DIV], /* o : pointer to param buffer */ Decoder_State *st0, /* i : pointer to bitstream handle */ int16_t nTnsBitsTCX10[CPE_CHANNELS][NB_DIV], /* o : number of bits for TNS */ diff --git a/lib_com/options.h b/lib_com/options.h index 6da0523307..b1997eb1c2 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -156,7 +156,7 @@ #define FIX_888_INTERFACE_UNIFICATION /* Nokia: issue #888: fix mismatch in 2D array size */ #define FIX_889_MASA_FILE_WRITER_OPEN /* Nokia: issue #889: mismatch in function definition and use */ #define FIX_890_ARRAY_SIZE /* Nokia: issue #890: mismatch in 2D array size declaration and use */ - +#define FIX_887_ARRAY_SIZE_DFT_MDCT_STEREO /* VA: issue #887: mismatch in defined and supplied array size */ /* #################### End BE switches ################################## */ diff --git a/lib_dec/ivas_mdct_core_dec.c b/lib_dec/ivas_mdct_core_dec.c index d189cdc542..00d3e28dd0 100644 --- a/lib_dec/ivas_mdct_core_dec.c +++ b/lib_dec/ivas_mdct_core_dec.c @@ -286,7 +286,11 @@ static void dec_prm_tcx_spec( void ivas_mdct_dec_side_bits_frame_channel( CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */ +#ifdef FIX_887_ARRAY_SIZE_DFT_MDCT_STEREO + int16_t param_lpc[CPE_CHANNELS][NPRM_LPC_NEW], /* o : lpc_parameters */ +#else int16_t param_lpc[MCT_MAX_CHANNELS][NPRM_LPC_NEW], /* o : lpc_parameters */ +#endif int16_t p_param[CPE_CHANNELS][NB_DIV], /* o : pointer to param buffer */ Decoder_State *st0, /* i : pointer to bitstream handle */ int16_t nTnsBitsTCX10[CPE_CHANNELS][NB_DIV], /* o : number of bits for TNS */ diff --git a/lib_dec/ivas_stereo_dft_dec.c b/lib_dec/ivas_stereo_dft_dec.c index 5c515aeb2a..b28a8f80d0 100644 --- a/lib_dec/ivas_stereo_dft_dec.c +++ b/lib_dec/ivas_stereo_dft_dec.c @@ -1734,7 +1734,11 @@ void stereo_dft_dec( void stereo_dft_dec_res( CPE_DEC_HANDLE hCPE, /* i/o: decoder CPE handle */ +#ifdef FIX_887_ARRAY_SIZE_DFT_MDCT_STEREO + float res_buf[STEREO_DFT_N_8k], /* i : residual buffer */ +#else float res_buf[STEREO_DFT_BUF_MAX], /* i : residual buffer */ +#endif float *output /* o : output */ ) { @@ -1873,7 +1877,11 @@ void stereo_dft_dec_read_BS( STEREO_DFT_DEC_DATA_HANDLE hStereoDft, /* i/o: decoder stereo handle */ const int16_t bwidth, /* i : bandwidth */ const int16_t output_frame, /* i : output frame length */ +#ifdef FIX_887_ARRAY_SIZE_DFT_MDCT_STEREO + float res_buf[STEREO_DFT_N_8k], /* o : residual buffer */ +#else float res_buf[STEREO_DFT_BUF_MAX], /* o : residual buffer */ +#endif int16_t *nb_bits, /* o : number of bits read */ float *coh, /* i/o: Coherence */ const int16_t ivas_format /* i : ivas format */ diff --git a/lib_dec/ivas_stereo_mdct_stereo_dec.c b/lib_dec/ivas_stereo_mdct_stereo_dec.c index 0610447a6f..ff7c4086eb 100644 --- a/lib_dec/ivas_stereo_mdct_stereo_dec.c +++ b/lib_dec/ivas_stereo_mdct_stereo_dec.c @@ -209,14 +209,19 @@ void stereo_decoder_tcx( STEREO_MDCT_DEC_DATA *hStereoMdct, /* i/o: MDCT stereo decoder structure */ int16_t ms_mask[NB_DIV][MAX_SFB], /* i : bandwise MS mask */ float *spec_r_0[NB_DIV], /* i/o: spectrum right channel */ +#ifdef FIX_887_ARRAY_SIZE_DFT_MDCT_STEREO + float **spec_l, /* i/o: spectrum left channel [NB_DIV][N] */ + float **spec_r, /* i/o: spectrum right channel [NB_DIV][N] */ +#else float *spec_l[NB_DIV], /* i/o: spectrum left channel */ float *spec_r[NB_DIV], /* i/o: spectrum right channel */ +#endif const int16_t mdct_stereo_mode[], /* i : stereo mode (FB/band wise MS, dual mono */ const int16_t core_l, /* i : core for left channel (TCX20/TCX10) */ const int16_t core_r, /* i : core for right channel (TCX20/TCX10) */ const int16_t igf, /* i : flag for IGF activity */ - const int16_t L_frameTCX_l, /* i : TCX frame length of left channel */ - const int16_t L_frameTCX_r, /* i : TCX frame length of right channel */ + const int16_t L_frameTCX_l, /* i : TCX frame length of left channel */ + const int16_t L_frameTCX_r, /* i : TCX frame length of right channel */ const int16_t mct_on, /* i : flag mct block (1) or stereo (0) */ const int16_t last_core_l, /* i : last core for left channel */ const int16_t last_core_r, /* i : last core for right channel */ diff --git a/lib_enc/cod_tcx.c b/lib_enc/cod_tcx.c index abaa0a0a8c..6e559026f4 100755 --- a/lib_enc/cod_tcx.c +++ b/lib_enc/cod_tcx.c @@ -110,10 +110,19 @@ void HBAutocorrelation( void TNSAnalysisStereo( Encoder_State **sts, /* i : encoder state handle */ +#ifdef FIX_887_ARRAY_SIZE_DFT_MDCT_STEREO + float *mdst_spectrum[CPE_CHANNELS][NB_DIV], /* o : MDST spectrum */ +#else float *mdst_spectrum[MCT_MAX_CHANNELS][NB_DIV], /* o : MDST spectrum */ +#endif const int16_t bWhitenedDomain, /* i : whitened domain flag */ +#ifdef FIX_887_ARRAY_SIZE_DFT_MDCT_STEREO + int16_t tnsSize[CPE_CHANNELS][NB_DIV], /* i : number of tns parameters put into prm */ + int16_t tnsBits[CPE_CHANNELS][NB_DIV], /* i : number of tns bits in the frame */ +#else int16_t tnsSize[MCT_MAX_CHANNELS][NB_DIV], /* i : number of tns parameters put into prm */ int16_t tnsBits[MCT_MAX_CHANNELS][NB_DIV], /* i : number of tns bits in the frame */ +#endif int16_t param_core[][NB_DIV * NPRM_DIV], /* o : TNS parameters */ const int16_t mct_on /* i : flag mct block (1) or stereo (0) */ ) -- GitLab From d9d852061c94ea0edc6ed0e2175eabf4c0904c81 Mon Sep 17 00:00:00 2001 From: malenov Date: Wed, 1 Nov 2023 10:18:26 +0100 Subject: [PATCH 2/5] fix array size mismatch in res_bpf_adapt() --- lib_com/ivas_prot.h | 4 ++++ lib_dec/bass_psfilter.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/lib_com/ivas_prot.h b/lib_com/ivas_prot.h index c3ecd1e35c..3ad3042992 100755 --- a/lib_com/ivas_prot.h +++ b/lib_com/ivas_prot.h @@ -1462,7 +1462,11 @@ void stereo_dft_dec_res( int16_t res_bpf_adapt( STEREO_DFT_DEC_DATA_HANDLE hStereoDft, /* i/o: DFT stereo decoder handle */ const float *bpf_error_signal_8k, /* i : BPF modification signal */ +#ifdef FIX_887_ARRAY_SIZE_DFT_MDCT_STEREO + float res_buf[STEREO_DFT_N_8k] /* i : residual buffer */ +#else float res_buf[STEREO_DFT_BUF_MAX] /* i : residual buffer */ +#endif ); void bpf_pitch_coherence( diff --git a/lib_dec/bass_psfilter.c b/lib_dec/bass_psfilter.c index 0a0eabd115..50844cb2d2 100644 --- a/lib_dec/bass_psfilter.c +++ b/lib_dec/bass_psfilter.c @@ -522,7 +522,11 @@ void addBassPostFilter( int16_t res_bpf_adapt( STEREO_DFT_DEC_DATA_HANDLE hStereoDft, /* i/o: DFT stereo decoder handle */ const float *bpf_error_signal_8k, /* i : BPF modification signal */ +#ifdef FIX_887_ARRAY_SIZE_DFT_MDCT_STEREO + float res_buf[STEREO_DFT_N_8k] /* i : residual buffer */ +#else float res_buf[STEREO_DFT_BUF_MAX] /* i : residual buffer */ +#endif ) { float error_nrg; -- GitLab From 48c43b2ed944deb989c7750e2f0b7dc68265e5c3 Mon Sep 17 00:00:00 2001 From: Vladimir Malenovsky Date: Wed, 1 Nov 2023 10:22:06 +0100 Subject: [PATCH 3/5] clang format --- lib_dec/bass_psfilter.c | 4 ++-- lib_dec/ivas_mdct_core_dec.c | 6 +++--- lib_dec/ivas_stereo_dft_dec.c | 16 +++++++-------- lib_dec/ivas_stereo_mdct_stereo_dec.c | 28 +++++++++++++-------------- lib_enc/cod_tcx.c | 8 ++++---- 5 files changed, 31 insertions(+), 31 deletions(-) diff --git a/lib_dec/bass_psfilter.c b/lib_dec/bass_psfilter.c index 50844cb2d2..d1fc86e0ed 100644 --- a/lib_dec/bass_psfilter.c +++ b/lib_dec/bass_psfilter.c @@ -523,9 +523,9 @@ int16_t res_bpf_adapt( STEREO_DFT_DEC_DATA_HANDLE hStereoDft, /* i/o: DFT stereo decoder handle */ const float *bpf_error_signal_8k, /* i : BPF modification signal */ #ifdef FIX_887_ARRAY_SIZE_DFT_MDCT_STEREO - float res_buf[STEREO_DFT_N_8k] /* i : residual buffer */ + float res_buf[STEREO_DFT_N_8k] /* i : residual buffer */ #else - float res_buf[STEREO_DFT_BUF_MAX] /* i : residual buffer */ + float res_buf[STEREO_DFT_BUF_MAX] /* i : residual buffer */ #endif ) { diff --git a/lib_dec/ivas_mdct_core_dec.c b/lib_dec/ivas_mdct_core_dec.c index 00d3e28dd0..3e6d630a8e 100644 --- a/lib_dec/ivas_mdct_core_dec.c +++ b/lib_dec/ivas_mdct_core_dec.c @@ -285,11 +285,11 @@ static void dec_prm_tcx_spec( *-----------------------------------------------------------------*/ void ivas_mdct_dec_side_bits_frame_channel( - CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */ + CPE_DEC_HANDLE hCPE, /* i/o: CPE decoder structure */ #ifdef FIX_887_ARRAY_SIZE_DFT_MDCT_STEREO - int16_t param_lpc[CPE_CHANNELS][NPRM_LPC_NEW], /* o : lpc_parameters */ + int16_t param_lpc[CPE_CHANNELS][NPRM_LPC_NEW], /* o : lpc_parameters */ #else - int16_t param_lpc[MCT_MAX_CHANNELS][NPRM_LPC_NEW], /* o : lpc_parameters */ + int16_t param_lpc[MCT_MAX_CHANNELS][NPRM_LPC_NEW], /* o : lpc_parameters */ #endif int16_t p_param[CPE_CHANNELS][NB_DIV], /* o : pointer to param buffer */ Decoder_State *st0, /* i : pointer to bitstream handle */ diff --git a/lib_dec/ivas_stereo_dft_dec.c b/lib_dec/ivas_stereo_dft_dec.c index b28a8f80d0..c74a55ffe1 100644 --- a/lib_dec/ivas_stereo_dft_dec.c +++ b/lib_dec/ivas_stereo_dft_dec.c @@ -1733,13 +1733,13 @@ void stereo_dft_dec( *-------------------------------------------------------------------------*/ void stereo_dft_dec_res( - CPE_DEC_HANDLE hCPE, /* i/o: decoder CPE handle */ + CPE_DEC_HANDLE hCPE, /* i/o: decoder CPE handle */ #ifdef FIX_887_ARRAY_SIZE_DFT_MDCT_STEREO - float res_buf[STEREO_DFT_N_8k], /* i : residual buffer */ + float res_buf[STEREO_DFT_N_8k], /* i : residual buffer */ #else float res_buf[STEREO_DFT_BUF_MAX], /* i : residual buffer */ #endif - float *output /* o : output */ + float *output /* o : output */ ) { int16_t i; @@ -1878,13 +1878,13 @@ void stereo_dft_dec_read_BS( const int16_t bwidth, /* i : bandwidth */ const int16_t output_frame, /* i : output frame length */ #ifdef FIX_887_ARRAY_SIZE_DFT_MDCT_STEREO - float res_buf[STEREO_DFT_N_8k], /* o : residual buffer */ + float res_buf[STEREO_DFT_N_8k], /* o : residual buffer */ #else - float res_buf[STEREO_DFT_BUF_MAX], /* o : residual buffer */ + float res_buf[STEREO_DFT_BUF_MAX], /* o : residual buffer */ #endif - int16_t *nb_bits, /* o : number of bits read */ - float *coh, /* i/o: Coherence */ - const int16_t ivas_format /* i : ivas format */ + int16_t *nb_bits, /* o : number of bits read */ + float *coh, /* i/o: Coherence */ + const int16_t ivas_format /* i : ivas format */ ) { int16_t b, N_div, nbands; diff --git a/lib_dec/ivas_stereo_mdct_stereo_dec.c b/lib_dec/ivas_stereo_mdct_stereo_dec.c index ff7c4086eb..3a1768be3d 100644 --- a/lib_dec/ivas_stereo_mdct_stereo_dec.c +++ b/lib_dec/ivas_stereo_mdct_stereo_dec.c @@ -210,22 +210,22 @@ void stereo_decoder_tcx( int16_t ms_mask[NB_DIV][MAX_SFB], /* i : bandwise MS mask */ float *spec_r_0[NB_DIV], /* i/o: spectrum right channel */ #ifdef FIX_887_ARRAY_SIZE_DFT_MDCT_STEREO - float **spec_l, /* i/o: spectrum left channel [NB_DIV][N] */ - float **spec_r, /* i/o: spectrum right channel [NB_DIV][N] */ + float **spec_l, /* i/o: spectrum left channel [NB_DIV][N] */ + float **spec_r, /* i/o: spectrum right channel [NB_DIV][N] */ #else - float *spec_l[NB_DIV], /* i/o: spectrum left channel */ - float *spec_r[NB_DIV], /* i/o: spectrum right channel */ + float *spec_l[NB_DIV], /* i/o: spectrum left channel */ + float *spec_r[NB_DIV], /* i/o: spectrum right channel */ #endif - const int16_t mdct_stereo_mode[], /* i : stereo mode (FB/band wise MS, dual mono */ - const int16_t core_l, /* i : core for left channel (TCX20/TCX10) */ - const int16_t core_r, /* i : core for right channel (TCX20/TCX10) */ - const int16_t igf, /* i : flag for IGF activity */ - const int16_t L_frameTCX_l, /* i : TCX frame length of left channel */ - const int16_t L_frameTCX_r, /* i : TCX frame length of right channel */ - const int16_t mct_on, /* i : flag mct block (1) or stereo (0) */ - const int16_t last_core_l, /* i : last core for left channel */ - const int16_t last_core_r, /* i : last core for right channel */ - const int16_t tmp_plc_upmix /* i : indicates temp upmix for PLC decision */ + const int16_t mdct_stereo_mode[], /* i : stereo mode (FB/band wise MS, dual mono */ + const int16_t core_l, /* i : core for left channel (TCX20/TCX10) */ + const int16_t core_r, /* i : core for right channel (TCX20/TCX10) */ + const int16_t igf, /* i : flag for IGF activity */ + const int16_t L_frameTCX_l, /* i : TCX frame length of left channel */ + const int16_t L_frameTCX_r, /* i : TCX frame length of right channel */ + const int16_t mct_on, /* i : flag mct block (1) or stereo (0) */ + const int16_t last_core_l, /* i : last core for left channel */ + const int16_t last_core_r, /* i : last core for right channel */ + const int16_t tmp_plc_upmix /* i : indicates temp upmix for PLC decision */ ) { int16_t i, k, sfb, nSubframes; diff --git a/lib_enc/cod_tcx.c b/lib_enc/cod_tcx.c index 6e559026f4..9e4b601a53 100755 --- a/lib_enc/cod_tcx.c +++ b/lib_enc/cod_tcx.c @@ -109,13 +109,13 @@ void HBAutocorrelation( #define TNS_GAIN_THRESHOLD_FOR_WHITE ( 3.0f ) void TNSAnalysisStereo( - Encoder_State **sts, /* i : encoder state handle */ + Encoder_State **sts, /* i : encoder state handle */ #ifdef FIX_887_ARRAY_SIZE_DFT_MDCT_STEREO float *mdst_spectrum[CPE_CHANNELS][NB_DIV], /* o : MDST spectrum */ #else float *mdst_spectrum[MCT_MAX_CHANNELS][NB_DIV], /* o : MDST spectrum */ #endif - const int16_t bWhitenedDomain, /* i : whitened domain flag */ + const int16_t bWhitenedDomain, /* i : whitened domain flag */ #ifdef FIX_887_ARRAY_SIZE_DFT_MDCT_STEREO int16_t tnsSize[CPE_CHANNELS][NB_DIV], /* i : number of tns parameters put into prm */ int16_t tnsBits[CPE_CHANNELS][NB_DIV], /* i : number of tns bits in the frame */ @@ -123,8 +123,8 @@ void TNSAnalysisStereo( int16_t tnsSize[MCT_MAX_CHANNELS][NB_DIV], /* i : number of tns parameters put into prm */ int16_t tnsBits[MCT_MAX_CHANNELS][NB_DIV], /* i : number of tns bits in the frame */ #endif - int16_t param_core[][NB_DIV * NPRM_DIV], /* o : TNS parameters */ - const int16_t mct_on /* i : flag mct block (1) or stereo (0) */ + int16_t param_core[][NB_DIV * NPRM_DIV], /* o : TNS parameters */ + const int16_t mct_on /* i : flag mct block (1) or stereo (0) */ ) { int16_t ch, k, L_spec, L_frame, nSubframes, iFilter; -- GitLab From fac3112212a98ba068af50d1b5134630f52dd07b Mon Sep 17 00:00:00 2001 From: malenov Date: Mon, 20 Nov 2023 09:49:59 +0100 Subject: [PATCH 4/5] revert accidentally removed macro definition --- lib_com/options.h | 1 + 1 file changed, 1 insertion(+) diff --git a/lib_com/options.h b/lib_com/options.h index a4eab8337d..bfe30c6901 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -154,6 +154,7 @@ /* #################### End BE switches ################################## */ #define FIX_899_VARIABLE_SPEED_DECODING /* FhG: Fix variable speed decoding */ +#define FIX_887_ARRAY_SIZE_DFT_MDCT_STEREO /* VA: Fix the definition of buffers/arrays in DFT and MDCT stereo to satisfy gcc v 11.4.0 */ /* #################### Start NON-BE switches ############################ */ /* any switch which is non-be wrt selection floating point code */ -- GitLab From c8643bbc1cd1b308739919627e5edc29196b5899 Mon Sep 17 00:00:00 2001 From: malenov Date: Mon, 20 Nov 2023 10:10:17 +0100 Subject: [PATCH 5/5] change from float **x to float *x[] --- lib_com/ivas_prot.h | 4 ++-- lib_dec/ivas_stereo_mdct_stereo_dec.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib_com/ivas_prot.h b/lib_com/ivas_prot.h index f200d55ed4..eb2f59fe89 100755 --- a/lib_com/ivas_prot.h +++ b/lib_com/ivas_prot.h @@ -2560,8 +2560,8 @@ void stereo_decoder_tcx( int16_t ms_mask[NB_DIV][MAX_SFB], /* i : bandwise MS mask */ float *spec_r_0[NB_DIV], /* i/o: spectrum right channel */ #ifdef FIX_887_ARRAY_SIZE_DFT_MDCT_STEREO - float **spec_l, /* i/o: spectrum left channel [NB_DIV][N] */ - float **spec_r, /* i/o: spectrum right channel [NB_DIV][N] */ + float *spec_l[], /* i/o: spectrum left channel [NB_DIV][N] */ + float *spec_r[], /* i/o: spectrum right channel [NB_DIV][N] */ #else float *spec_l[NB_DIV], /* i/o: spectrum left channel */ float *spec_r[NB_DIV], /* i/o: spectrum right channel */ diff --git a/lib_dec/ivas_stereo_mdct_stereo_dec.c b/lib_dec/ivas_stereo_mdct_stereo_dec.c index 3a1768be3d..95d7ba6d68 100644 --- a/lib_dec/ivas_stereo_mdct_stereo_dec.c +++ b/lib_dec/ivas_stereo_mdct_stereo_dec.c @@ -210,8 +210,8 @@ void stereo_decoder_tcx( int16_t ms_mask[NB_DIV][MAX_SFB], /* i : bandwise MS mask */ float *spec_r_0[NB_DIV], /* i/o: spectrum right channel */ #ifdef FIX_887_ARRAY_SIZE_DFT_MDCT_STEREO - float **spec_l, /* i/o: spectrum left channel [NB_DIV][N] */ - float **spec_r, /* i/o: spectrum right channel [NB_DIV][N] */ + float *spec_l[], /* i/o: spectrum left channel [NB_DIV][N] */ + float *spec_r[], /* i/o: spectrum right channel [NB_DIV][N] */ #else float *spec_l[NB_DIV], /* i/o: spectrum left channel */ float *spec_r[NB_DIV], /* i/o: spectrum right channel */ -- GitLab