Commit 87dcd737 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

fix --oc argument handling

parent 0eb7d25c

includes/loudness-jobs.yml

+4 −3
Original line number Diff line number Diff line
@@ -30,9 +30,10 @@ loudness-measurement: 
    - 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${FLT_SUFFIX}" --oc ${OUT_CONFIGS} | tee -a smoke_test_output.txt

      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

      done

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

main-float.yml

+5 −10
Original line number Diff line number Diff line
@@ -77,13 +77,8 @@ variables: 
      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

      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_FILTER_SUFFIX:

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

      value: '.*'
@@ -150,13 +145,13 @@ workflow: 
        IVAS_PIPELINE_NAME: "Complexity Measurement on $CI_COMMIT_BRANCH"

    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'loudness'

      variables:

        IVAS_PIPELINE_NAME: "Loudness measurement and analysis on $CI_COMMIT_BRANCH"

        IVAS_PIPELINE_NAME: "Loudness measurement and analysis on $CI_COMMIT_BRANCH for $LOUDNESS_CONFIG $LOUDNESS_FILTER_SUFFIX"

    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'loudness-measurement-only'

      variables:

        IVAS_PIPELINE_NAME: "Loudness measurement on $CI_COMMIT_BRANCH"

        IVAS_PIPELINE_NAME: "Loudness measurement on $CI_COMMIT_BRANCH for $LOUDNESS_CONFIG $LOUDNESS_FILTER_SUFFIX"

    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'loudness-analysis-only'

      variables:

        IVAS_PIPELINE_NAME: "Loudness analysis on $CI_COMMIT_BRANCH"

        IVAS_PIPELINE_NAME: "Loudness analysis on $CI_COMMIT_BRANCH for $LOUDNESS_CONFIG $LOUDNESS_FILTER_SUFFIX"



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

# Rules templates