Commit b55ea806 authored by Manuel Jander's avatar Manuel Jander
Browse files

Merge remote-tracking branch 'origin/main' into... 

Merge remote-tracking branch 'origin/main' into 1010-complexity-high-complexity-overhead-for-parammc-decoding
parents aff97922 8d4c82f2

Workspace_msvc/lib_enc.vcxproj

+1 −31
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" />
@@ -238,13 +239,6 @@ 
    <ClCompile Include="..\lib_enc\ivas_stereo_dft_enc_itd.c" />

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

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

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

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

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

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

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

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

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

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

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

    <ClCompile Include="..\lib_enc\ari_hm_enc.c" />
@@ -278,28 +272,13 @@ 
    <ClCompile Include="..\lib_enc\enc_amr_wb.c" />

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

    <ClCompile Include="..\lib_enc\hf_cod_amrwb.c" />
@@ -331,7 +310,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" />
@@ -414,17 +392,9 @@ 
    <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\qlpc_stoch.c" />

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

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

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

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

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

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

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

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

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

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

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

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

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

Workspace_msvc/lib_enc.vcxproj.filters

+3 −87
Original line number Diff line number Diff line
@@ -19,12 +19,6 @@ 
    <ClCompile Include="..\lib_enc\ivas_sce_enc.c">

      <Filter>enc_ivas_c</Filter>

    </ClCompile>

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

      <Filter>enc_evs_c</Filter>

    </ClCompile>

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

      <Filter>enc_evs_c</Filter>

    </ClCompile>

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

      <Filter>enc_evs_c</Filter>

    </ClCompile>
@@ -58,21 +52,9 @@ 
    <ClCompile Include="..\lib_enc\enc_amr_wb.c">

      <Filter>enc_evs_c</Filter>

    </ClCompile>

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

      <Filter>enc_evs_c</Filter>

    </ClCompile>

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

      <Filter>enc_evs_c</Filter>

    </ClCompile>

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

      <Filter>enc_evs_c</Filter>

    </ClCompile>

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

      <Filter>enc_evs_c</Filter>

    </ClCompile>

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

      <Filter>enc_evs_c</Filter>

    </ClCompile>

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

      <Filter>enc_evs_c</Filter>

    </ClCompile>
@@ -115,21 +97,6 @@ 
    <ClCompile Include="..\lib_enc\vad_proc.c">

      <Filter>enc_evs_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>
@@ -193,15 +160,6 @@ 
    <ClCompile Include="..\lib_enc\enc_gen_voic.c">

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>
@@ -211,18 +169,9 @@ 
    <ClCompile Include="..\lib_enc\eval_pit_contr.c">

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>
@@ -334,33 +277,12 @@ 
    <ClCompile Include="..\lib_enc\qlpc_avq.c">

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>
@@ -433,12 +355,6 @@ 
    <ClCompile Include="..\lib_enc\comvad_decision.c">

      <Filter>enc_evs_c</Filter>

    </ClCompile>

    <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>
@@ -454,9 +370,6 @@ 
    <ClCompile Include="..\lib_enc\ivas_mct_enc_mct.c">

      <Filter>enc_ivas_c</Filter>

    </ClCompile>

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

      <Filter>enc_ivas_c</Filter>

    </ClCompile>

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

      <Filter>enc_ivas_c</Filter>

    </ClCompile>
@@ -1013,6 +926,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/cldfb.c

+277 −5

File changed.

Preview size limit exceeded, changes collapsed.

lib_com/cng_exc_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -866,7 +866,7 @@ void cng_params_postupd_ivas_fx( 
            apply_scale( &att_fx, bwidth, last_active_brate, scaleTableStereo, SIZE_SCALE_TABLE_STEREO );

            att_fx = L_shr( Mpy_32_16_1( att_fx, 26214 ), 3 ); /* 26214 = 0.1f in Q18 */

            att_fx = BASOP_Util_fPow( 1342177280 /* 10 in Q27 */, 4, att_fx, 8, &tmp );

            tmp = extract_h( L_shl( att_fx, tmp ) );

            tmp = extract_h( L_shl_sat( att_fx, tmp ) ); // Fix for 3gpp #1080 (tmp set to 1.0)

        }

        ELSE

        {

lib_com/cnst.h

+2 −3
Original line number Diff line number Diff line
@@ -747,10 +747,8 @@ enum 
#define PIT_UP_SAMP6                        6

#define PIT_L_INTERPOL6_2                   17

#define PIT_FIR_SIZE6_2                     ( PIT_UP_SAMP6 * PIT_L_INTERPOL6_2 + 1 )

#define E_MIN_Q11_FX                            7                      /* minimum allowable energy in Q11*/

#define E_MIN                               0.0035f                /* minimum allowable energy */

#define E_MIN_Q11_FX                            7                      /* minimum allowable energy in Q11*/

#define E_MIN_Q16_FX                         229                      /* minimum allowable energy in Q16*/

#define STEP_DELTA                          0.0625f                /* quantization step for tilt compensation of gaussian cb. excitation */

#define GAMMA_EV                            0.92f                  /* weighting factor for core synthesis error weighting */

#define FORMANT_SHARPENING_NOISE_THRESHOLD  21.0f                  /* lp_noise level above which formant sharpening is deactivated */
@@ -1937,7 +1935,7 @@ typedef enum _DCTTYPE 
#define N_SMC_FEATURES                      15                      /* number of features */

#define N_SMC_MIXTURES                      6                       /* number of mixtures */

#define N_PCA_COEF                          12                      /* number of PCA components */

#define HALF_N_PCA_COEF_LOG_P12_Q19         5781461//Q19 of (0.5f * N_PCA_COEF *logf( PI2 ))

#define HALF_N_PCA_COEF_LOG_P12_Q18         2890731                 //Q18 of (0.5f * N_PCA_COEF *logf( PI2 ))

#define SMC_ST_MEAN_FACT                    0.5                     /* forgetting factor of short-term IIR mean filter */

#define SMC_ST_MEAN_RSHIFT_FACT_FX            1                     /* SMC_ST_MEAN_FACT equivalent right shift factor */
@@ -2776,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)