Commit 6932825e authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'mld-playback-level-instead-of-rescaling' into 'main' 

use --mld-playback-level instead of external rescaling

See merge request !80
parents d16928b5 f269c9d8

main-basop.yml

+28 −26
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ variables: 
  MERGE_SOURCE_FLOAT_REF_RENDERER_PATH_FOR_BUILD_DO_NOT_MODIFY: "./IVAS_rend_merge_source_float_ref"

  MERGE_SOURCE_FLOAT_REF_POST_RENDERER_PATH_FOR_BUILD_DO_NOT_MODIFY: "./ISAR_post_rend_merge_source_float_ref"

  LEVEL_SCALING: "1.0"

  MLD_PLAYBACK_LEVEL: "92.0"

  PRM_FILES: "scripts/config/self_test.prm scripts/config/self_test_ltv.prm"

  TESTCASE_TIMEOUT_STV: 900

  TESTCASE_TIMEOUT_LTV: 2400
@@ -341,8 +342,7 @@ workflow: 
    -   BUILD_WITH_DEBUG_MODE_INFO="true"

    - fi



    - INV_LEVEL_SCALING=$(awk "BEGIN {print 1.0 / $LEVEL_SCALING}")

    - comp_args="--mld --ssnr --odg --scalefac $INV_LEVEL_SCALING"

    - comp_args="--mld --ssnr --odg --mld-playback-level $MLD_PLAYBACK_LEVEL"

    - summary_args="MLD DIFF SSNR ODG"

    - REPORT_ARG=""

    - if [ "$ENCODER_TEST" = "true" ]; then comp_args="${comp_args} --enc_stats"; fi
@@ -604,8 +604,7 @@ workflow: 
    - echo $CI_MERGE_REQUEST_TITLE > tmp.txt

    - allow_regressions_flag=$(grep -c --ignore-case "\[allow[ -]*regression\]" tmp.txt) || true



    - INV_LEVEL_SCALING=$(awk "BEGIN {print 1.0 / $LEVEL_SCALING}")

    - comp_args="--mld --ssnr --odg --scalefac $INV_LEVEL_SCALING"

    - comp_args="--mld --ssnr --odg --mld-playback-level $MLD_PLAYBACK_LEVEL"



    # build merge target branch and correpsonding float reference

    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/build-binaries.sh float-ref
@@ -739,8 +738,7 @@ workflow: 
    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/build-binaries.sh float-ref

    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/build-binaries.sh dut



    - INV_LEVEL_SCALING=$(awk "BEGIN {print 1.0 / $LEVEL_SCALING}")

    - comp_args="--mld --ssnr --odg --scalefac $INV_LEVEL_SCALING"

    - comp_args="--mld --ssnr --odg --mld-playback-level $MLD_PLAYBACK_LEVEL"



    ### run pytest

    - exit_code=0
@@ -920,8 +918,6 @@ check-be-to-target-short-enc-0db: 
    - .check-be-to-target-job

  variables:

    TEST_SUITE: "$SHORT_TEST_SUITE_ENCODER"

    # -/-0dB

    LEVEL_SCALING: "1.0"

    # overwrite decoder with float reference one

    DUT_DECODER_PATH: "$MERGE_SOURCE_FLOAT_REF_DECODER_PATH_FOR_BUILD_DO_NOT_MODIFY"

    MERGE_TARGET_DECODER_PATH: "$REF_DECODER_PATH"
@@ -934,6 +930,7 @@ check-be-to-target-short-enc-+10db: 
    TEST_SUITE: "$SHORT_TEST_SUITE_ENCODER"

    # +10dB

    LEVEL_SCALING: "3.162"

    MLD_PLAYBACK_LEVEL: "82.0"

    # overwrite decoder with float reference one

    DUT_DECODER_PATH: "$MERGE_SOURCE_FLOAT_REF_DECODER_PATH_FOR_BUILD_DO_NOT_MODIFY"

    MERGE_TARGET_DECODER_PATH: "$REF_DECODER_PATH"
