Commit 1fe7df72 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

allow arbitrary decoder arguments to runIvasCodec.py

parent 1021c7a4

includes/loudness-jobs.yml

+8 −4
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ loudness-measurement: 
    CONFIG_JSON: $LOUDNESS_CONFIG

    OUT_CONFIGS: $LOUDNESS_OUT_FORMATS

    FLT_SUFFIX: $LOUDNESS_FILTER_SUFFIX

    DEC_OPTS: $LOUDNESS_DEC_OPTS



  allow_failure:

    exit_codes:
@@ -28,7 +29,7 @@ loudness-measurement: 
    - 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

    # if the user select the LTV config, copy the LTV files to a tmpdir and use a script to update the metadata file naming

    # if the user selects the LTV config, copy the LTV files to a tmpdir and use a script to update the metadata file naming

    - |

      if [[ "$CONFIG_JSON" == "scripts/config/ci_linux_ltv.json" ]]; then

        TEMP_LTV_DIR=$(mktemp -d)
@@ -39,10 +40,13 @@ loudness-measurement: 
      fi

    - make -j

    - |

      # Build argument array once

      EXTRA_ARGS=()

      [ -n "${OUT_CONFIGS}" ] && EXTRA_ARGS+=(--oc "${OUT_CONFIGS}")

      [ -n "${DEC_OPTS}" ] && EXTRA_ARGS+=(-D="${DEC_OPTS}")



      for fmt in ${FORMAT_LIST}; do

        OC_ARG=""

        [ -n "${OUT_CONFIGS}" ] && OC_ARG="--oc ${OUT_CONFIGS}"

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

        ./scripts/runIvasCodec.py -z console -p "${CONFIG_JSON}" -x "${fmt}_b${FLT_SUFFIX}" "${EXTRA_ARGS[@]}" | tee -a smoke_test_output.txt

      done

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

main-float.yml

+3 −0
Original line number Diff line number Diff line
@@ -78,6 +78,9 @@ variables: 
  LOUDNESS_OUT_FORMATS:

      description: "Space-separated lists of output formats to run (needs MANUAL_PIPELINE_TYPE loudness*). Available options: 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"

      value: ""

  LOUDNESS_DEC_OPTS:

      description: "Decoder options for runIvasCodec.py; will be added with -D='LOUDNESS_DEC_OPTS' (needs MANUAL_PIPELINE_TYPE loudness*)"

      value: ""

  LOUDNESS_FILTER_SUFFIX:

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

      value: '.*'