diff --git a/scripts/ivas_conformance/ivas_be_conf_test_gen.sh b/scripts/ivas_conformance/ivas_be_conf_test_gen.sh index aa80ed533dc52ebc4058313f293f4d6c86407a44..b41e3ab7247d0ca84cf1bd536b9cb1cabe90b01f 100644 --- a/scripts/ivas_conformance/ivas_be_conf_test_gen.sh +++ b/scripts/ivas_conformance/ivas_be_conf_test_gen.sh @@ -31,7 +31,6 @@ cp -r tests/split_rendering/error_patterns testvec/testv/split_rendering/error_p python3 scripts/cleanup_26252.py -cp -r tests/conformance-test testvec/ cp Readme_IVAS_dec.txt testvec cp Readme_IVAS_enc.txt testvec cp Readme_IVAS_rend.txt testvec diff --git a/scripts/ivas_conformance/runConformance.py b/scripts/ivas_conformance/runConformance.py index 4723b7a918e6119fe8e267b812a66764aea7064d..44fbd8547c2b029b6f8d75a96f2846c52317853a 100644 --- a/scripts/ivas_conformance/runConformance.py +++ b/scripts/ivas_conformance/runConformance.py @@ -910,7 +910,7 @@ class MLDConformance: else: print(f"<{tag}> PASSED BE TEST") - def computeCorridor(self, mldRefWithTags, mldCutWithTags, tag, threshold=1.0): + def computeCorridor(self, mldRefWithTags, mldCutWithTags, tag, threshold=0.0): mldDict = dict[str, list]() failed = False @@ -921,11 +921,30 @@ class MLDConformance: ) refMLD = mldRefWithTags["MLD"][indRef] dutMLD = mldCutWithTags["MLD"][indDut] + diff = dutMLD - refMLD + if diff.max() > threshold: print( f"\033[91mMLD Corridor failed for {tag} with max MLD diff of {diff.max()} \033[00m" ) + maxMLD = np.maximum(dutMLD, refMLD) + mldWithTags = np.column_stack( + ( + maxMLD, + intersection, + ) + ) + new_mld_dir = os.path.join( + self.testvDir, "mld_ref2") + if not os.path.exists(new_mld_dir): + os.makedirs(new_mld_dir, exist_ok=True) + + refMldFile2 = os.path.join( + self.testvDir, "mld_ref2", ReferenceMldFiles[tag] + ) + with open(refMldFile2, "w") as f: + np.savetxt(f, mldWithTags, fmt="%s", delimiter=",") else: print( f"\033[92mMLD Corridor passed for {tag} with max MLD diff of {diff.max()} \033[00m" @@ -989,7 +1008,7 @@ class MLDConformance: mldRefWithTags = np.loadtxt( refMldFile, delimiter=",", - dtype=[("MLD", "f8"), ("pyTestTag", "