@@ -946,6 +943,7 @@ check-be-to-target-short-enc--10db: 
    TEST_SUITE: "$SHORT_TEST_SUITE_ENCODER"

    # -10dB

    LEVEL_SCALING: "0.3162"

    MLD_PLAYBACK_LEVEL: "102.0"

    # overwrite decoder with float reference one

    DUT_DECODER_PATH: "$MERGE_SOURCE_FLOAT_REF_DECODER_PATH_FOR_BUILD_DO_NOT_MODIFY"

    MERGE_TARGET_DECODER_PATH: "$REF_DECODER_PATH"
@@ -956,8 +954,6 @@ check-be-to-target-short-dec-0db: 
    - .check-be-to-target-job

  variables:

    TEST_SUITE: "$SHORT_TEST_SUITE"

    # +/-0dB

    LEVEL_SCALING: "1.0"

    # overwrite encoder with float reference one

    DUT_ENCODER_PATH: "$MERGE_SOURCE_FLOAT_REF_ENCODER_PATH_FOR_BUILD_DO_NOT_MODIFY"

    MERGE_TARGET_ENCODER_PATH: "$REF_ENCODER_PATH"
@@ -970,6 +966,7 @@ check-be-to-target-short-dec-+10db: 
    TEST_SUITE: "$SHORT_TEST_SUITE"

    # +10dB

    LEVEL_SCALING: "3.162"

    MLD_PLAYBACK_LEVEL: "82.0"

    # overwrite encoder with float reference one

    DUT_ENCODER_PATH: "$MERGE_SOURCE_FLOAT_REF_ENCODER_PATH_FOR_BUILD_DO_NOT_MODIFY"

    MERGE_TARGET_ENCODER_PATH: "$REF_ENCODER_PATH"
@@ -982,6 +979,7 @@ check-be-to-target-short-dec--10db: 
    TEST_SUITE: "$SHORT_TEST_SUITE"

    # -10dB

    LEVEL_SCALING: "0.3162"

    MLD_PLAYBACK_LEVEL: "102.0"

    # overwrite encoder with float reference one

    DUT_ENCODER_PATH: "$MERGE_SOURCE_FLOAT_REF_ENCODER_PATH_FOR_BUILD_DO_NOT_MODIFY"

    MERGE_TARGET_ENCODER_PATH: "$REF_ENCODER_PATH"
@@ -997,8 +995,6 @@ check-regressions-short-enc-0db: 
    - !reference [.test-job-linux-compares-to-fixed-target, needs]

  variables:

    TEST_SUITE: "$SHORT_TEST_SUITE_ENCODER"

    # +/-0dB

    LEVEL_SCALING: "1.0"

    # overwrite decoder with float reference one

    DUT_DECODER_PATH: "$MERGE_SOURCE_FLOAT_REF_DECODER_PATH_FOR_BUILD_DO_NOT_MODIFY"

    MERGE_TARGET_DECODER_PATH: "$REF_DECODER_PATH"
@@ -1015,6 +1011,7 @@ check-regressions-short-enc-+10db: 
    TEST_SUITE: "$SHORT_TEST_SUITE_ENCODER"

    # +10dB

    LEVEL_SCALING: "3.162"

    MLD_PLAYBACK_LEVEL: "82.0"

    # overwrite decoder with float reference one

    DUT_DECODER_PATH: "$MERGE_SOURCE_FLOAT_REF_DECODER_PATH_FOR_BUILD_DO_NOT_MODIFY"

    MERGE_TARGET_DECODER_PATH: "$REF_DECODER_PATH"
@@ -1031,6 +1028,7 @@ check-regressions-short-enc--10db: 
    TEST_SUITE: "$SHORT_TEST_SUITE_ENCODER"

    # -10dB

    LEVEL_SCALING: "0.3162"

    MLD_PLAYBACK_LEVEL: "102.0"

    # overwrite decoder with float reference one

    DUT_DECODER_PATH: "$MERGE_SOURCE_FLOAT_REF_DECODER_PATH_FOR_BUILD_DO_NOT_MODIFY"

    MERGE_TARGET_DECODER_PATH: "$REF_DECODER_PATH"
