Commit 97b98123 authored by norvell's avatar norvell
Browse files

Merge with main

parents 55119d7a 79135d46

.gitlab-ci.yml

+38 −0
Original line number Diff line number Diff line
@@ -19,6 +19,25 @@ variables: 
default:

  interruptible: true # Make all jobs by default interruptible



workflow:

  name: '$IVAS_PIPELINE_NAME'

  rules:

    # see https://docs.gitlab.com/ee/ci/yaml/workflow.html#switch-between-branch-pipelines-and-merge-request-pipelines

    - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS && $CI_PIPELINE_SOURCE == "push"

      when: never

    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'

      variables:

        IVAS_PIPELINE_NAME: 'MR pipeline: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME'

    - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH # Pushes to main

      variables:

        IVAS_PIPELINE_NAME: 'Push pipeline: $CI_COMMIT_BRANCH'

    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'default' # for testing

      variables:

        IVAS_PIPELINE_NAME: 'Web run pipeline: $CI_COMMIT_BRANCH'

    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'pytest-mld'

      variables:

        IVAS_PIPELINE_NAME: 'Run MLD tool against float ref: $CI_COMMIT_BRANCH'



stages:

  - build

  - test
@@ -66,11 +85,13 @@ stages: 
  - cp -r $SCRIPTS_DIR/ci .

  - cp -r $SCRIPTS_DIR/scripts .

  - cp -r $SCRIPTS_DIR/tests .

  - cp $SCRIPTS_DIR/pytest.ini .



# TODO: this needs to be updated in case the reference is updated

.remove-unsupported-testcases: &remove-unsupported-testcases

  - sed -i '1629,1635d' scripts/config/self_test.prm





.apply-testv-scaling: &apply-testv-scaling

  - echo "Applying level scaling in scripts/testv using scale=$LEVEL_SCALING"

  - for file in `ls ./scripts/testv/*.wav`; do tests/scale_pcm.py $file tmp.wav $LEVEL_SCALING; mv tmp.wav $file;done
