diff --git a/scripts/config/self_test_evs.prm b/scripts/config/self_test_evs.prm index 4f6908be4c8387a61a5b93db1a11b0b14fbee94d..02227154d895bb542b41643a6359a162d03ecb53 100644 --- a/scripts/config/self_test_evs.prm +++ b/scripts/config/self_test_evs.prm @@ -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 diff --git a/scripts/self_test.py b/scripts/self_test.py index 0f7b8b3697e2d37786fb7bd0f799400a2344d505..05c6944ddde4aa13576e88f4e0c16c73f20404d1 100755 --- a/scripts/self_test.py +++ b/scripts/self_test.py @@ -75,15 +75,17 @@ MODES = { "-MASA": {"1": "MASA1TC", "2": "MASA2TC"}, } SNR_ID_SET = {"SNR", "SegSNR", "WSegSNR"} +TOOLS_DIR_WIN = os.path.realpath( + os.path.join(constants.SCRIPTS_BASE_DIR, "tools", "Win32") +) +TOOLS_DIR_LINUX = os.path.realpath( + os.path.join(constants.SCRIPTS_BASE_DIR, "tools", "Linux") +) if platform.system() == "Windows": - TOOLS_DIR = os.path.realpath( - os.path.join(constants.SCRIPTS_BASE_DIR, "tools", "Win32") - ) + TOOLS_DIR = TOOLS_DIR_WIN elif platform.system() == "Linux": - TOOLS_DIR = os.path.realpath( - os.path.join(constants.SCRIPTS_BASE_DIR, "tools", "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 ] diff --git a/scripts/tools/Darwin/networkSimulator_g192 b/scripts/tools/Darwin/networkSimulator_g192 new file mode 100755 index 0000000000000000000000000000000000000000..ba96e89897224de381218eadd10096c693ef566e Binary files /dev/null and b/scripts/tools/Darwin/networkSimulator_g192 differ diff --git a/scripts/tools/Win32/networkSimulator_g192.exe b/scripts/tools/Win32/networkSimulator_g192.exe new file mode 100755 index 0000000000000000000000000000000000000000..c17aff5249864ddd33d2393ca250f3de1ee1e42b --- /dev/null +++ b/scripts/tools/Win32/networkSimulator_g192.exe @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b81ea0575fb6b40f48c22b59f90820774054e82708750f9350cf9c0ec2674231 +size 578574