Commit 291ef98d authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'main' into 1309-mld-level-dependency

parents 78da1419 e4d04686
Loading
Loading
Loading
Loading
Loading
+5 −6
Original line number Diff line number Diff line
@@ -274,12 +274,11 @@ stages:

.rules-pytest-to-ref-short:
  rules:
    - if: $PYTEST_MLD_SHORT # Set by scheduled pipeline
    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == "pytest-compare"
    - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
    - if: $CI_PIPELINE_SOURCE == 'push'
      when: never
    - if: $CI_PIPELINE_SOURCE == 'schedule'
      when: never

.rules-pytest-to-input-short:
  rules:
@@ -984,7 +983,7 @@ build-codec-linux-instrumented-make:
  script:
    - *print-common-info
    - *update-scripts-repo
    - bash scripts/prepare_instrumentation.sh -m MEM_ONLY -p BASOP
    - bash scripts/prepare_instrumentation.sh -m MEM_ONLY
    - make -j -C $INSTR_DIR

build-codec-linux-debugging-make:
@@ -1314,7 +1313,7 @@ ivas-pytest-enc-usan:
  before_script:
    - CLANG_NUM=3
    - DUT_DECODER_PATH=./$REF_DECODER_PATH
    - TEST_SUITE=$SHORT_TEST_SUITE_ENCODER
    - TEST_SUITE=$LONG_TEST_SUITE_ENCODER
  <<: *ivas-pytest-sanitizers-anchor
  
### jobs that test flt encoder -> fx decoder
@@ -1404,7 +1403,7 @@ ivas-pytest-dec-usan:
  before_script:
    - CLANG_NUM=3
    - DUT_ENCODER_PATH=./$REF_ENCODER_PATH
    - TEST_SUITE=$SHORT_TEST_SUITE
    - TEST_SUITE=$LONG_TEST_SUITE_NO_RENDERER
  <<: *ivas-pytest-sanitizers-anchor

# ---------------------------------------------------------------
@@ -1737,7 +1736,7 @@ voip-be-on-merge-request:
  stage: test
  variables:
    ret_val: 0
    GET_WMOPS_ARGS: "mem_only basop"
    GET_WMOPS_ARGS: "mem_only"
  timeout: 3 hours 30 minutes
  before_script:
    - *print-common-info
+30 −33
Original line number Diff line number Diff line
@@ -138,7 +138,6 @@
    <ClCompile Include="..\lib_com\cb_shape_fx.c" />
    <ClCompile Include="..\lib_com\cldfb.c" />
    <ClCompile Include="..\lib_com\cldfb_evs.c" />
    <ClCompile Include="..\lib_com\cng_exc.c" />
    <ClCompile Include="..\lib_com\cng_exc_fx.c" />
    <ClCompile Include="..\lib_com\codec_tcx_common.c" />
    <ClCompile Include="..\lib_com\complex_basop.c" />
