Commit c52af272 authored by norvell's avatar norvell
Browse files

Merge branch 'main' into ci/peaq-for-enc-passthrough

parents 5c80b92c bbfbe899

.gitlab/issue_templates/float-update-porting.md

0 → 100644
+8 −0
Original line number Diff line number Diff line 
# Basic Info



<!--- Remember to add issue and MR links to the status page in wiki here https://forge.3gpp.org/rep/sa4/audio/ivas-basop/-/wikis/IVAS-PC-MR-conversion-status -->

- Original merge request in float repo:

- Branch for float ref update:

- Branch for BASOP update:



/label ~Type:FloatUpdatePorting ~Status::ToDo

.gitlab/merge_request_templates/float-update-porting.md

0 → 100644
+6 −0
Original line number Diff line number Diff line 


- Link to issue in BASOP repo:

- Link to original issue in float repo:

- Requested reviewers:



/label Type:FloatUpdatePorting

Workspace_msvc/lib_enc.vcxproj

+1 −17
Original line number Diff line number Diff line
@@ -381,18 +381,10 @@ 
    <ClCompile Include="..\lib_enc\nelp_enc_fx.c" />

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

    <ClCompile Include="..\lib_enc\ivas_sns_enc.c" />
@@ -408,22 +400,14 @@ 
    <ClCompile Include="..\lib_enc\update_decision_fx.c" />

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

  </ItemGroup>

  <ItemGroup>

Workspace_msvc/lib_enc.vcxproj.filters

+1 −48
Original line number Diff line number Diff line
@@ -67,30 +67,14 @@ 
    <ClCompile Include="..\lib_enc\nelp_enc.c">

      <Filter>enc_evs_c</Filter>

    </ClCompile>

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

      <Filter>enc_evs_c</Filter>

    </ClCompile>

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

      <Filter>enc_evs_c</Filter>

    </ClCompile>

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

      <Filter>enc_evs_c</Filter>

    </ClCompile>

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

      <Filter>enc_evs_c</Filter>

    </ClCompile>

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

      <Filter>enc_evs_c</Filter>

    </ClCompile>

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

      <Filter>enc_evs_c</Filter>

    </ClCompile>

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

      <Filter>enc_evs_c</Filter>

    </ClCompile>

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

      <Filter>enc_evs_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>
@@ -238,12 +222,6 @@ 
    <ClCompile Include="..\lib_enc\noise_adjust.c">

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>
@@ -253,37 +231,12 @@ 
    <ClCompile Include="..\lib_enc\pitch_ol2.c">

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

lib_com/cnst.h

+3 −0
Original line number Diff line number Diff line
@@ -137,6 +137,7 @@ 
#define FOUR_IN_Q28                     1073741824



#define MAX_WORD16                      32767

#define ONE_IN_Q45                      (Word64)0x200000000000

#define ONE_IN_Q62                      (Word64)0x4000000000000000

/*----------------------------------------------------------------------------------*

 * General constants
@@ -760,6 +761,8 @@ enum 
#define FORMANT_SHARPENING_NOISE_THRESHOLD  21.0f                  /* lp_noise level above which formant sharpening is deactivated */

#define E_MIN_FX                              1       /* QSCALE (Q7)*/

#define E_MIN_IVAS_FX                         1835       /* (Q19) (E12) */

#define E_MIN_IVAS_FX_Q31                     7516193       /* (Q31) (0.0035f) */



#define STEP_DELTA_FX                         11

#define FORMANT_SHARPENING_NOISE_THRESHOLD_FX   5376     /* 21 (!8)lp_noise level above which formant sharpening is deactivated - at this level most of 20 dB SNR office noisy speech still uses sharpening */