Commit 1be79267 authored by malenov's avatar malenov
Browse files

more modifications of array size declarations

parent d8885494

lib_com/ivas_prot.h

+4 −1
Original line number Diff line number Diff line
@@ -191,12 +191,15 @@ ivas_error pre_proc_front_ivas( 
    const int16_t tdm_ratio_idx,                                /* i  : Current Ratio_L index                      */ 

#ifdef BE_FIX_887_GCC_WARNING_ARRAY_SIZE

    float fr_bands_LR[][2 * NB_BANDS],                          /* i  : energy in frequency bands                  */

    const float Etot_LR[],                                      /* i  : total energy Left & Right channel          */

    float lf_E_LR[][2 * VOIC_BINS],                             /* i  : per bin spectrum energy in lf, LR channels */

    const int16_t localVAD_HE_SAD_LR[],                         /* i  : HE-SAD flag without hangover, LR channels  */

#else

    float fr_bands_LR[CPE_CHANNELS][2 * NB_BANDS],              /* i  : energy in frequency bands                  */

#endif

    const float Etot_LR[CPE_CHANNELS],                          /* i  : total energy Left & Right channel          */

    float lf_E_LR[CPE_CHANNELS][2 * VOIC_BINS],                 /* i  : per bin spectrum energy in lf, LR channels */

    const int16_t localVAD_HE_SAD_LR[CPE_CHANNELS],             /* i  : HE-SAD flag without hangover, LR channels  */

#endif

    float band_energies_LR[2 * NB_BANDS],                       /* o  : energy in critical bands without minimum noise floor E_MIN      */

    const int16_t flag_16k_smc,                                 /* i  : flag to indicate if the OL SMC is run at 16 kHz */

    const int16_t front_vad_flag,                               /* i  : front-VAD flag to overwrite VAD decision   */

lib_com/prot.h

+9 −0
Original line number Diff line number Diff line
@@ -3249,10 +3249,19 @@ void long_enr( 
    const float Etot,                               /* i  : total channel energy                     */

    const int16_t localVAD_HE_SAD,                  /* i  : HE-SAD flag without hangover             */

    const int16_t high_lpn_flag,                    /* i  : sp/mus LPN flag                          */

#ifdef BE_FIX_887_GCC_WARNING_ARRAY_SIZE

    FRONT_VAD_ENC_HANDLE hFrontVad[],               /* i/o: front-VAD handles                        */

#else

    FRONT_VAD_ENC_HANDLE hFrontVad[CPE_CHANNELS],   /* i/o: front-VAD handles                        */

#endif

    const int16_t n_chan,                           /* i  : number of channels                       */

#ifdef BE_FIX_887_GCC_WARNING_ARRAY_SIZE

    const int16_t localVAD_HE_SAD_LR[],             /* i  : HE-SAD flag without hangover LR channels */

    const float Etot_LR[]                           /* i  : total channel energy LR channels         */

#else

    const int16_t localVAD_HE_SAD_LR[CPE_CHANNELS], /* i  : HE-SAD flag without hangover LR channels */

    const float Etot_LR[CPE_CHANNELS]               /* i  : total channel energy LR channels         */

#endif

);



void noise_est_pre(

lib_enc/ivas_core_pre_proc_front.c

+4 −1
Original line number Diff line number Diff line
@@ -100,12 +100,15 @@ ivas_error pre_proc_front_ivas( 
    const int16_t tdm_ratio_idx,                               /* i  : Current Ratio_L index                   */

#ifdef BE_FIX_887_GCC_WARNING_ARRAY_SIZE

    float fr_bands_LR[][2 * NB_BANDS],                         /* i  : energy in frequency bands               */

    const float Etot_LR[],                                     /* i  : total energy Left & Right channel       */

    float lf_E_LR[][2 * VOIC_BINS],                            /* i  : per bin spectrum energy in lf, LR channels */

    const int16_t localVAD_HE_SAD_LR[],                        /* i  : HE-SAD flag without hangover, LR channels  */

#else

    float fr_bands_LR[CPE_CHANNELS][2 * NB_BANDS],             /* i  : energy in frequency bands               */

#endif

    const float Etot_LR[CPE_CHANNELS],                         /* i  : total energy Left & Right channel       */

    float lf_E_LR[CPE_CHANNELS][2 * VOIC_BINS],                /* i  : per bin spectrum energy in lf, LR channels */

    const int16_t localVAD_HE_SAD_LR[CPE_CHANNELS],            /* i  : HE-SAD flag without hangover, LR channels  */

#endif

    float band_energies_LR[2 * NB_BANDS],                      /* o  : energy in critical bands without minimum noise floor E_MIN */

    const int16_t flag_16k_smc,                                /* i  : flag to indicate if the OL SMC is run at 16 kHz */

    const int16_t front_vad_flag,                              /* i  : front-VAD flag to overwrite VAD decision */

lib_enc/long_enr.c

+9 −0
Original line number Diff line number Diff line
@@ -54,10 +54,19 @@ void long_enr( 
    const float Etot,                               /* i  : total channel energy                     */

    const int16_t localVAD_HE_SAD,                  /* i  : HE-SAD flag without hangover             */

    const int16_t high_lpn_flag,                    /* i  : sp/mus LPN flag                          */

#ifdef BE_FIX_887_GCC_WARNING_ARRAY_SIZE

    FRONT_VAD_ENC_HANDLE hFrontVad[],               /* i/o: front-VAD handles                        */

#else

    FRONT_VAD_ENC_HANDLE hFrontVad[CPE_CHANNELS],   /* i/o: front-VAD handles                        */

#endif

    const int16_t n_chan,                           /* i  : number of channels                       */

#ifdef BE_FIX_887_GCC_WARNING_ARRAY_SIZE

    const int16_t localVAD_HE_SAD_LR[],             /* i  : HE-SAD flag without hangover LR channels */

    const float Etot_LR[]                           /* i  : total channel energy LR channels         */

#else

    const int16_t localVAD_HE_SAD_LR[CPE_CHANNELS], /* i  : HE-SAD flag without hangover LR channels */

    const float Etot_LR[CPE_CHANNELS]               /* i  : total channel energy LR channels         */

#endif

)

{

    float tmp;