@@ -200,45 +199,44 @@
    <ClCompile Include="..\lib_com\int_lsp.c" />
    <ClCompile Include="..\lib_com\isf_dec_amr_wb_fx.c" />
    <ClCompile Include="..\lib_com\ivas_agc_com_fx.c" />
    <ClCompile Include="..\lib_com\ivas_arith.c" />
    <ClCompile Include="..\lib_com\ivas_avq_pos_reorder_com.c" />
    <ClCompile Include="..\lib_com\ivas_cov_smooth.c" />
    <ClCompile Include="..\lib_com\ivas_entropy_coder_common.c" />
    <ClCompile Include="..\lib_com\ivas_fb_mixer.c" />
    <ClCompile Include="..\lib_com\ivas_filters.c" />
    <ClCompile Include="..\lib_com\ivas_ism_com.c" />
    <ClCompile Include="..\lib_com\ivas_lfe_com.c" />
    <ClCompile Include="..\lib_com\ivas_mcmasa_com.c" />
    <ClCompile Include="..\lib_com\ivas_dirac_com.c" />
    <ClCompile Include="..\lib_com\ivas_masa_com.c" />
    <ClCompile Include="..\lib_com\ivas_mct_com.c" />
    <ClCompile Include="..\lib_com\ivas_mc_com.c" />
    <ClCompile Include="..\lib_com\ivas_mc_param_com.c" />
    <ClCompile Include="..\lib_com\ivas_mdct_core_com.c" />
    <ClCompile Include="..\lib_com\ivas_arith_fx.c" />
    <ClCompile Include="..\lib_com\ivas_avq_pos_reorder_com_fx.c" />
    <ClCompile Include="..\lib_com\ivas_cov_smooth_fx.c" />
    <ClCompile Include="..\lib_com\ivas_entropy_coder_common_fx.c" />
    <ClCompile Include="..\lib_com\ivas_fb_mixer_fx.c" />
    <ClCompile Include="..\lib_com\ivas_filters_fx.c" />
    <ClCompile Include="..\lib_com\ivas_ism_com_fx.c" />
    <ClCompile Include="..\lib_com\ivas_lfe_com_fx.c" />
    <ClCompile Include="..\lib_com\ivas_mcmasa_com-fx.c" />
    <ClCompile Include="..\lib_com\ivas_dirac_com_fx.c" />
    <ClCompile Include="..\lib_com\ivas_masa_com_fx.c" />
    <ClCompile Include="..\lib_com\ivas_mct_com_fx.c" />
    <ClCompile Include="..\lib_com\ivas_mc_com_fx.c" />
    <ClCompile Include="..\lib_com\ivas_mc_param_com_fx.c" />
    <ClCompile Include="..\lib_com\ivas_mdct_core_com_fx.c" />
    <ClCompile Include="..\lib_com\ivas_mdct_imdct_fx.c" />
    <ClCompile Include="..\lib_com\ivas_mdft_imdft.c" />
    <ClCompile Include="..\lib_com\ivas_omasa_com.c" />
    <ClCompile Include="..\lib_com\ivas_pca_tools.c" />
    <ClCompile Include="..\lib_com\ivas_qmetadata_com.c" />
    <ClCompile Include="..\lib_com\ivas_qspherical_com.c" />
    <ClCompile Include="..\lib_com\ivas_mdft_imdft_fx.c" />
    <ClCompile Include="..\lib_com\ivas_omasa_com_fx.c" />
    <ClCompile Include="..\lib_com\ivas_pca_tools_fx.c" />
    <ClCompile Include="..\lib_com\ivas_qmetadata_com_fx.c" />
    <ClCompile Include="..\lib_com\ivas_qspherical_com_fx.c" />
    <ClCompile Include="..\lib_com\ivas_rom_com.c" />
    <ClCompile Include="..\lib_com\ivas_rom_com_fx.c" />
    <ClCompile Include="..\lib_com\ivas_sba_config.c" />
    <ClCompile Include="..\lib_com\ivas_sba_config_fx.c" />
    <ClCompile Include="..\lib_com\ivas_sns_com_fx.c" />
    <ClCompile Include="..\lib_com\ivas_spar_com.c" />
    <ClCompile Include="..\lib_com\ivas_spar_com_quant_util.c" />
    <ClCompile Include="..\lib_com\ivas_stereo_dft_com.c" />
    <ClCompile Include="..\lib_com\ivas_spar_com_fx.c" />
    <ClCompile Include="..\lib_com\ivas_spar_com_quant_util_fx.c" />
    <ClCompile Include="..\lib_com\ivas_stereo_dft_com_fx.c" />
    <ClCompile Include="..\lib_com\ivas_stereo_eclvq_com_fx.c" />
    <ClCompile Include="..\lib_com\ivas_stereo_ica_com_fx.c" />
    <ClCompile Include="..\lib_com\ivas_stereo_mdct_bands_com.c" />
    <ClCompile Include="..\lib_com\ivas_stereo_mdct_stereo_com.c" />
    <ClCompile Include="..\lib_com\ivas_stereo_psychlpc_com.c" />
    <ClCompile Include="..\lib_com\ivas_stereo_td_bit_alloc.c" />
    <ClCompile Include="..\lib_com\ivas_tools.c" />
    <ClCompile Include="..\lib_com\ivas_transient_det.c" />
    <ClCompile Include="..\lib_com\ivas_stereo_mdct_bands_com_fx.c" />
    <ClCompile Include="..\lib_com\ivas_stereo_mdct_stereo_com_fx.c" />
    <ClCompile Include="..\lib_com\ivas_stereo_psychlpc_com_fx.c" />
    <ClCompile Include="..\lib_com\ivas_stereo_td_bit_alloc_fx.c" />
    <ClCompile Include="..\lib_com\ivas_tools_fx.c" />
    <ClCompile Include="..\lib_com\ivas_transient_det_fx.c" />
    <ClCompile Include="..\lib_com\lag_wind.c" />
    <ClCompile Include="..\lib_com\lerp.c" />
    <ClCompile Include="..\lib_com\limit_t0.c" />
    <ClCompile Include="..\lib_com\limit_t0_fx.c" />
    <ClCompile Include="..\lib_com\log2.c" />
    <ClCompile Include="..\lib_com\logqnorm_fx.c" />
