Commit f4072e0a authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

enable more advanced filtering for the job and allow customization of output configs

parent 357012cf

includes/loudness-jobs.yml

+5 −2
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ loudness-measurement: 
  variables:

    FORMAT_LIST: $LOUDNESS_FORMATS

    CONFIG_JSON: $LOUDNESS_CONFIG

    OUT_CONFIGS: $LOUDNESS_OUT_FORMATS

    FLT_SUFFIX: $LOUDNESS_FILTER_SUFFIX



  allow_failure:

    exit_codes:
@@ -24,12 +26,13 @@ loudness-measurement: 
    - set -x

    - echo "Using formats ${FORMAT_LIST}"

    - echo "Using config ${CONFIG_JSON}"

    - echo "Using output configs ${OUT_CONFIGS}"

    - git clone --single-branch --branch main https://gitlab-ci-token:${CI_JOB_TOKEN}@forge.3gpp.org/rep/ivas-codec-pc/ivas-processing-scripts.git

    - make -j

    - |

      for fmt in ${FORMAT_LIST};

      do

        ./scripts/runIvasCodec.py -z console -p ${CONFIG_JSON} -x ${fmt}_b | tee -a smoke_test_output.txt

        ./scripts/runIvasCodec.py -z console -p ${CONFIG_JSON} -x "${fmt}_b${FLT_SUFFIX}" --oc ${OUT_CONFIGS} | tee -a smoke_test_output.txt

      done

    - ./scripts/get_loudness_data.py ${CONFIG_JSON} --formats ${FORMAT_LIST}

main-float.yml

+28 −3
Original line number Diff line number Diff line
@@ -54,15 +54,15 @@ variables: 
  COVERAGE_OUTPUT_FILE_LTV: "coverage-ltv.info"

  COVERAGE_OUTPUT_FILE_CONFORMANCE: "coverage-conformance.info"

  COVERAGE_OUTPUT_FILE_MERGED: "coverage-merged.info"



  LOUDNESS_CONFIG:

    description: "Config JSON file path (needs MANUAL_PIPELINE_TYPE loudness*)"

    value: "scripts/config/ci_loudness_linux.json"

    options:

      # currently dont work due to inconsistent metadata naming

      # - "scripts/config/ci_linux.json"

      # currently doesn't work due to inconsistent metadata naming

      # - "scripts/config/ci_linux_ltv.json"

      - "scripts/config/ci_linux.json"

      - "scripts/config/ci_loudness_linux.json"



  LOUDNESS_FORMATS:

    description: "Space-separated list of formats to test (needs MANUAL_PIPELINE_TYPE loudness*)"

    value: >
@@ -76,6 +76,31 @@ variables: 
      OSBA_ISM1_FOA OSBA_ISM2_FOA OSBA_ISM3_FOA OSBA_ISM4_FOA

      OSBA_ISM1_HOA2 OSBA_ISM2_HOA2 OSBA_ISM3_HOA2 OSBA_ISM4_HOA2

      OSBA_ISM1_HOA3 OSBA_ISM2_HOA3 OSBA_ISM3_HOA3 OSBA_ISM4_HOA3

  LOUDNESS_OUT_FORMATS:

      description: "Space-separated lists of output formats to run (needs MANUAL_PIPELINE_TYPE loudness*)"

      value: >

        mono stereo

        5_1 5_1_2 5_1_4 7_1 7_1_4

        FOA HOA2 HOA3

        BINAURAL BINAURAL_ROOM_IR BINAURAL_ROOM_REVERB"

        EXT

  LOUDNESS_FILTER_SUFFIX:

      description: "Additional regex to append to -x argument of runIvasCodec.py (needs MANUAL_PIPELINE_TYPE loudness*)"

      value: '.*'

      options:

        - '.*'

        - '.*_fb_cbr'

        - '.*_swb_cbr'

        - '.*_wb_cbr'

        - '[\d_]*_fb_cbr'

        - '[\d_]*_swb_cbr'

        - '[\d_]*_wb_cbr'

        - '[\d_]*_dtx_fb_cbr'

        - '[\d_]*_dtx_swb_cbr'

        - '[\d_]*_dtx_wb_cbr'

        - '.*_fb_rs'

        - '.*_swb_rs'

        - '.*_wb_rs'



# This sets when pipelines are created. Jobs have more specific rules to restrict them.

workflow: