Commit 662d6b24 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'main' into ci/encoder-test

parents 654064eb cddd4d90

.gitlab-ci.yml

+27 −21
Original line number Diff line number Diff line
@@ -1207,6 +1207,12 @@ voip-be-on-merge-request: 
  - rm artifacts.zip

  - rm -rf $public_dir



  ### 1.5.part: get the corresponding measurement from ivas-float-update-cmplx

  - job_id=$(python3 ci/get_id_of_last_job_occurence.py ivas-float-update-cmplx $CI_JOB_NAME $CI_PROJECT_ID)

  - echo $job_id

  - 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
@@ -1221,7 +1227,7 @@ voip-be-on-merge-request: 
  &complexity-measurements-prepare-artifacts # prepare artifacts -> move to public directory

  - public_dir="$CI_JOB_NAME-public"

  - mkdir $public_dir

  - mv -f wmops/log_*_all.txt wmops/*.js ${public_dir}/

  - mv -f wmops/log_*_all.txt ./*.js ${public_dir}/

  # move logfiles for links

  - mkdir $public_dir/logs

  # first move logs
@@ -1266,7 +1272,7 @@ complexity-stereo-in-stereo-out: 
  script:

    - in_format=stereo

    - out_format=stereo

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only || ret_val=$?

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop latest_WMOPS.csv || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1281,7 +1287,7 @@ complexity-ism-in-binaural-out: 
    - in_format=ISM

    - out_format=BINAURAL

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format" || ret_val=$?

    - bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format" mem_only basop latest_WMOPS.csv || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1296,7 +1302,7 @@ complexity-ism-in-binaural_room_ir-out: 
    - in_format=ISM

    - out_format=BINAURAL_ROOM_IR

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format" || ret_val=$?

    - bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format" mem_only basop latest_WMOPS.csv || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1311,7 +1317,7 @@ complexity-ism-in-ext-out: 
    - in_format=ISM

    - out_format=EXT

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format" || ret_val=$?

    - bash ci/complexity_measurements/getWmops.sh "ISM+1 ISM+2 ISM+3 ISM+4" "$out_format" mem_only basop latest_WMOPS.csv || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1326,7 +1332,7 @@ complexity-sba-hoa3-in-hoa3-out: 
    - in_format=HOA3

    - out_format=HOA3

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop latest_WMOPS.csv || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1341,7 +1347,7 @@ complexity-sba-hoa3-in-binaural-out: 
    - in_format=HOA3

    - out_format=BINAURAL

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop latest_WMOPS.csv || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1356,7 +1362,7 @@ complexity-sba-hoa3-in-binaural_room_ir-out: 
    - in_format=HOA3

    - out_format=BINAURAL_ROOM_IR

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop latest_WMOPS.csv || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1371,7 +1377,7 @@ complexity-mc-in-7_1_4-out: 
    - in_format=MC

    - out_format=7_1_4

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop latest_WMOPS.csv || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1386,7 +1392,7 @@ complexity-mc-in-binaural-out: 
    - in_format=MC

    - out_format=BINAURAL

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop latest_WMOPS.csv || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1401,7 +1407,7 @@ complexity-mc-in-binaural_room_ir-out: 
    - in_format=MC

    - out_format=BINAURAL_ROOM_IR

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop latest_WMOPS.csv || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1416,7 +1422,7 @@ complexity-masa-in-ext-out: 
    - in_format=MASA

    - out_format=EXT

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop latest_WMOPS.csv || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1431,7 +1437,7 @@ complexity-masa-in-binaural-out: 
    - in_format=MASA

    - out_format=BINAURAL

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop latest_WMOPS.csv || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1446,7 +1452,7 @@ complexity-masa-in-hoa3-out: 
    - in_format=MASA

    - out_format=HOA3

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop latest_WMOPS.csv || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1461,7 +1467,7 @@ complexity-masa-in-hoa3-out: 
#     - in_format=OMASA

#     - out_format=EXT

#     - ret_val=0

#     - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?

#     - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop latest_WMOPS.csv || ret_val=$?

#     - *complexity-measurements-prepare-artifacts

#     - exit $ret_val
@@ -1476,7 +1482,7 @@ complexity-omasa-in-binaural-out: 
    - in_format=OMASA

    - out_format=BINAURAL

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop latest_WMOPS.csv || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1491,7 +1497,7 @@ complexity-omasa-in-hoa3-out: 
    - in_format=OMASA

    - out_format=HOA3

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop latest_WMOPS.csv || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1506,7 +1512,7 @@ complexity-StereoDmxEVS-stereo-in-mono-out: 
    - in_format=StereoDmxEVS

    - out_format=mono

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop latest_WMOPS.csv || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1521,7 +1527,7 @@ complexity-StereoDmxEVS-stereo-in-mono-out: 
#     - in_format=OSBA

#     - out_format=EXT

#     - ret_val=0

#     - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?

#     - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop latest_WMOPS.csv || ret_val=$?

#     - *complexity-measurements-prepare-artifacts

#     - exit $ret_val
@@ -1536,7 +1542,7 @@ complexity-osba-in-binaural-out: 
    - in_format=OSBA

    - out_format=BINAURAL

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop latest_WMOPS.csv || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val
@@ -1551,7 +1557,7 @@ complexity-osba-in-binaural_room_ir-out: 
    - in_format=OSBA

    - out_format=BINAURAL_ROOM_IR

    - ret_val=0

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" || ret_val=$?

    - bash ci/complexity_measurements/getWmops.sh "$in_format" "$out_format" mem_only basop latest_WMOPS.csv || ret_val=$?

    - *complexity-measurements-prepare-artifacts

    - exit $ret_val

Workspace_msvc/lib_com.vcxproj

+0 −1
Original line number Diff line number Diff line
@@ -175,7 +175,6 @@ 
    <ClCompile Include="..\lib_com\est_tilt_fx.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_cldfb_fx.c" />

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

Workspace_msvc/lib_com.vcxproj.filters

+0 −1
Original line number Diff line number Diff line
@@ -416,7 +416,6 @@ 
    <ClCompile Include="..\lib_com\env_stab.c" />

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

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

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

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

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

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

lib_com/fft.c

+1 −6339

File changed.

Preview size limit exceeded, changes collapsed.

lib_com/fft_cldfb.c

deleted100644 → 0
+0 −1223

File deleted.

Preview size limit exceeded, changes collapsed.