Commit 3011bc35 authored by norvell's avatar norvell
Browse files

Merge branch 'ci/basop-ci-update2' into 'basop-ci-branch' 

[BASOP CI] Fix test_26444.py

See merge request !1484
parents 11a027c1 bab1eb80

.gitlab-ci.yml

+4 −0
Original line number Diff line number Diff line
@@ -529,6 +529,8 @@ codec-smoke-test: 
codec-msan:

  extends:

    - .sanitizer-selftest-on-mr

  tags:

    - ivas-linux-fast

  before_script:

    - CLANG_NUM=1

    - SELFTEST_SANITY_TIMEOUT=$TESTCASE_TIMEOUT_STV_SANITIZERS
@@ -1539,6 +1541,8 @@ ltv-usan: 
    paths:

      - ep_015.g192

      - dly_profile.dat

      - head_rot_traj.csv

      - exof_traj.csv

      - ./LOGS_PLC

      - ./LOGS_noPLC

ci/create_trajectories.py

0 → 100644
+25 −0
Original line number Diff line number Diff line 
import numpy as np





FRAMES_PER_SEC = 50





def random_trajectory(duration_sec):

    n_frames = int(FRAMES_PER_SEC * duration_sec)

    trj = np.random.random((n_frames, 4))

    trj[:, 0] = -3

    trj[:, 1] *= 180

    trj[:, 2] *= 90

    trj[:, 3] *= 180

    return trj





def constant_trajectory(duration_sec, yaw=0, pitch=0, roll=0):

    n_frames = int(FRAMES_PER_SEC * duration_sec)

    trj = np.empty((n_frames, 4))

    trj[:, 0] = -3

    trj[:, 1] = yaw

    trj[:, 2] = pitch

    trj[:, 3] = roll

    return trj

ci/remove_unsupported_testcases.py

+1 −1
Original line number Diff line number Diff line
@@ -42,9 +42,9 @@ TESTCASES = [ 
    "OSBA FOA 2ISM at 64 kbps, 48kHz in, 48kHz out, HOA3 out, bandwidth switching",

    "OMASA 2Dir2TC 4ISM at br sw techs 13.2 to 512 kbps start 80 kbps, 48kHz in, 48kHz out, EXT out",

    "OSBA planar FOA 2ISM at 512 kbps, 48 kHz in, 48 kHz out, BINAURAL out",

    "4 ISM with extended metadata at 128 kbps, 48 kHz in, 48 kHz out, BINAURAL_ROOM_REVERB out, combined render config, directivity configuration with identifiers",

    "OSBA planar FOA 1ISM at 256 kbps, 48 kHz in, 48 kHz out, BINAURAL out",

    "SBA 3OA at 128 kbps, 48kHz in 48kHz out, BINAURAL_ROOM_REVERB combined renderer configuration with selected acoustic environment",

    "OSBA FOA 4ISM at bitrate switching 13.2 to 512 kbps, 48kHz in, 16kHz out, BINAURAL out (Model from file), FER at 5%, bandwidth switching",

]

ci/run_scheduled_sanitizer_test.py

+41 −6
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ import argparse 
import pathlib

import subprocess

import sys

import numpy as np

import json



CI_SCRIPT_DIR = "./ci"

sys.path.append(CI_SCRIPT_DIR)
@@ -41,6 +43,8 @@ from collect_artifacts import ( 
    find_failed_files_for_sanitizer_test,

)

from combine_genpatt_and_jbm_profile import combine_error_profiles

from create_trajectories import random_trajectory





SCRIPT_DIR = pathlib.Path("./scripts").resolve()

DURATION = "120"
@@ -54,12 +58,23 @@ N_FRAMES_DLY_PROFILE = 7500 
GENPATT_CMD = f"gen-patt -tailstat -fer -g192 -gamma 0 -rate 0.15 -tol 0.001 -reset -n {N_FRAMES_DLY_PROFILE} {EP_FILE}"

MC_MODES = ["5_1", "5_1_2", "5_1_4", "7_1", "7_1_4"]

AMBISONICS_MODES = ["HOA3", "HOA2", "FOA", "PlanarHOA3", "PlanarHOA2", "PlanarFOA"]

TIMEOUT = (

    60 * 20

)  # timeout of 15 minutes per en/decoding to safeguard against endless loops

# timeout of 15 minutes per en/decoding to safeguard against endless loops

