Loading tests/renderer/utils.py +4 −11 Original line number Diff line number Diff line Loading @@ -26,6 +26,7 @@ the United Nations Convention on Contracts on the International Sales of Goods. """ import pyaudio3dtools import logging import subprocess as sp import sys Loading @@ -41,9 +42,10 @@ from .compare_audio import compare_audio_arrays from .constants import * sys.path.append(SCRIPTS_DIR) import pyaudio3dtools # fixture returns test information, enabling per-testcase SNR @pytest.fixture def test_info(request): return request Loading Loading @@ -100,7 +102,6 @@ def check_BE( ) <<<<<<< HEAD def run_enc( in_fmt: str, bit_file: str, Loading Loading @@ -153,8 +154,6 @@ def run_dec( return pyaudio3dtools.audiofile.readfile(out_file) ======= >>>>>>> main def run_renderer( in_fmt: str, out_fmt: str, Loading Loading @@ -217,7 +216,6 @@ def run_renderer( return pyaudio3dtools.audiofile.readfile(out_file) <<<<<<< HEAD def run_renderer_ext( in_file: str, in_fmt: str, Loading Loading @@ -384,8 +382,6 @@ def run_td_standalone( return pyaudio3dtools.audiofile.readfile(out_file, nchannels=2) ======= >>>>>>> main def run_pyscripts( in_fmt, out_fmt, Loading Loading @@ -452,7 +448,6 @@ def compare_renderer_vs_pyscripts(test_info, in_fmt, out_fmt, **kwargs): ref, ref_fs = run_pyscripts(in_fmt, out_fmt, **kwargs) cut, cut_fs = run_renderer(in_fmt, out_fmt, **kwargs) check_BE(test_info, ref, ref_fs, cut, cut_fs) <<<<<<< HEAD def compare_renderer_vs_crend_unit_test(test_info, in_fmt, out_fmt, **kwargs): Loading Loading @@ -519,5 +514,3 @@ def compare_renderer_vs_decoder(test_info, in_fmt, out_fmt, **kwargs): ) check_BE(test_info, ref, ref_fs, cut, cut_fs) ======= >>>>>>> main Loading
tests/renderer/utils.py +4 −11 Original line number Diff line number Diff line Loading @@ -26,6 +26,7 @@ the United Nations Convention on Contracts on the International Sales of Goods. """ import pyaudio3dtools import logging import subprocess as sp import sys Loading @@ -41,9 +42,10 @@ from .compare_audio import compare_audio_arrays from .constants import * sys.path.append(SCRIPTS_DIR) import pyaudio3dtools # fixture returns test information, enabling per-testcase SNR @pytest.fixture def test_info(request): return request Loading Loading @@ -100,7 +102,6 @@ def check_BE( ) <<<<<<< HEAD def run_enc( in_fmt: str, bit_file: str, Loading Loading @@ -153,8 +154,6 @@ def run_dec( return pyaudio3dtools.audiofile.readfile(out_file) ======= >>>>>>> main def run_renderer( in_fmt: str, out_fmt: str, Loading Loading @@ -217,7 +216,6 @@ def run_renderer( return pyaudio3dtools.audiofile.readfile(out_file) <<<<<<< HEAD def run_renderer_ext( in_file: str, in_fmt: str, Loading Loading @@ -384,8 +382,6 @@ def run_td_standalone( return pyaudio3dtools.audiofile.readfile(out_file, nchannels=2) ======= >>>>>>> main def run_pyscripts( in_fmt, out_fmt, Loading Loading @@ -452,7 +448,6 @@ def compare_renderer_vs_pyscripts(test_info, in_fmt, out_fmt, **kwargs): ref, ref_fs = run_pyscripts(in_fmt, out_fmt, **kwargs) cut, cut_fs = run_renderer(in_fmt, out_fmt, **kwargs) check_BE(test_info, ref, ref_fs, cut, cut_fs) <<<<<<< HEAD def compare_renderer_vs_crend_unit_test(test_info, in_fmt, out_fmt, **kwargs): Loading Loading @@ -519,5 +514,3 @@ def compare_renderer_vs_decoder(test_info, in_fmt, out_fmt, **kwargs): ) check_BE(test_info, ref, ref_fs, cut, cut_fs) ======= >>>>>>> main