@@ -1045,8 +1043,6 @@ check-regressions-short-dec-0db: 
    - !reference [.test-job-linux-compares-to-fixed-target, needs]

  variables:

    TEST_SUITE: "$SHORT_TEST_SUITE"

    # +/-0dB

    LEVEL_SCALING: "1"

    # overwrite encoder with float reference one

    DUT_ENCODER_PATH: "$MERGE_SOURCE_FLOAT_REF_ENCODER_PATH_FOR_BUILD_DO_NOT_MODIFY"

    MERGE_TARGET_ENCODER_PATH: "$REF_ENCODER_PATH"
@@ -1063,6 +1059,7 @@ check-regressions-short-dec-+10db: 
    TEST_SUITE: "$SHORT_TEST_SUITE"

    # +10dB

    LEVEL_SCALING: "3.162"

    MLD_PLAYBACK_LEVEL: "82.0"

    # overwrite encoder with float reference one

    DUT_ENCODER_PATH: "$MERGE_SOURCE_FLOAT_REF_ENCODER_PATH_FOR_BUILD_DO_NOT_MODIFY"

    MERGE_TARGET_ENCODER_PATH: "$REF_ENCODER_PATH"
@@ -1079,6 +1076,7 @@ check-regressions-short-dec--10db: 
    TEST_SUITE: "$SHORT_TEST_SUITE"

    # -10dB

    LEVEL_SCALING: "0.3162"

    MLD_PLAYBACK_LEVEL: "102.0"

    # overwrite encoder with float reference one

    DUT_ENCODER_PATH: "$MERGE_SOURCE_FLOAT_REF_ENCODER_PATH_FOR_BUILD_DO_NOT_MODIFY"

    MERGE_TARGET_ENCODER_PATH: "$REF_ENCODER_PATH"
@@ -1759,7 +1757,6 @@ ivas-pytest-compare_to_ref-short-enc: 
    - ENCODER_TEST="true"

    - DUT_DECODER_PATH=./$REF_DECODER_PATH

    - TEST_SUITE="$SHORT_TEST_SUITE_ENCODER"

    - LEVEL_SCALING=1.0

  <<: *compare-to-ref-anchor



ivas-pytest-compare_to_ref-short-enc-lev-10:
@@ -1772,6 +1769,7 @@ ivas-pytest-compare_to_ref-short-enc-lev-10: 
    - DUT_DECODER_PATH=./$REF_DECODER_PATH

    - TEST_SUITE="$SHORT_TEST_SUITE_ENCODER"

    - LEVEL_SCALING=0.3162

    - MLD_PLAYBACK_LEVEL="102.0"

  <<: *compare-to-ref-anchor



ivas-pytest-compare_to_ref-short-enc-lev+10:
@@ -1784,6 +1782,7 @@ ivas-pytest-compare_to_ref-short-enc-lev+10: 
    - DUT_DECODER_PATH=./$REF_DECODER_PATH

    - TEST_SUITE="$SHORT_TEST_SUITE_ENCODER"

    - LEVEL_SCALING=3.162

    - MLD_PLAYBACK_LEVEL="82.0"

  <<: *compare-to-ref-anchor



# encoder dmx comparison jobs
@@ -1797,7 +1796,6 @@ ivas-pytest-compare_to_ref-dmx-short-enc: 
    - COMPARE_DMX="true"

    - DUT_DECODER_PATH=./$REF_DECODER_PATH

    - TEST_SUITE="$SHORT_TEST_SUITE_ENCODER"

    - LEVEL_SCALING=1.0

  <<: *compare-to-ref-anchor



ivas-pytest-compare_to_ref-dmx-short-enc-lev-10:
@@ -1811,6 +1809,7 @@ ivas-pytest-compare_to_ref-dmx-short-enc-lev-10: 
    - DUT_DECODER_PATH=./$REF_DECODER_PATH

    - TEST_SUITE="$SHORT_TEST_SUITE_ENCODER"

    - LEVEL_SCALING=0.3162

    - MLD_PLAYBACK_LEVEL="102.0"

  <<: *compare-to-ref-anchor



ivas-pytest-compare_to_ref-dmx-short-enc-lev+10:
@@ -1824,6 +1823,7 @@ ivas-pytest-compare_to_ref-dmx-short-enc-lev+10: 
    - DUT_DECODER_PATH=./$REF_DECODER_PATH

    - TEST_SUITE="$SHORT_TEST_SUITE_ENCODER"

    - LEVEL_SCALING=3.162

    - MLD_PLAYBACK_LEVEL="82.0"

  <<: *compare-to-ref-anchor