@@ -85,6 +106,15 @@ stages: 
    - cp "$LTV_DIR"/*.met scripts/testv/

    - cp "$LTV_DIR"/*.csv scripts/testv/  



.rules-pytest-mld:

  rules:

    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == "pytest-mld"

    - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH

    - if: $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main" # only have MR pipelines for MRs to main

    - if: $CI_PIPELINE_SOURCE == 'push'

      when: never





# ---------------------------------------------------------------

# Job templates

# ---------------------------------------------------------------
@@ -114,6 +144,12 @@ stages: 


# ensure that codec builds on linux

build-codec-linux-make:

  rules:

    - if: $CI_PIPELINE_SOURCE == 'web'

    - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH

    - if: $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main" # only have MR pipelines for MRs to main

    - if: $CI_PIPELINE_SOURCE == 'push'

      when: never

  extends:

    - .build-job-linux

  script:
@@ -127,6 +163,7 @@ build-codec-linux-make: 
ivas-pytest-mld-enc-dec:

  extends:

    - .test-job-linux

    - .rules-pytest-mld

  stage: test

  needs: ["build-codec-linux-make"]

  timeout: "30 minutes"
@@ -169,6 +206,7 @@ ivas-pytest-mld-enc-dec: 
ivas-pytest-mld-dec:

  extends:

    - .test-job-linux

    - .rules-pytest-mld

  stage: test

  needs: ["build-codec-linux-make"]

  timeout: "30 minutes"

Workspace_msvc/lib_com.vcxproj

+54 −0
Original line number Diff line number Diff line
@@ -122,9 +122,13 @@ 
  </ItemDefinitionGroup>

  <ItemGroup>

    <ClCompile Include="..\lib_com\ACcontextMapping.c" />

    <ClCompile Include="..\lib_com\ACcontextMapping_fx.c" />

    <ClCompile Include="..\lib_com\ari.c" />

    <ClCompile Include="..\lib_com\arith_coder.c" />

    <ClCompile Include="..\lib_com\arith_coder_fx.c" />

    <ClCompile Include="..\lib_com\ari_fx.c" />

    <ClCompile Include="..\lib_com\ari_hm.c" />

    <ClCompile Include="..\lib_com\ari_hm_fx.c" />

    <ClCompile Include="..\lib_com\basop32.c" />

    <ClCompile Include="..\lib_com\basop_com_lpc.c" />

    <ClCompile Include="..\lib_com\basop_lsf_tools.c" />
@@ -132,49 +136,71 @@ 
    <ClCompile Include="..\lib_com\basop_util.c" />

    <ClCompile Include="..\lib_com\bitalloc.c" />

    <ClCompile Include="..\lib_com\bitallocsum.c" />

    <ClCompile Include="..\lib_com\bitallocsum_fx.c" />

    <ClCompile Include="..\lib_com\bitalloc_fx.c" />

    <ClCompile Include="..\lib_com\bitstream.c" />

    <ClCompile Include="..\lib_com\bitstream_fx.c" />

    <ClCompile Include="..\lib_com\bits_alloc.c" />

    <ClCompile Include="..\lib_com\bits_alloc_fx.c" />

    <ClCompile Include="..\lib_com\calc_st_com.c" />

    <ClCompile Include="..\lib_com\cb_shape.c" />

    <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_flt.c" />

    <ClCompile Include="..\lib_com\codec_tcx_common.c" />

    <ClCompile Include="..\lib_com\complex_basop.c" />

    <ClCompile Include="..\lib_com\control.c" />

    <ClCompile Include="..\lib_com\core_com_config.c" />

    <ClCompile Include="..\lib_com\deemph.c" />

    <ClCompile Include="..\lib_com\delay_comp.c" />

    <ClCompile Include="..\lib_com\disclaimer.c" />

    <ClCompile Include="..\lib_com\dlpc_bfi.c" />

    <ClCompile Include="..\lib_com\dlpc_bfi_fx.c" />

    <ClCompile Include="..\lib_com\edct.c" />

    <ClCompile Include="..\lib_com\edct_fx.c" />

    <ClCompile Include="..\lib_com\enh1632.c" />

    <ClCompile Include="..\lib_com\enh32.c" />

    <ClCompile Include="..\lib_com\enh40.c" />

    <ClCompile Include="..\lib_com\enh64.c" />

    <ClCompile Include="..\lib_com\enhancer.c" />

    <ClCompile Include="..\lib_com\enhancer_fx.c" />

    <ClCompile Include="..\lib_com\enhUL32.c" />

    <ClCompile Include="..\lib_com\enr_1_az.c" />

    <ClCompile Include="..\lib_com\env_adj.c" />

    <ClCompile Include="..\lib_com\env_stab.c" />

    <ClCompile Include="..\lib_com\env_stab_trans.c" />

    <ClCompile Include="..\lib_com\est_tilt.c" />

    <ClCompile Include="..\lib_com\est_tilt_fx.c" />

    <ClCompile Include="..\lib_com\fd_cng_com.c" />

    <ClCompile Include="..\lib_com\fd_cng_com_fx.c" />

    <ClCompile Include="..\lib_com\fft.c" />

    <ClCompile Include="..\lib_com\fft_cldfb.c" />

    <ClCompile Include="..\lib_com\fft_evs.c" />

    <ClCompile Include="..\lib_com\fft_fx.c" />

    <ClCompile Include="..\lib_com\fft_fx_evs.c" />

    <ClCompile Include="..\lib_com\fft_rel.c" />

    <ClCompile Include="..\lib_com\fft_rel_fx.c" />

    <ClCompile Include="..\lib_com\fill_spectrum.c" />

    <ClCompile Include="..\lib_com\findpulse.c" />

    <ClCompile Include="..\lib_com\fine_gain_bits.c" />

    <ClCompile Include="..\lib_com\fine_gain_bits_fx.c" />

    <ClCompile Include="..\lib_com\frame_ener.c" />

    <ClCompile Include="..\lib_com\gain_inov_fx.c" />

    <ClCompile Include="..\lib_com\get_gain.c" />

    <ClCompile Include="..\lib_com\gs_bitallocation.c" />

    <ClCompile Include="..\lib_com\gs_bitallocation_fx.c" />

    <ClCompile Include="..\lib_com\gs_gains.c" />

    <ClCompile Include="..\lib_com\gs_gains_fx.c" />

    <ClCompile Include="..\lib_com\gs_inact_switching.c" />

    <ClCompile Include="..\lib_com\gs_inact_switching_fx.c" />

    <ClCompile Include="..\lib_com\gs_noisefill.c" />

    <ClCompile Include="..\lib_com\gs_noisefill_fx.c" />

    <ClCompile Include="..\lib_com\gs_preech.c" />

    <ClCompile Include="..\lib_com\guided_plc_util.c" />

    <ClCompile Include="..\lib_com\guided_plc_util_fx.c" />

    <ClCompile Include="..\lib_com\hp50.c" />

    <ClCompile Include="..\lib_com\hq2_bit_alloc.c" />

    <ClCompile Include="..\lib_com\hq2_bit_alloc_fx.c" />
@@ -183,12 +209,16 @@ 
    <ClCompile Include="..\lib_com\hq2_noise_inject.c" />

    <ClCompile Include="..\lib_com\hq2_noise_inject_fx.c" />

    <ClCompile Include="..\lib_com\hq_bit_allocation.c" />

    <ClCompile Include="..\lib_com\hq_bit_allocation_fx.c" />

    <ClCompile Include="..\lib_com\hq_conf.c" />

    <ClCompile Include="..\lib_com\hq_conf_fx.c" />

    <ClCompile Include="..\lib_com\hq_tools.c" />

    <ClCompile Include="..\lib_com\hq_tools_fx.c" />

    <ClCompile Include="..\lib_com\hvq_pvq_bitalloc.c" />

    <ClCompile Include="..\lib_com\hvq_pvq_bitalloc_fx.c" />

    <ClCompile Include="..\lib_com\ifft_rel.c" />

    <ClCompile Include="..\lib_com\igf_base.c" />

    <ClCompile Include="..\lib_com\igf_base_fx.c" />

    <ClCompile Include="..\lib_com\index_pvq_opt.c" />

    <ClCompile Include="..\lib_com\index_pvq_opt_fx.c" />

    <ClCompile Include="..\lib_com\interleave_spectrum.c" />
@@ -234,19 +264,24 @@ 
    <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.c" />

    <ClCompile Include="..\lib_com\logqnorm_fx.c" />

    <ClCompile Include="..\lib_com\longarith.c" />

    <ClCompile Include="..\lib_com\low_rate_band_att.c" />

    <ClCompile Include="..\lib_com\low_rate_band_att_fx.c" />

    <ClCompile Include="..\lib_com\lpc_tools.c" />

    <ClCompile Include="..\lib_com\lpc_tools_fx.c" />

    <ClCompile Include="..\lib_com\lsf_dec_bfi.c" />

    <ClCompile Include="..\lib_com\lsf_dec_bfi_fx.c" />

    <ClCompile Include="..\lib_com\lsf_msvq_ma.c" />

    <ClCompile Include="..\lib_com\lsf_msvq_ma_fx.c" />

    <ClCompile Include="..\lib_com\lsf_tools.c" />

    <ClCompile Include="..\lib_com\lsf_tools_fx.c" />

    <ClCompile Include="..\lib_com\lsp_conv_poly.c" />

    <ClCompile Include="..\lib_com\lsp_conv_poly_fx.c" />

    <ClCompile Include="..\lib_com\math_op.c" />

    <ClCompile Include="..\lib_com\modif_fs.c" />

    <ClCompile Include="..\lib_com\modif_fs_fx.c" />

    <ClCompile Include="..\lib_com\mslvq_com.c" />
@@ -256,9 +291,11 @@ 
    <ClCompile Include="..\lib_com\oper_32b.c" />

    <ClCompile Include="..\lib_com\parameter_bitmaping.c" />

    <ClCompile Include="..\lib_com\phase_dispersion.c" />

    <ClCompile Include="..\lib_com\phase_dispersion_fx.c" />

    <ClCompile Include="..\lib_com\ppp.c" />

    <ClCompile Include="..\lib_com\ppp_fx.c" />

    <ClCompile Include="..\lib_com\pred_lt4.c" />

    <ClCompile Include="..\lib_com\pred_lt4_fx.c" />

    <ClCompile Include="..\lib_com\preemph.c" />

    <ClCompile Include="..\lib_com\preemph_fx.c" />

    <ClCompile Include="..\lib_com\pvq_com.c" />
@@ -266,9 +303,12 @@ 
    <ClCompile Include="..\lib_com\range_com.c" />

    <ClCompile Include="..\lib_com\range_com_fx.c" />

    <ClCompile Include="..\lib_com\re8_ppv.c" />

    <ClCompile Include="..\lib_com\re8_ppv_fx.c" />

    <ClCompile Include="..\lib_com\re8_util.c" />

    <ClCompile Include="..\lib_com\re8_util_fx.c" />

    <ClCompile Include="..\lib_com\realft.c" />

    <ClCompile Include="..\lib_com\recovernorm.c" />

    <ClCompile Include="..\lib_com\recovernorm_fx.c" />

    <ClCompile Include="..\lib_com\reordvct.c" />

    <ClCompile Include="..\lib_com\reordvct_fx.c" />

    <ClCompile Include="..\lib_com\residu.c" />
@@ -280,35 +320,49 @@ 
    <ClCompile Include="..\lib_com\rom_com_fx.c" />

    <ClCompile Include="..\lib_com\scale_mem_fx.c" />

    <ClCompile Include="..\lib_com\stab_est.c" />

    <ClCompile Include="..\lib_com\stab_est_fx.c" />

    <ClCompile Include="..\lib_com\stat_noise_uv_mod.c" />

    <ClCompile Include="..\lib_com\stat_noise_uv_mod_fx.c" />

    <ClCompile Include="..\lib_com\swb_bwe_com.c" />

    <ClCompile Include="..\lib_com\swb_bwe_com_fx.c" />

    <ClCompile Include="..\lib_com\swb_bwe_com_hr.c" />

    <ClCompile Include="..\lib_com\swb_bwe_com_hr_fx.c" />

    <ClCompile Include="..\lib_com\swb_bwe_com_lr.c" />

    <ClCompile Include="..\lib_com\swb_bwe_com_lr_fx.c" />

    <ClCompile Include="..\lib_com\swb_tbe_com.c" />

    <ClCompile Include="..\lib_com\swb_tbe_com_fx.c" />

    <ClCompile Include="..\lib_com\syn_12k8.c" />

    <ClCompile Include="..\lib_com\syn_12k8_fx.c" />

    <ClCompile Include="..\lib_com\syn_filt.c" />

    <ClCompile Include="..\lib_com\syn_filt_fx.c" />

    <ClCompile Include="..\lib_com\tcq_position_arith.c" />

    <ClCompile Include="..\lib_com\tcq_position_arith_fx.c" />

    <ClCompile Include="..\lib_com\tcx_ltp.c" />

    <ClCompile Include="..\lib_com\tcx_ltp_fx.c" />

    <ClCompile Include="..\lib_com\tcx_mdct.c" />

    <ClCompile Include="..\lib_com\tcx_mdct_fx.c" />

    <ClCompile Include="..\lib_com\tcx_mdct_window.c" />

    <ClCompile Include="..\lib_com\tcx_utils.c" />

    <ClCompile Include="..\lib_com\tcx_utils_fx.c" />

    <ClCompile Include="..\lib_com\tec_com.c" />

    <ClCompile Include="..\lib_com\tec_com_flt.c" />

    <ClCompile Include="..\lib_com\tns_base.c" />

    <ClCompile Include="..\lib_com\tns_base_flt.c" />

    <ClCompile Include="..\lib_com\tools.c" />

    <ClCompile Include="..\lib_com\tools_fx.c" />

    <ClCompile Include="..\lib_com\trans_direct.c" />

    <ClCompile Include="..\lib_com\trans_direct_fx.c" />

    <ClCompile Include="..\lib_com\trans_inv.c" />

    <ClCompile Include="..\lib_com\trans_inv_fx.c" />

    <ClCompile Include="..\lib_com\vlpc_2st_com.c" />

    <ClCompile Include="..\lib_com\vlpc_2st_com_fx.c" />

    <ClCompile Include="..\lib_com\weight.c" />

    <ClCompile Include="..\lib_com\weight_a.c" />

    <ClCompile Include="..\lib_com\weight_a_fx.c" />

    <ClCompile Include="..\lib_com\weight_fx.c" />

    <ClCompile Include="..\lib_com\wi.c" />

    <ClCompile Include="..\lib_com\window.c" />

    <ClCompile Include="..\lib_com\window_fx.c" />

    <ClCompile Include="..\lib_com\window_ola.c" />

    <ClCompile Include="..\lib_com\window_ola_fx.c" />

    <ClCompile Include="..\lib_com\wi_fx.c" />