TIMEOUT = 60 * 20

HEAD_TRAJ_FILE = str(pathlib.Path("./head_rot_traj.csv").resolve())

EXOF_TRAJ_FILE = str(pathlib.Path("./exof_traj.csv").resolve())



CONSOLE_OUT_FILE = "output_san.txt"



HEAD_ROT_ARGS = ["-t", HEAD_TRAJ_FILE]

EXOF_ARGS = ["-exof", EXOF_TRAJ_FILE]

OTR_ARGS = ["-otr", "avg"]

BINAURAL_OUT_ARGS = HEAD_ROT_ARGS + EXOF_ARGS + OTR_ARGS

ARGS_FOR_OC = {

    "BINAURAL": BINAURAL_OUT_ARGS,

    "BINAURAL_ROOM_IR": BINAURAL_OUT_ARGS,

    "BINAURAL_ROOM_REVERB": BINAURAL_OUT_ARGS,

}





def main(args):

    in_format = args.in_format
@@ -112,6 +127,12 @@ def get_modes(in_format: str) -> list: 
    return mode_list





def assemble_oc_dict(out_formats: list):

    oc_dict = {of: ARGS_FOR_OC.get(of, list()) for of in out_formats}



    return json.dumps(oc_dict)





def get_md_file_command(in_format: str) -> list:



    cmd = list()
