From b65daa7bab7e00c3fa4d6640538ed17389eed5a0 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Fri, 17 May 2024 09:51:27 +0200 Subject: [PATCH 1/4] fix relative import --- tests/renderer/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/renderer/utils.py b/tests/renderer/utils.py index 2193ee4bfb..70aea8c2d5 100644 --- a/tests/renderer/utils.py +++ b/tests/renderer/utils.py @@ -53,7 +53,7 @@ from .constants import ( sys.path.append(SCRIPTS_DIR) from pyaudio3dtools.audiofile import readfile -from .. import cmp_pcm +from ..cmp_pcm import cmp_pcm # fixture returns test information, enabling per-testcase SNR -- GitLab From fee412e863a7b964d7aa308db999a5a3c2e12c5b Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Fri, 17 May 2024 10:06:56 +0200 Subject: [PATCH 2/4] fix fs being a string --- tests/renderer/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/renderer/utils.py b/tests/renderer/utils.py index 70aea8c2d5..e3d012afc7 100644 --- a/tests/renderer/utils.py +++ b/tests/renderer/utils.py @@ -284,7 +284,7 @@ def run_renderer( if get_mld: # see constants.py - ref_fs = cmd[10] + ref_fs = int(cmd[10]) * 1000 output_differs, reason = cmp_pcm( out_file, out_file_ref, -- GitLab From 1beb1b36c36c65d89771803512e454ec0729331a Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Fri, 17 May 2024 12:26:43 +0200 Subject: [PATCH 3/4] fix MLD and MAX_DIFF parsing in renderer tests --- tests/codec_be_on_mr_nonselection/__init__.py | 2 -- .../test_masa_enc_dec.py | 2 +- .../test_param_file.py | 2 +- .../test_sba_bs_dec_plc.py | 2 +- .../test_sba_bs_enc.py | 2 +- tests/constants.py | 3 +++ tests/renderer/utils.py | 15 ++++++++++++--- tests/test_param_file_ltv.py | 2 +- 8 files changed, 20 insertions(+), 10 deletions(-) create mode 100644 tests/constants.py diff --git a/tests/codec_be_on_mr_nonselection/__init__.py b/tests/codec_be_on_mr_nonselection/__init__.py index aba85788e7..e69de29bb2 100644 --- a/tests/codec_be_on_mr_nonselection/__init__.py +++ b/tests/codec_be_on_mr_nonselection/__init__.py @@ -1,2 +0,0 @@ -MLD_PATTERN = r"MLD: ([\d\.]*)" -MAX_DIFF_PATTERN = r"MAXIMUM ABS DIFF: (\d*)" diff --git a/tests/codec_be_on_mr_nonselection/test_masa_enc_dec.py b/tests/codec_be_on_mr_nonselection/test_masa_enc_dec.py index 9a8d8b35d5..34fa40e278 100644 --- a/tests/codec_be_on_mr_nonselection/test_masa_enc_dec.py +++ b/tests/codec_be_on_mr_nonselection/test_masa_enc_dec.py @@ -44,7 +44,7 @@ import pytest from tests.cmp_pcm import cmp_pcm from tests.conftest import DecoderFrontend, EncoderFrontend -from . import MLD_PATTERN, MAX_DIFF_PATTERN +from ..constants import MLD_PATTERN, MAX_DIFF_PATTERN # params # output_mode_list = ['MONO', 'STEREO', '5_1', '7_1', '5_1_2', '5_1_4', '7_1_4', 'FOA', 'HOA2', 'HOA3', 'BINAURAL', 'BINAURAL_ROOM', 'EXT'] diff --git a/tests/codec_be_on_mr_nonselection/test_param_file.py b/tests/codec_be_on_mr_nonselection/test_param_file.py index e8de6decf3..34e92b715a 100644 --- a/tests/codec_be_on_mr_nonselection/test_param_file.py +++ b/tests/codec_be_on_mr_nonselection/test_param_file.py @@ -44,7 +44,7 @@ import pytest from tests.cmp_pcm import cmp_pcm from tests.conftest import DecoderFrontend, EncoderFrontend from tests.testconfig import PARAM_FILE -from . import MLD_PATTERN, MAX_DIFF_PATTERN +from ..constants import MLD_PATTERN, MAX_DIFF_PATTERN VALID_DEC_OUTPUT_CONF = [ "MONO", diff --git a/tests/codec_be_on_mr_nonselection/test_sba_bs_dec_plc.py b/tests/codec_be_on_mr_nonselection/test_sba_bs_dec_plc.py index a11d1d30bf..289d10fae1 100644 --- a/tests/codec_be_on_mr_nonselection/test_sba_bs_dec_plc.py +++ b/tests/codec_be_on_mr_nonselection/test_sba_bs_dec_plc.py @@ -40,7 +40,7 @@ import pytest from tests.cmp_pcm import cmp_pcm from tests.conftest import DecoderFrontend -from . import MLD_PATTERN, MAX_DIFF_PATTERN +from ..constants import MLD_PATTERN, MAX_DIFF_PATTERN # params tag_list = ["stvFOA"] diff --git a/tests/codec_be_on_mr_nonselection/test_sba_bs_enc.py b/tests/codec_be_on_mr_nonselection/test_sba_bs_enc.py index 788421f833..2415d9d9a9 100644 --- a/tests/codec_be_on_mr_nonselection/test_sba_bs_enc.py +++ b/tests/codec_be_on_mr_nonselection/test_sba_bs_enc.py @@ -42,7 +42,7 @@ from cut_bs import cut_from_start from tests.cmp_pcm import cmp_pcm from tests.conftest import DecoderFrontend, EncoderFrontend -from . import MLD_PATTERN, MAX_DIFF_PATTERN +from ..constants import MLD_PATTERN, MAX_DIFF_PATTERN # params diff --git a/tests/constants.py b/tests/constants.py new file mode 100644 index 0000000000..453c07dca8 --- /dev/null +++ b/tests/constants.py @@ -0,0 +1,3 @@ +# regex patterns for parsing the output from cmp_pcm -> mainly for BASOP ci +MLD_PATTERN = r"MLD: ([\d\.]*)" +MAX_DIFF_PATTERN = r"MAXIMUM ABS DIFF: (\d*)" diff --git a/tests/renderer/utils.py b/tests/renderer/utils.py index e3d012afc7..c422e84153 100644 --- a/tests/renderer/utils.py +++ b/tests/renderer/utils.py @@ -39,6 +39,7 @@ from typing import Dict, Optional import numpy as np import pytest +import re from .compare_audio import compare_audio_arrays from .constants import ( @@ -54,6 +55,7 @@ from .constants import ( sys.path.append(SCRIPTS_DIR) from pyaudio3dtools.audiofile import readfile from ..cmp_pcm import cmp_pcm +from ..constants import MLD_PATTERN, MAX_DIFF_PATTERN # fixture returns test information, enabling per-testcase SNR @@ -294,9 +296,16 @@ def run_renderer( mld_lim=get_mld_lim, ) mld = 0 - if "MLD" in reason: - mld = float(reason.split(":")[1].split()[0]) - record_property("MLD", mld) + if get_mld: + mld = re.search(MLD_PATTERN, reason).groups(1)[0] + record_property("MLD", mld) + + max_diff = 0 + if output_differs: + search_result = re.search(MAX_DIFF_PATTERN, reason) + max_diff = search_result.groups(1)[0] + record_property("MAXIMUM ABS DIFF", max_diff) + if output_differs: pytest.fail(f"Output differs: ({reason})") else: diff --git a/tests/test_param_file_ltv.py b/tests/test_param_file_ltv.py index 646258fabb..4216318d37 100644 --- a/tests/test_param_file_ltv.py +++ b/tests/test_param_file_ltv.py @@ -44,7 +44,7 @@ import pytest from tests.cmp_pcm import cmp_pcm from tests.conftest import DecoderFrontend, EncoderFrontend -from .codec_be_on_mr_nonselection import MLD_PATTERN, MAX_DIFF_PATTERN +from .constants import MLD_PATTERN, MAX_DIFF_PATTERN # from tests.testconfig import PARAM_FILE -- GitLab From 4da1cf287fd46c6e1b2d4852861accf6b6bfee60 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Wed, 22 May 2024 11:30:37 +0200 Subject: [PATCH 4/4] avoid change of positions in base part of RENDERER_CMD --- tests/renderer/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/renderer/utils.py b/tests/renderer/utils.py index c422e84153..9717af0b81 100644 --- a/tests/renderer/utils.py +++ b/tests/renderer/utils.py @@ -242,7 +242,7 @@ def run_renderer( cmd[0] += binary_suffix if in_meta_files is not None: - cmd[5:5] = ["-im", *in_meta_files] + cmd.extend(["-im", *in_meta_files]) if trj_file is not None: cmd.extend(["-T", str(trj_file)]) -- GitLab