Commit 5d992e38 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'self-test-evs-followup' into 'main' 

Self test evs followup - Add JBM testcases back

See merge request !143
parents 301ec8e9 118ead61

scripts/config/self_test_evs.prm

+15 −0
Original line number Diff line number Diff line
@@ -219,3 +219,18 @@ 
../IVAS_dec 32 bit testv/stv32c_AMR_WB_19k85_32-32.tst







// Codec A at 13.20 kbps, 32kHz in, 32kHz out, DTX, JBM Prof 5

../IVAS_cod -dtx 13200 32 testv/stv32c.pcm bit

networkSimulator_g192 ../scripts/dly_error_profiles/dly_error_profile_5.dat bit netsimoutput tracefile_sim 2 0

../IVAS_dec  -Tracefile tracefile_dec -VOIP 32 netsimoutput testv/stv32c_13k20_32-32_DTX_JBM5.tst



// Codec B at 16.40 kbps, 32kHz in, 32kHz out, DTX, JBM Prof 5

../IVAS_cod -dtx 16400 32 testv/stv32c.pcm bit

networkSimulator_g192 ../scripts/dly_error_profiles/dly_error_profile_5.dat bit netsimoutput tracefile_sim 2 0

../IVAS_dec -Tracefile tracefile_dec -VOIP 32 netsimoutput testv/stv32c_16k40_32-32_DTX_JBM5.tst



// Codec B at 13.20 kbps, 32kHz in, 32kHz out, JBM Prof 9, Channel aware

../IVAS_cod -rf 13200 32 testv/stv32c.pcm bit

networkSimulator_g192 ../scripts/dly_error_profiles/dly_error_profile_5.dat bit netsimoutput tracefile_sim 2 0

../IVAS_dec -Tracefile tracefile_dec -VOIP 32 netsimoutput testv/stv32c_13k20_CA_32-32_JBM9.tst

scripts/self_test.py

+14 −6
Original line number Diff line number Diff line
@@ -75,15 +75,17 @@ MODES = { 
    "-MASA": {"1": "MASA1TC", "2": "MASA2TC"},

}

SNR_ID_SET = {"SNR", "SegSNR", "WSegSNR"}



if platform.system() == "Windows":

    TOOLS_DIR = os.path.realpath(

TOOLS_DIR_WIN = os.path.realpath(

    os.path.join(constants.SCRIPTS_BASE_DIR, "tools", "Win32")

)

elif platform.system() == "Linux":

    TOOLS_DIR = os.path.realpath(

TOOLS_DIR_LINUX = os.path.realpath(

    os.path.join(constants.SCRIPTS_BASE_DIR, "tools", "Linux")

)



if platform.system() == "Windows":

    TOOLS_DIR = TOOLS_DIR_WIN

elif platform.system() == "Linux":

    TOOLS_DIR = TOOLS_DIR_LINUX

elif platform.system() == "Darwin":

    if platform.uname().machine.endswith("64"):

        TOOLS_DIR = os.path.realpath(
@@ -988,7 +990,13 @@ class SelfTest(IvasScriptsCommon.IvasScript): 
            proc_cmd = mode[1].pop(0).split()

            if proc_cmd[0] == "networkSimulator_g192":

                suffix = "nws"



            proc_cmd[0] = os.path.join(TOOLS_DIR, proc_cmd[0])

            if suffix == "nws" and TOOLS_DIR == TOOLS_DIR_LINUX:

                # use wine

                proc_cmd[0] = os.path.join(TOOLS_DIR_WIN, "networkSimulator_g192.exe")

                proc_cmd = ["wine"] + proc_cmd



            proc_cmd = [

                "{in_file}" if x == in_file else self.test_for_file(x) for x in proc_cmd

            ]

scripts/tools/Darwin/networkSimulator_g192

0 → 100755
+151 KiB

File added.

No diff preview for this file type.

View file

scripts/tools/Win32/networkSimulator_g192.exe

0 → 100755LFS
+131 B

File added.

No diff preview for this file type.

View file