Commit e937bbf8 authored by Lauros Pajunen's avatar Lauros Pajunen
Browse files

Merge remote-tracking branch 'origin/main' into 1154-add-rtpdump-support

parents 1b89fe7e ff5b2e79
Loading
Loading
Loading
Loading
Loading
+168 −391

File changed.

Preview size limit exceeded, changes collapsed.

+30 −0
Original line number Diff line number Diff line
variables:
  EVS_BE_TEST_DIR: "/usr/local/be_2_evs_test"
  EVS_BE_WIN_TEST_DIR: "C:/Users/gitlab-runner/testvec"
  PROCESSING_SCRIPTS_BIN_DIR: "/test-bin"
  SANITIZER_TESTS: "CLANG1 CLANG2 CLANG3"
  OUT_FORMATS_CHANNEL_BASED: "stereo mono 5_1 5_1_2 5_1_4 7_1 7_1_4"
  OUT_FORMATS_SCENE_BASED: "FOA HOA2 HOA3"
  OUT_FORMATS_BINAURAL: "BINAURAL BINAURAL_ROOM_IR BINAURAL_ROOM_REVERB"
  OUT_FORMATS_ALL: "$OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL EXT"
  MANUAL_PIPELINE_TYPE:
    description: "Type for the manual pipeline run. Use 'test-be-release' to run BE test against release codec."
    value: 'default'
    options:
      - 'default'
      - 'test-be-release'
      - 'test-long-self-test'
      - 'ivas-conformance'
      - 'ivas-conformance-linux'
      - 'check-clipping'
      - 'test-branch-vs-input-passthrough'

  PYTEST_ARGS: ""
  LONG_TEST_SUITE: "tests/codec_be_on_mr_nonselection tests/renderer --param_file scripts/config/self_test_ltv.prm --use_ltv"
  LONG_TEST_SUITE_NO_RENDERER: "tests/codec_be_on_mr_nonselection --param_file scripts/config/self_test_ltv.prm --use_ltv"
  SHORT_TEST_SUITE: "tests/codec_be_on_mr_nonselection"
  SHORT_TEST_SUITE_ENCODER: "tests/codec_be_on_mr_nonselection/test_param_file.py --param_file scripts/config/self_test_basop_encoder.prm"
  LONG_TEST_SUITE_ENCODER: "tests/codec_be_on_mr_nonselection/test_param_file.py --param_file scripts/config/self_test_ltv_basop_encoder.prm"
  TEST_SUITE: ""
  # note: currently overwrites default value from ci repo
  TESTCASE_TIMEOUT_STV_SANITIZERS: 240
+1 −1
Original line number Diff line number Diff line
@@ -301,7 +301,7 @@ int main(
    if ( arg.hrtfReaderEnabled )
    {
        /* sanity check */
        if ( arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )
        if ( arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )
        {
            arg.hrtfReaderEnabled = false;
            fprintf( stderr, "\nError: HRTF binary file cannot be used in this output configuration.\n\n" );
+4 −4
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ from functools import partial

FORMATS = ["Stereo", "ISM", "Multichannel", "MASA", "SBA", "OSBA", "OMASA", "Renderer"]

CSV_DELIM = ";"
CSV_DELIM = ","
SUBPAGE_TMPL_CSS = """
<style type="text/css">
.tbase  {border-collapse:collapse;border-spacing:0;}
@@ -37,7 +37,7 @@ Comparing:

<br>
<h2><a href="summary_{job_name}.html">Summary page</a></h2>
<h2><a href="summary__split_{job_name}.html">Split comparison summary page</a></h2>
<h2><a href="summary_split_{job_name}.html">Split comparison summary page</a></h2>
<br>
<br>

@@ -104,7 +104,7 @@ COLUMNS = [
    "Category",
    "Result",
    "MLD",
    "MAXIMUM ABS DIFF",
    "MAX_ABS_DIFF",
    "MIN_SSNR",
    "MIN_ODG",
]
@@ -158,7 +158,7 @@ def create_subpage(

def write_out_csv(data, col_names, outfile):
    with open(outfile, "w") as f:
        writer = csv.DictWriter(f, col_names, delimiter=";")
        writer = csv.DictWriter(f, col_names, delimiter=CSV_DELIM)
        writer.writeheader()
        for row in data:
            writer.writerow(row)
+4 −4
Original line number Diff line number Diff line
@@ -83,6 +83,10 @@ fi
./scripts/IvasBuildAndRunChecks.py $mode_arg_script -p $config_file --checks COMPLEXITY --create_complexity_tables ${wmopsFilenameFlc} -C $ivas_format $mode_arg -f ${ep} --oc $output_format
ret_val_script=$?

# for runs on ivas-float-update: creat copy of WMOPS csv file with static name so that it is easier to grab from the artifacts
latest_wmops="${wmopsFilenameFlcDir}/latest_WMOPS.csv"
cp ${wmopsFilenameFlc}_WMOPS.csv ${latest_wmops}

# TODO: only split wmops and ram files
./ci/complexity_measurements/split_by_levels.py $(ls ${wmopsFilenameFlc}*.csv)

@@ -93,7 +97,6 @@ for suffix in "${split_suffixes[@]}"; do
  wmopsFilenameFlc_split="${wmopsFilenameFlc}_WMOPS${suffix}.csv"
  wmopsFilenameFlcLast_split="${wmopsFilenameFlcLast}_WMOPS${suffix}.csv"
  log_wmops_all_split="${destDir}/wmops/log_wmops_all${suffix}.txt"
  latest_wmops_split="${wmopsFilenameFlcDir}/latest_WMOPS${suffix}.csv"

  heapFilenameFlc_split="${wmopsFilenameFlc}_HEAP${suffix}.csv"
  stackFilenameFlc_split="${wmopsFilenameFlc}_STACK${suffix}.csv"
@@ -105,9 +108,6 @@ for suffix in "${split_suffixes[@]}"; do
  ### WMOPS
  ${scriptDir}/parseNewsletterWmops.py ${wmopsFilenameFlc_split} ${wmopsFilenameFlcLast_split} ${commit_sha} ${shortDate} ${fullDate} >>${log_wmops_all_split}

  # create copy of WMOPS csv file with special name to easily get it from artifacts when comparing BASOP to float numbers
  cp ${wmopsFilenameFlc_split} ${latest_wmops_split}

  # get memory info for webpage
  ### RAM
  ${scriptDir}/mergeNewsletterRam.py ${heapFilenameFlc_split} ${stackFilenameFlc_split} >${ramFilenameFlc_split}
Loading