@@ -127,11 +148,19 @@ def get_md_file_command(in_format: str) -> list: 
def run_check(in_format: str, out_formats: list, tests: list, run_fec: bool = True):



    modes = get_modes(in_format)

    md_file_command = get_md_file_command(in_format)



    if len(modes) == 0:

        return 0



    md_file_command = get_md_file_command(in_format)

    oc_str = assemble_oc_dict(out_formats)



    # create random trajectory files

    if "BINAURAL" in oc_str:

        trajectory_files = [HEAD_TRAJ_FILE, EXOF_TRAJ_FILE]

        for tf in trajectory_files:

            traj = random_trajectory(int(DURATION))

            np.savetxt(tf, traj, fmt="%.2f", delimiter=",")



    ### always run encoder and decoder with no frameloss

    cmd_no_fec = [

        str(SCRIPT_DIR.joinpath("IvasBuildAndRunChecks.py")),
@@ -146,7 +175,7 @@ def run_check(in_format: str, out_formats: list, tests: list, run_fec: bool = Tr 
        "-m",

        *modes,

        "--oc",

        *out_formats,

        oc_str,

        *md_file_command,

        "--usan_supp_file",

        USAN_SUPP_FILE,
@@ -154,6 +183,12 @@ def run_check(in_format: str, out_formats: list, tests: list, run_fec: bool = Tr 
        str(TIMEOUT),

    ]



    # to test non-diegetic panning with mono decoding:

    # resue decoder part of StereDmxEVS mode (it is basically a duplicate of "normal" mono run)

    if in_format == "StereoDmxEVS":

        panning = np.random.randint(-90, 91)

        cmd_no_fec += [f'-D=-non_diegetic_pan {panning}']



    print(

        "======== Script command line WITHOUT plc: ========\n{}".format(

            " ".join(cmd_no_fec)

ci/smoke_test.sh

+10 −11
Original line number Diff line number Diff line
@@ -82,8 +82,8 @@ echo "\n======================= 0. preparing combined format test inputs ======= 


# run all modes vanilla-fashion

# treat ISM modes separately because passing the metadata files to MASA modes causes crashes

ism_modes=$(./scripts/runIvasCodec.py -l | grep ^ISM)

non_ism_modes=$(./scripts/runIvasCodec.py -l | grep -v ^ISM)

ism_modes=$(./scripts/runIvasCodec.py -l | grep ISM)

non_ism_modes=$(./scripts/runIvasCodec.py -l | grep -v ISM)

echo "\n======================= 1. non-ism modes no FEC =======================\n\n"

./scripts/runIvasCodec.py $verbosity_cmd -m $non_ism_modes -p $cfg $duration_arg $timeout_cmd | tee smoke_test_output.txt

echo "\n======================= 2. ism modes no FEC =======================\n\n"
@@ -93,29 +93,28 @@ echo "\n======================= 3. all modes with FEC =======================\n\ 
./scripts/runIvasCodec.py $verbosity_cmd -p $cfg $duration_arg -f="$ep_file" --decoder_only $timeout_cmd | tee smoke_test_output_plc.txt



# run JBM modes - EXT is excluded as not supported yet

# OMASA disabled for now

modes_with_no_ext_out=$(./scripts/runIvasCodec.py -l | grep -v ^MASA | grep -v ^ISM | grep -v OMASA)

modes_with_ext_out=$(./scripts/runIvasCodec.py -l | grep 'MASA\|ISM' | grep -v ^ISM+ | grep -v OMASA)

formats_with_no_ext_out=$(./scripts/runIvasCodec.py -L | grep -v MASA | grep -v ISM | grep -v OSBA)

formats_with_ext_out=$(./scripts/runIvasCodec.py -L | grep 'MASA\|ISM\|OSBA')

echo "\n======================= 4. JBM, modes with no EXT =======================\n\n"

./scripts/runIvasCodec.py $verbosity_cmd -m $modes_with_no_ext_out -p $cfg $duration_arg --decoder_only --jbm_file $dly_profile $timeout_cmd | tee smoke_test_output_jbm_noEXT.txt

./scripts/runIvasCodec.py $verbosity_cmd -C $formats_with_no_ext_out -p $cfg $duration_arg --decoder_only --jbm_file $dly_profile $timeout_cmd | tee smoke_test_output_jbm_noEXT.txt

echo "\n======================= 5. JBM, modes with EXT =======================\n\n"

./scripts/runIvasCodec.py  $verbosity_cmd -m $modes_with_ext_out -p $cfg $duration_arg --decoder_only --jbm_file $dly_profile --oc BINAURAL BINAURAL_ROOM_IR mono stereo FOA HOA3 5_1 7_1_4 $timeout_cmd | tee -a smoke_test_output_jbm_noEXT.txt

./scripts/runIvasCodec.py  $verbosity_cmd -C $formats_with_ext_out -p $cfg $duration_arg --decoder_only --jbm_file $dly_profile --oc BINAURAL BINAURAL_ROOM_IR mono stereo FOA HOA3 5_1 7_1_4 $timeout_cmd | tee -a smoke_test_output_jbm_noEXT.txt



# run all modes with binaural output using external files

modes_with_bin_out="FOA HOA2 HOA3 PlanarFOA PlanarHOA2 PlanarHOA3 MASA MC ISM1 ISM2 ISM3 ISM4"

formats_with_bin_out=$(./scripts/runIvasCodec.py -L | grep -v "mono\|tereo")

bin_out_modes="BINAURAL BINAURAL_ROOM_IR"



echo "\n======================= 6. binaural out with HRTF files - WB =======================\n\n"

wb_modes=$(./scripts/runIvasCodec.py -l -C $modes_with_bin_out | grep _wb_)

wb_modes=$(./scripts/runIvasCodec.py -l -C $formats_with_bin_out | grep _wb_)

hrtf_wb="../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin"

./scripts/runIvasCodec.py $verbosity_cmd -p $cfg -m $wb_modes $duration_arg -D="-hrtf ${hrtf_wb}" --decoder_only --oc $bin_out_modes $timeout_cmd | tee -a smoke_test_output_hrtf.txt



echo "\n======================= 7. binaural out with HRTF files - SWB =======================\n\n"

swb_modes=$(./scripts/runIvasCodec.py -l -C $modes_with_bin_out | grep _swb_)

swb_modes=$(./scripts/runIvasCodec.py -l -C $formats_with_bin_out | grep _swb_)

hrtf_swb="../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin"

./scripts/runIvasCodec.py $verbosity_cmd -p $cfg -m $swb_modes $duration_arg -D="-hrtf ${hrtf_swb}" --decoder_only --oc $bin_out_modes $timeout_cmd | tee -a smoke_test_output_hrtf.txt



echo "\n======================= 8. binaural out with HRTF files - FB =======================\n\n"

fb_modes=$(./scripts/runIvasCodec.py -l -C $modes_with_bin_out | grep _fb_)

fb_modes=$(./scripts/runIvasCodec.py -l -C $formats_with_bin_out | grep _fb_)

hrtf_fb="../scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin"

./scripts/runIvasCodec.py $verbosity_cmd -p $cfg -m $fb_modes $duration_arg -D="-hrtf ${hrtf_fb}" --decoder_only --oc $bin_out_modes $timeout_cmd | tee -a smoke_test_output_hrtf.txt