Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions scripts/conformance.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def CompareNPY(ref, ref_icc, dec, dec_icc, frame_idx, rmse_limit, peak_error, la
return Failure(f'Expected shape {ref.shape} but found {dec.shape}')
num_channels = ref_frame.shape[2]

if ref_icc != dec_icc && peak_error > 0:
if ref_icc != dec_icc and peak_error > 0:
# Transform colors before comparison.
# Skip this if we expect fully lossless, since it introduces tiny errors
# (even in the case where ref_icc and dec_icc are equivalent so it's a no-op)
Expand Down Expand Up @@ -239,11 +239,16 @@ def ConformanceTestRunner(args):
reference_npy = numpy.load(reference_npy)
decoded_npy = numpy.load(decoded_npy)

test_dump["num_frames"] = len(descriptor['frames'])
for i, fd in enumerate(descriptor['frames']):
test_dump[f"frame{i}_compare_npy"] = CompareNPY(reference_npy, reference_icc, decoded_npy,
decoded_icc if try_color_transform else reference_icc,
i, fd['rms_error'], fd['peak_error'], args.lax)
test_dump["num_frames"] = num_frames = max(len(descriptor['frames']), decoded_npy.shape[0])
for i in range(num_frames):
try:
fd = descriptor['frames'][i]
except IndexError:
test_dump[f"frame{i}_compare_npy"] = Failure("extraneous decoded frame")
else:
test_dump[f"frame{i}_compare_npy"] = CompareNPY(reference_npy, reference_icc, decoded_npy,
decoded_icc if try_color_transform else reference_icc,
i, fd['rms_error'], fd['peak_error'], args.lax)

if 'preview' in descriptor:
reference_npy = os.path.join(test_dir,
Expand Down