Commit dbfd0b8d authored by Vladimir Malenovsky's avatar Vladimir Malenovsky
Browse files

Merge branch 'main' into 876-nonbe_unified_decoding_paths-increased-memory-consumption_ver2

parents eee45a96 d3ba2156

lib_com/ivas_prot.h

+11 −0
Original line number Diff line number Diff line
@@ -189,10 +189,17 @@ 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                  */

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

    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   */
@@ -990,7 +997,11 @@ ivas_error ivas_ism_metadata_dec_create( 


ivas_error ivas_ism_enc(

    Encoder_Struct *st_ivas,                                    /* i/o: IVAS encoder structure                      */

#ifdef BE_FIX_887_GCC_WARNING_ARRAY_SIZE

    float *data[],                                             /* i  : input signal [channels][samples]            */

#else

    float *data[MAX_NUM_OBJECTS],                               /* i  : input signal                                */

#endif

    const int16_t input_frame,                                  /* i  : input frame length per channel              */

    int16_t *nb_bits_metadata,                                  /* i  : number of metadata bits                     */

    const int16_t flag_omasa_ener_brate                         /* i  : less bitrate for objects in OMASA flag      */

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,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 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_com/prot.h

+14 −5
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

+18 −11
Original line number Diff line number Diff line
@@ -98,10 +98,17 @@ 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               */

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

    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/ivas_enc.c

+2 −0
Original line number Diff line number Diff line
@@ -275,6 +275,7 @@ ivas_error ivas_enc( 
    else if ( ivas_format == MASA_ISM_FORMAT )

    {

        float *data_separated_object;



        int16_t idx_separated_object;

        int16_t flag_omasa_ener_brate;
@@ -297,6 +298,7 @@ ivas_error ivas_enc( 


        set_s( nb_bits_metadata, 0, MAX_SCE + 1 );

        idx_separated_object = 0;



        data_separated_object = data_f[hEncoderConfig->nchan_ism + CPE_CHANNELS];



        /* put audio object data in SCE's */