From 0447806969830f387598dc2ed69acce699260db4 Mon Sep 17 00:00:00 2001 From: Erik Norvell Date: Fri, 14 Jun 2024 09:35:27 +0200 Subject: [PATCH 1/4] Fix in test_param_file.py for tracefile check --- .../HRIR_128_Meth5_IRC_51_Q10_symL_Itrp1_48000.sofa | 4 ++-- tests/codec_be_on_mr_nonselection/test_param_file.py | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/scripts/binauralRenderer_interface/HRIRs_sofa/HRIR_128_Meth5_IRC_51_Q10_symL_Itrp1_48000.sofa b/scripts/binauralRenderer_interface/HRIRs_sofa/HRIR_128_Meth5_IRC_51_Q10_symL_Itrp1_48000.sofa index e818470a52..42c083d6f3 100644 --- a/scripts/binauralRenderer_interface/HRIRs_sofa/HRIR_128_Meth5_IRC_51_Q10_symL_Itrp1_48000.sofa +++ b/scripts/binauralRenderer_interface/HRIRs_sofa/HRIR_128_Meth5_IRC_51_Q10_symL_Itrp1_48000.sofa @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e6ecaaa25464342567a19dc04a563127d89055e49c2bd177a22c9e19397a2bba -size 15915864 +oid sha256:2c368121ebd83ed0712cd1963ab44f130d1e02a14f5191bf2d403f71b7eadc0f +size 15911554 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 619e252767..97168edf16 100644 --- a/tests/codec_be_on_mr_nonselection/test_param_file.py +++ b/tests/codec_be_on_mr_nonselection/test_param_file.py @@ -330,8 +330,12 @@ def test_param_file_tests( ref_tracefile_dec = f"{reference_path}/param_file/dec/{tracefile_dec}" # check for same RTP sequence number in last line of tracefile - dut_rtp_num_last = np.genfromtxt(dut_tracefile_dec, delimiter=";")[-1,0] - ref_rtp_num_last = np.genfromtxt(ref_tracefile_dec, delimiter=";")[-1,0] + with open(dut_tracefile_dec,"r") as fp: + lines = [l for l in fp.readlines() if not l.startswith("-1")] + dut_rtp_num_last = lines[-1][0] + with open(ref_tracefile_dec,"r") as fp: + lines = [l for l in fp.readlines() if not l.startswith("-1")] + ref_rtp_num_last = lines[-1][0] tracefile_last_rtp_numbers_differ = dut_rtp_num_last != ref_rtp_num_last # same sequence number -> likely no crash, assume length difference is due to difference in TSM -- GitLab From 24e07db99673e9f90d6e4ef42077f62ae521f0b9 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Fri, 14 Jun 2024 09:44:53 +0200 Subject: [PATCH 2/4] use option in numpy.genfromtxt for reading the first column only --- tests/codec_be_on_mr_nonselection/test_param_file.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) 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 97168edf16..eee9fcd9b2 100644 --- a/tests/codec_be_on_mr_nonselection/test_param_file.py +++ b/tests/codec_be_on_mr_nonselection/test_param_file.py @@ -330,12 +330,8 @@ def test_param_file_tests( ref_tracefile_dec = f"{reference_path}/param_file/dec/{tracefile_dec}" # check for same RTP sequence number in last line of tracefile - with open(dut_tracefile_dec,"r") as fp: - lines = [l for l in fp.readlines() if not l.startswith("-1")] - dut_rtp_num_last = lines[-1][0] - with open(ref_tracefile_dec,"r") as fp: - lines = [l for l in fp.readlines() if not l.startswith("-1")] - ref_rtp_num_last = lines[-1][0] + dut_rtp_num_last = np.genfromtxt(dut_tracefile_dec, delimiter=";", usecols=[0])[-1] + ref_rtp_num_last = np.genfromtxt(ref_tracefile_dec, delimiter=";", usecols=[0])[-1] tracefile_last_rtp_numbers_differ = dut_rtp_num_last != ref_rtp_num_last # same sequence number -> likely no crash, assume length difference is due to difference in TSM -- GitLab From a0a7e9868d7a9bd9c70a83bb0cca0ad6479f7974 Mon Sep 17 00:00:00 2001 From: Erik Norvell Date: Fri, 14 Jun 2024 10:13:21 +0200 Subject: [PATCH 3/4] Remove sofa file committed by accident --- .../HRIRs_sofa/HRIR_128_Meth5_IRC_51_Q10_symL_Itrp1_48000.sofa | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 scripts/binauralRenderer_interface/HRIRs_sofa/HRIR_128_Meth5_IRC_51_Q10_symL_Itrp1_48000.sofa diff --git a/scripts/binauralRenderer_interface/HRIRs_sofa/HRIR_128_Meth5_IRC_51_Q10_symL_Itrp1_48000.sofa b/scripts/binauralRenderer_interface/HRIRs_sofa/HRIR_128_Meth5_IRC_51_Q10_symL_Itrp1_48000.sofa deleted file mode 100644 index 42c083d6f3..0000000000 --- a/scripts/binauralRenderer_interface/HRIRs_sofa/HRIR_128_Meth5_IRC_51_Q10_symL_Itrp1_48000.sofa +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2c368121ebd83ed0712cd1963ab44f130d1e02a14f5191bf2d403f71b7eadc0f -size 15911554 -- GitLab From 4aec7c559d7aab496a167f9fd92b6d9e97545078 Mon Sep 17 00:00:00 2001 From: Erik Norvell Date: Fri, 14 Jun 2024 10:16:03 +0200 Subject: [PATCH 4/4] Restore sofa file --- .../HRIRs_sofa/HRIR_128_Meth5_IRC_51_Q10_symL_Itrp1_48000.sofa | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 scripts/binauralRenderer_interface/HRIRs_sofa/HRIR_128_Meth5_IRC_51_Q10_symL_Itrp1_48000.sofa diff --git a/scripts/binauralRenderer_interface/HRIRs_sofa/HRIR_128_Meth5_IRC_51_Q10_symL_Itrp1_48000.sofa b/scripts/binauralRenderer_interface/HRIRs_sofa/HRIR_128_Meth5_IRC_51_Q10_symL_Itrp1_48000.sofa new file mode 100644 index 0000000000..e818470a52 --- /dev/null +++ b/scripts/binauralRenderer_interface/HRIRs_sofa/HRIR_128_Meth5_IRC_51_Q10_symL_Itrp1_48000.sofa @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e6ecaaa25464342567a19dc04a563127d89055e49c2bd177a22c9e19397a2bba +size 15915864 -- GitLab