Commit aa6f679e authored by Sandesh Venkatesh's avatar Sandesh Venkatesh Committed by Fabian Bauer
Browse files

Integration of ivas_analy_sp_fx in front_vad_fx, Bug fixes and Q-documentation

parent aa042ea8

Workspace_msvc/lib_enc.vcxproj

+1 −1
Original line number Diff line number Diff line
@@ -229,6 +229,7 @@ 
    <ClCompile Include="..\lib_enc\ivas_omasa_enc.c" />

    <ClCompile Include="..\lib_enc\ivas_pca_enc.c" />

    <ClCompile Include="..\lib_enc\ivas_range_uni_enc.c" />

    <ClCompile Include="..\lib_enc\ivas_rom_enc_fx.c" />

    <ClCompile Include="..\lib_enc\ivas_spar_encoder.c" />

    <ClCompile Include="..\lib_enc\ivas_spar_md_enc.c" />

    <ClCompile Include="..\lib_enc\ivas_stereo_adapt_GR_enc.c" />
@@ -331,7 +332,6 @@ 
    <ClCompile Include="..\lib_enc\ivas_mdct_core_enc.c" />

    <ClCompile Include="..\lib_enc\ivas_qmetadata_enc.c" />

    <ClCompile Include="..\lib_enc\ivas_qspherical_enc.c" />

    <ClCompile Include="..\lib_enc\ivas_rom_enc.c" />

    <ClCompile Include="..\lib_enc\ivas_sba_enc.c" />

    <ClCompile Include="..\lib_enc\ivas_sce_enc.c" />

    <ClCompile Include="..\lib_enc\ivas_stereo_eclvq_enc.c" />

Workspace_msvc/lib_enc.vcxproj.filters

+3 −3
Original line number Diff line number Diff line
@@ -436,9 +436,6 @@ 
    <ClCompile Include="..\lib_enc\SNR_calc.c">

      <Filter>enc_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\ivas_rom_enc.c">

      <Filter>enc_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\ivas_mcmasa_enc.c">

      <Filter>enc_ivas_c</Filter>

    </ClCompile>
@@ -1013,6 +1010,9 @@ 
    <ClCompile Include="..\lib_enc\scale_enc_fx.c">

      <Filter>enc_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\ivas_rom_enc_fx.c">

      <Filter>enc_ivas_c</Filter>

    </ClCompile>

  </ItemGroup>

  <ItemGroup>

    <ClInclude Include="..\lib_enc\ivas_stat_enc.h">

lib_com/cnst.h

+1 −0
Original line number Diff line number Diff line
@@ -2774,6 +2774,7 @@ enum 
#define MU_MA_FX                              10923     /* original prediction factor for the AMR WB tables (Q15) */



#define E_MIN_FXQ15                           115     /* Q15*/

#define E_MIN_FXQ31                           7516193     /* 0.0035d in Q31*/



#define MAX_DYNAMIC_FX                         (82*128)

#define MIN_DYNAMIC_FX                         (50*128)

lib_com/ivas_prot_fx.h

+8 −4
Original line number Diff line number Diff line
@@ -4564,13 +4564,17 @@ ivas_error front_vad_fx( 
    const Word16 MCT_flag,                      /* i  : hMCT handle allocated (1) or not (0)                      */

    const Word16 input_frame,                   /* i  : frame length                                              */

    Word16 vad_flag_dtx[],                      /* o  : HE-SAD flag with additional DTX HO                        */

    Word32 fr_bands_fx[][2 * NB_BANDS],         /* o  : energy in frequency bands     Q_buffer[n] + QSCALE + 2                            */

    Word32 fr_bands_fx[][2 * NB_BANDS],         /* o  : energy in frequency bands     q_fr_bands_fx                            */

    Word16 q_fr_bands[],                        /* o  : Q of fr_bands_fx     Q0                            */

    Word16 Etot_LR_fx[],                        /* o  : total energy Left & Right channel       Q8                  */

    Word32 lf_E_fx[][2 * VOIC_BINS],            /* i  : per bin spectrum energy in lf, LR channels  Q_buffer[n] + QSCALE              */

    Word32 lf_E_fx[][2 * VOIC_BINS],            /* i  : per bin spectrum energy in lf, LR channels  q_lf_E              */

    Word16 q_lf_E[],                            /* o  : Q of lf_E_fx              */

    Word16 localVAD_HE_SAD[],                   /* o  : HE-SAD flag without hangover, LR channels                 */

    Word16 vad_hover_flag[],                    /* o  : VAD hangover flag                                         */

    Word32 band_energies_LR_fx[2 * NB_BANDS],   /* o  : energy in critical bands without minimum noise floor E_MIN Q_buffer[1] + QSCALE + 2 - band_ener_guardbits*/

    Word32 *PS_out_fx,                          /* o  : energy spectrum                                       Q_buffer + QSCALE    */

    Word32 band_energies_LR_fx[2 * NB_BANDS],   /* o  : energy in critical bands without minimum noise floor E_MIN  q_band_energies_LR */

    Word16 *q_band_energies_LR,                 /* o  : Q of band_energies_LR_fx */

    Word32 *PS_out_fx,                          /* o  : energy spectrum                                       q_PS_out    */

    Word16 *q_PS_out,                           /* o  : Q of PS_out_fx                                        Q0          */

    Word16 *Bin_E_out_fx,                       /* o  : log-energy spectrum of the current frame            Q7      */

    Word16 Q_inp,

    Word16 *Q_buffer,

lib_com/prot.h

+0 −6
Original line number Diff line number Diff line
@@ -5666,12 +5666,6 @@ void adapt_lag_wind_fx( 
    const int32_t sr_core /* i  : core sampling rate                                     */

);



void init_coder_ace_plus(

    Encoder_State *st,              /* i  : Encoder state handle                */

    const int32_t last_total_brate, /* i  : last total bitrate                  */

    const int16_t MCT_flag          /* i  : hMCT handle allocated (1) or not (0)*/

);



void core_coder_reconfig(

    Encoder_State *st,             /* i/o: encoder state structure             */

    const int32_t last_total_brate /* i  : last total bitrate                  */