Commit 39336ffe authored by vaclav's avatar vaclav
Browse files

Merge branch '887-linux-warnings-when-compiled-on-ubuntu-22-04-2' into 'main' 

Mismatch of the expected and provided function argument size in DFT/MDCT stereo functions

See merge request !1203
parents 4a275d53 384fff88

lib_com/ivas_prot.h

+30 −0
Original line number Diff line number Diff line
@@ -1453,7 +1453,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                        */

);
@@ -1461,7 +1465,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(
@@ -1477,7 +1485,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                         */
@@ -2252,10 +2264,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)        */

);
@@ -2538,8 +2559,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)    */
@@ -3071,7 +3097,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                  */

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -156,6 +156,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 */

lib_dec/bass_psfilter.c

+5 −1
Original line number Diff line number Diff line
@@ -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;

lib_dec/ivas_mdct_core_dec.c

+6 −2
Original line number Diff line number Diff line
@@ -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              */

lib_dec/ivas_stereo_dft_dec.c

+14 −6
Original line number Diff line number Diff line
@@ -1742,7 +1742,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             */

)

{
@@ -1881,7 +1885,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             */