Commit d8885494 authored by malenov's avatar malenov
Browse files

change the array definition of fr_bands_LR[][]

parent 0fcb812a

lib_com/ivas_prot.h

+4 −0
Original line number Diff line number Diff line
@@ -189,7 +189,11 @@ ivas_error pre_proc_front_ivas( 
    const float tdm_lsp_new_PCh[M],                             /* i  : unq. LSPs of primary channel               */

    const float currFlatness,                                   /* i  : flatness parameter                         */

    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                  */

#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  */

lib_com/options.h

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



#define FIX_879_USAN_ERROR_IN_MASA_DECODING             /* FhG: Issue 879 : avoid arithmetic with NULL pointer in the DirAC decoder to fix USAN error */



#define FIX_740_MASA_PREREND_VALIDITY_CHECK             /* Nokia: issue 740: fix incorrect validity check in lib_rend to allow use of MASA prerenderer */

#define BE_FIX_887_GCC_WARNING_ARRAY_SIZE               /* VoiceAge: Issue 887: change array size definition to avoid warning with gcc 11.4.0 */



/* #################### End BE switches ################################## */

lib_enc/ivas_core_pre_proc_front.c

+4 −0
Original line number Diff line number Diff line
@@ -98,7 +98,11 @@ ivas_error pre_proc_front_ivas( 
    const float tdm_lsp_new_PCh[M],                            /* i  : unq. LSPs of primary channel            */

    const float currFlatness,                                  /* i  : flatness parameter                      */

    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               */

#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  */