### jobs that test flt encoder -> fx decoder
@@ -1835,7 +1835,6 @@ ivas-pytest-compare_to_ref-short-dec: 
    - USE_LTV=0

    - DUT_ENCODER_PATH=./$REF_ENCODER_PATH

    - TEST_SUITE="$SHORT_TEST_SUITE"

    - LEVEL_SCALING=1.0

  <<: *compare-to-ref-anchor

  

ivas-pytest-compare_to_ref-short-dec-lev-10:
@@ -1847,6 +1846,7 @@ ivas-pytest-compare_to_ref-short-dec-lev-10: 
    - DUT_ENCODER_PATH=./$REF_ENCODER_PATH

    - TEST_SUITE="$SHORT_TEST_SUITE"

    - LEVEL_SCALING=0.3162

    - MLD_PLAYBACK_LEVEL="102.0"

  <<: *compare-to-ref-anchor

  

ivas-pytest-compare_to_ref-short-dec-lev+10:
@@ -1858,6 +1858,7 @@ ivas-pytest-compare_to_ref-short-dec-lev+10: 
    - DUT_ENCODER_PATH=./$REF_ENCODER_PATH

    - TEST_SUITE="$SHORT_TEST_SUITE"

    - LEVEL_SCALING=3.162

    - MLD_PLAYBACK_LEVEL="82.0"

  <<: *compare-to-ref-anchor



### jobs that compare the output synthesis to the input files directly
@@ -1869,7 +1870,6 @@ ivas-pytest-compare-to-input-short-dec: 
    - USE_LTV=0

    - DUT_ENCODER_PATH=./$REF_ENCODER_PATH

    - TEST_SUITE="$SHORT_TEST_SUITE"

    - LEVEL_SCALING=1.0

  <<: *ivas-pytest-compare-to-input-anchor



ivas-pytest-compare-to-input-short-enc:
@@ -1880,7 +1880,6 @@ ivas-pytest-compare-to-input-short-enc: 
    - USE_LTV=0

    - DUT_DECODER_PATH=./$REF_DECODER_PATH

    - TEST_SUITE="$SHORT_TEST_SUITE_ENCODER"

    - LEVEL_SCALING=1.0

  <<: *ivas-pytest-compare-to-input-anchor



# ---------------------------------------------------------------
@@ -1895,7 +1894,6 @@ ivas-pytest-compare_ref-long-enc: 
    - USE_LTV=1

    - DUT_DECODER_PATH=./$REF_DECODER_PATH

    - TEST_SUITE="$LONG_TEST_SUITE_ENCODER"

    - LEVEL_SCALING=1.0

    - SPLIT_COMPARISON="true"

  <<: *compare-to-ref-anchor
@@ -1910,7 +1908,6 @@ ivas-pytest-compare_ref-long-dec: 
    - USE_LTV=1  

    - DUT_ENCODER_PATH=./$REF_ENCODER_PATH

    - TEST_SUITE="$LONG_TEST_SUITE_RENDERER_SHORT"

    - LEVEL_SCALING=1.0

    - SPLIT_COMPARISON="true"

  <<: *compare-to-ref-anchor
@@ -1923,6 +1920,7 @@ ivas-pytest-compare_ref-long-enc-lev-10: 
    - DUT_DECODER_PATH=./$REF_DECODER_PATH

    - TEST_SUITE="$LONG_TEST_SUITE_ENCODER"

    - LEVEL_SCALING=0.3162

    - MLD_PLAYBACK_LEVEL="102.0"

    - SPLIT_COMPARISON="true"

  <<: *compare-to-ref-anchor
@@ -1938,6 +1936,7 @@ ivas-pytest-compare_ref-long-dec-lev-10: 
    - DUT_ENCODER_PATH=./$REF_ENCODER_PATH

    - TEST_SUITE="$LONG_TEST_SUITE_RENDERER_SHORT"

    - LEVEL_SCALING=0.3162

    - MLD_PLAYBACK_LEVEL="102.0"

    - SPLIT_COMPARISON="true"

  <<: *compare-to-ref-anchor