@@ -324,7 +322,6 @@
    <ClInclude Include="..\lib_com\ivas_stat_com.h" />
    <ClInclude Include="..\lib_com\move.h" />
    <ClInclude Include="..\lib_com\options.h" />
    <ClInclude Include="..\lib_com\prot.h" />
    <ClInclude Include="..\lib_com\prot_fx.h" />
    <ClInclude Include="..\lib_com\rom_basop_util.h" />
    <ClInclude Include="..\lib_com\rom_com.h" />
+90 −99
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
    <ClCompile Include="..\lib_com\ivas_qmetadata_com.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\ivas_qspherical_com.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\ivas_sba_config.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\ivas_mc_com.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\ivas_mcmasa_com.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\ivas_mc_param_com.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\ivas_stereo_dft_com.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\ivas_stereo_mdct_bands_com.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\ivas_stereo_mdct_stereo_com.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\ivas_stereo_psychlpc_com.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\ivas_stereo_td_bit_alloc.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\ivas_avq_pos_reorder_com.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\ivas_filters.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\ivas_cov_smooth.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\ivas_entropy_coder_common.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\ivas_fb_mixer.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\ivas_arith.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\ivas_spar_com_quant_util.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\ivas_transient_det.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\ivas_mdft_imdft.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\ivas_pca_tools.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\ivas_spar_com.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\ivas_ism_com.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\ivas_omasa_com.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\ivas_lfe_com.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\enh64.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
@@ -379,9 +304,6 @@
    <ClCompile Include="..\lib_com\cldfb.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\cng_exc.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\complex_basop.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
@@ -469,18 +391,6 @@
    <ClCompile Include="..\lib_com\ivas_agc_com_fx.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\ivas_dirac_com.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\ivas_masa_com.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\ivas_mct_com.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\ivas_mdct_core_com.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\ivas_rom_com.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
@@ -493,18 +403,12 @@
    <ClCompile Include="..\lib_com\ivas_stereo_ica_com_fx.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\ivas_tools.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\lag_wind.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\lerp.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\limit_t0.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\longarith.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
@@ -544,6 +448,96 @@
    <ClCompile Include="..\lib_com\parameter_bitmaping_fx.c">
      <Filter>common_all_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\ivas_arith_fx.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\ivas_avq_pos_reorder_com_fx.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\ivas_cov_smooth_fx.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\ivas_entropy_coder_common_fx.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\ivas_dirac_com_fx.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\ivas_fb_mixer_fx.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\ivas_filters_fx.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\ivas_ism_com_fx.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\ivas_lfe_com_fx.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\ivas_masa_com_fx.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\ivas_mc_com_fx.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\ivas_mc_param_com_fx.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\ivas_mcmasa_com-fx.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\ivas_mct_com_fx.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\ivas_mdct_core_com_fx.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\ivas_mdft_imdft_fx.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\ivas_omasa_com_fx.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\ivas_pca_tools_fx.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\ivas_qmetadata_com_fx.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\ivas_qspherical_com_fx.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\ivas_sba_config_fx.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\ivas_spar_com_fx.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\ivas_spar_com_quant_util_fx.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\ivas_stereo_dft_com_fx.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\ivas_stereo_mdct_bands_com_fx.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\ivas_stereo_mdct_stereo_com_fx.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\ivas_stereo_psychlpc_com_fx.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\ivas_stereo_td_bit_alloc_fx.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\ivas_transient_det_fx.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
    <ClCompile Include="..\lib_com\ivas_tools_fx.c">
      <Filter>common_ivas_c</Filter>
    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="..\lib_com\basop_proto_func.h">
@@ -588,9 +582,6 @@
    <ClInclude Include="..\lib_com\move.h">
      <Filter>common_h</Filter>
    </ClInclude>
    <ClInclude Include="..\lib_com\prot.h">
      <Filter>common_h</Filter>
    </ClInclude>
    <ClInclude Include="..\lib_com\rom_com.h">
      <Filter>common_h</Filter>
    </ClInclude>
+47 −61

File changed.

Preview size limit exceeded, changes collapsed.

+144 −186

File changed.

Preview size limit exceeded, changes collapsed.

Loading