Commit 62d2d628 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'main' into add_check_for_native_binary_in_test

parents 91fbce95 febe3f1b

.gitlab-ci.yml

+6 −0
Original line number Diff line number Diff line
@@ -48,6 +48,11 @@ stages: 
  - make -j

  - cd $dir



.get-codec-testvectors: &get-codec-testvectors

  - to_dir=$(pwd)/tests/data/testv

  - mkdir -p $to_dir

  - from_dir=$CODEC_DIR/scripts/testv

  - cp $from_dir/*.wav $to_dir/



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

# check pre-conditions are met
@@ -82,6 +87,7 @@ experiments: 
  script:

    - *print-common-info

    - *get-codec-binaries

    - *get-codec-testvectors

    - python3 -m pytest tests/test_experiments.py::test_generate_test_items -n auto | tee log.txt

  artifacts:

    paths:

ivas_processing_scripts/__init__.py

+1 −0
Original line number Diff line number Diff line
@@ -187,6 +187,7 @@ def main(args): 
                sleep(0.1)

            progressbar_update(count, count, width)

            print("\n", flush=True, file=sys.stdout)

            results.get()



            p.close()

            p.join()

ivas_processing_scripts/audiotools/wrappers/bs1770.py

+1 −1
Original line number Diff line number Diff line
@@ -291,7 +291,7 @@ def loudness_norm( 
            )



    if num_iter >= 10:

        warn(

        raise ValueError(

            f"Loudness did not converge to desired value, stopping at: {loudness_after:.2f}"

        )

ivas_processing_scripts/processing/processing.py

+2 −0
Original line number Diff line number Diff line
@@ -270,6 +270,7 @@ def preprocess(cfg, logger): 
        sleep(0.1)

    progressbar_update(count, count, width)

    print("\n", flush=True, file=sys.stdout)

    results.get()



    p.close()

    p.join()
@@ -341,6 +342,7 @@ def preprocess_2(cfg, logger): 
        sleep(0.1)

    progressbar_update(count, count, width)

    print("\n", flush=True, file=sys.stdout)

    results.get()



    p.close()

    p.join()

tests/constants.py

+14 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ from pathlib import PurePath 
""" Set up paths """

TESTS_DIR = PurePath(__file__).parent

TEST_VECTOR_DIR = TESTS_DIR.joinpath("data")

CODEC_TEST_VECTOR_DIR = TEST_VECTOR_DIR.joinpath("testv")

EXPERIMENTS_DIR = "../experiments/selection"



ISM_METADATA_DIR = TEST_VECTOR_DIR.joinpath("ism_metadata")
@@ -84,6 +85,19 @@ NCHAN_TO_FILE = { 
    16: TEST_VECTOR_DIR.joinpath("spectral").joinpath("spectral_test_16ch_48kHz.wav"),

}



NCHAN_TO_TESTV = {

    1: CODEC_TEST_VECTOR_DIR.joinpath("stv48c.wav"),

    2: CODEC_TEST_VECTOR_DIR.joinpath("stvST48c.wav"),

    3: CODEC_TEST_VECTOR_DIR.joinpath("stv3ISM48s.wav"),

    4: CODEC_TEST_VECTOR_DIR.joinpath("stv4ISM48n.wav"),

    6: CODEC_TEST_VECTOR_DIR.joinpath("stv51MC48c.wav"),

    8: CODEC_TEST_VECTOR_DIR.joinpath("stv71MC48.wav"),

    9: CODEC_TEST_VECTOR_DIR.joinpath("stv2OA48c.wav"),

    10: CODEC_TEST_VECTOR_DIR.joinpath("stv514MC48c.wav"),

    12: CODEC_TEST_VECTOR_DIR.joinpath("stv714MC48c.wav"),

    16: CODEC_TEST_VECTOR_DIR.joinpath("stv3OA48c.wav"),

}



FORMAT_TO_FILE = {

    "MONO": NCHAN_TO_FILE[1],

    "STEREO": NCHAN_TO_FILE[2],