@@ -1950,6 +1949,7 @@ ivas-pytest-compare_ref-long-enc-lev+10: 
    - DUT_DECODER_PATH=./$REF_DECODER_PATH

    - TEST_SUITE="$LONG_TEST_SUITE_ENCODER"

    - LEVEL_SCALING=3.162

    - MLD_PLAYBACK_LEVEL="82.0"

    - SPLIT_COMPARISON="true"

  <<: *compare-to-ref-anchor
@@ -1965,6 +1965,7 @@ ivas-pytest-compare_ref-long-dec-lev+10: 
    - DUT_ENCODER_PATH=./$REF_ENCODER_PATH

    - TEST_SUITE="$LONG_TEST_SUITE_RENDERER_SHORT"

    - LEVEL_SCALING=3.162

    - MLD_PLAYBACK_LEVEL="82.0"

    - SPLIT_COMPARISON="true"

  <<: *compare-to-ref-anchor
@@ -1978,7 +1979,6 @@ ivas-pytest-compare_ref-long-fx-fx: 
    - USE_LTV=1

    - REF_ENCODER_PATH=./$DUT_ENCODER_PATH

    - TEST_SUITE="$LONG_TEST_SUITE_NO_RENDERER"

    - LEVEL_SCALING=1.0

    - SPLIT_COMPARISON="true"

  <<: *compare-to-ref-anchor
@@ -1993,6 +1993,7 @@ ivas-pytest-compare_ref-long-fx-fx-lev-10: 
    - REF_ENCODER_PATH=./$DUT_ENCODER_PATH

    - TEST_SUITE="$LONG_TEST_SUITE_NO_RENDERER"

    - LEVEL_SCALING=0.3162

    - MLD_PLAYBACK_LEVEL="102.0"

    - SPLIT_COMPARISON="true"

  <<: *compare-to-ref-anchor
@@ -2007,6 +2008,7 @@ ivas-pytest-compare_ref-long-fx-fx-lev+10: 
    - REF_ENCODER_PATH=./$DUT_ENCODER_PATH

    - TEST_SUITE="$LONG_TEST_SUITE_NO_RENDERER"

    - LEVEL_SCALING=3.162

    - MLD_PLAYBACK_LEVEL="82.0"

    - SPLIT_COMPARISON="true"

  <<: *compare-to-ref-anchor
@@ -2178,12 +2180,15 @@ test-long-self-test: 
    - case $LEVEL in 

        "0dB")

          LEVEL_SCALING=1.0

          MLD_PLAYBACK_LEVEL=92.0

        ;;

        "minus10dB")

          LEVEL_SCALING=0.3162

          MLD_PLAYBACK_LEVEL=102.0

        ;;

        "plus10dB")

          LEVEL_SCALING=3.162

          MLD_PLAYBACK_LEVEL=82.0

        ;;

      esac
@@ -2191,8 +2196,7 @@ test-long-self-test: 
    -   bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/apply-testv-scaling.sh

    - fi



    - INV_LEVEL_SCALING=$(awk "BEGIN {print 1.0 / $LEVEL_SCALING}")

    - comp_args="--mld --ssnr --odg --scalefac $INV_LEVEL_SCALING"

    - comp_args="--mld --ssnr --odg --mld-playback-level $MLD_PLAYBACK_LEVEL"



    ### store the current commit hash

    - source_branch_commit_sha=$(git rev-parse HEAD)
@@ -2378,7 +2382,6 @@ ivas-pytest-renderer: 
  before_script:

    - USE_LTV=0

    - TEST_SUITE="tests/renderer"

    - LEVEL_SCALING=1.0

  <<: *compare-to-ref-anchor



peaq-enc-passthrough:
@@ -2391,7 +2394,6 @@ peaq-enc-passthrough: 
    - DUT_DECODER_PATH=./$REF_DECODER_PATH

    - TEST_SUITE="tests/test_enc_passthrough.py"

    - DELTA_ODG="true"

    - LEVEL_SCALING=1.0

  <<: *compare-to-ref-anchor



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