Commit 2342ece0 authored by emerit's avatar emerit
Browse files

Merge branch 'main' into update_crend

parents a3d826b6 92b81e4c

.gitlab-ci.yml

+2 −12
Original line number Diff line number Diff line
@@ -931,7 +931,7 @@ ivas-pytest-dec-msan: 
  before_script:

    - CLANG_NUM=1

    - DUT_ENCODER_PATH=./$REF_ENCODER_PATH

    - TEST_SUITE=$LONG_TEST_SUITE_SELF_TEST

    - TEST_SUITE=$LONG_TEST_SUITE_NO_RENDERER

  <<: *ivas-pytest-sanitizers-anchor



ivas-pytest-dec-asan:
@@ -940,7 +940,7 @@ ivas-pytest-dec-asan: 
  before_script:

    - CLANG_NUM=2

    - DUT_ENCODER_PATH=./$REF_ENCODER_PATH

    - TEST_SUITE=$LONG_TEST_SUITE_SELF_TEST

    - TEST_SUITE=$LONG_TEST_SUITE_NO_RENDERER

  <<: *ivas-pytest-sanitizers-anchor



ivas-pytest-dec-usan:
@@ -1220,16 +1220,6 @@ voip-be-on-merge-request: 
  - curl --request GET "https://forge.3gpp.org/rep/api/v4/projects/$CI_PROJECT_ID/jobs/$job_id/artifacts" --output artifacts_ref.zip

  - unzip -j artifacts_ref.zip "*latest_WMOPS.csv"



  ### 2. part: setup specific for BASOP repo

  # hack for using the reference encoder -> need to build manually to make script use ref enc and BASOP dec

  - mkdir COMPLEXITY

  - cp IVAS_cod_ref COMPLEXITY/IVAS_cod

  # build branch code aain with instrumentation

  - make clean

  - bash scripts/prepare_instrumentation.sh -p BASOP -m MEM_ONLY

  - make -j -C $INSTR_DIR

  - cp $INSTR_DIR/IVAS_dec COMPLEXITY/IVAS_dec



.complexity-measurements-prepare-artifacts:

  &complexity-measurements-prepare-artifacts # prepare artifacts -> move to public directory

  - public_dir="$CI_JOB_NAME-public"

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

        {