Use NPY for testing jxl-oxide

libjxl · Jul 31, 2023 · 1d47eeb · 1d47eeb
1 parent c11230a
commit 1d47eeb
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 2 deletions.
diff --git a/docs/dumps/dump_jxl-dec.json b/docs/dumps/dump_jxl-dec.json
diff --git a/scripts/update_dumps.sh b/scripts/update_dumps.sh
@@ -13,7 +13,7 @@ python3 ./third_party/conformance/scripts/conformance.py --decoder "./third_part
 # djxl via png
 python3 ./third_party/conformance/scripts/conformance.py --decoder "python3 scripts/wrap_png.py --decoder './third_party/libjxl/build/tools/djxl %s %s --bits_per_sample 16'" --corpus $CORPUS --results=$DUMP_PATH/dump_djxl_via_png.json --lax
 # jxl-oxide
-python3 ./third_party/conformance/scripts/conformance.py --decoder "python3 scripts/wrap_png.py --decoder '/home/jon/.cargo/bin/jxl-dec %s -o %s -f png16'" --corpus $CORPUS --results=$DUMP_PATH/dump_jxl-dec.json --lax
+python3 ./third_party/conformance/scripts/conformance.py --decoder "python3 scripts/wrap_jxl_oxide.py --decoder 'jxl-dec %s --icc-output %s -o %s -f npy'" --corpus $CORPUS --results=$DUMP_PATH/dump_jxl-dec.json --lax
 # jxlatte
 python3 ./third_party/conformance/scripts/conformance.py --decoder "python3 scripts/wrap_png.py --decoder 'java -jar ./third_party/jxlatte/build/java/jxlatte.jar %s %s --png-depth=16'" --corpus $CORPUS --results=$DUMP_PATH/dump_jxlatte.json --lax
 # j40

diff --git a/scripts/wrap_jxl_oxide.py b/scripts/wrap_jxl_oxide.py
@@ -0,0 +1,61 @@
+#!/usr/bin/env python3
+import sys
+import subprocess
+import argparse
+import shlex
+import json
+import os
+
+def write_metadata(args):
+    with open(args.metadata_out, 'w') as f:
+        json.dump({"frames": [ { "name": "", } ], }, f)
+
+# Skip for now
+def write_orig_icc(args):
+    return
+
+
+def write_reconstruct_jpg(args):
+    with open(args.output, 'w') as f:
+        pass
+
+def main():
+    parser = argparse.ArgumentParser(description=__doc__)
+    parser.add_argument('input',
+                        metavar='INPUT',
+                        help='path to the input .jxl file')
+    parser.add_argument('output',
+                        metavar='OUTPUT',
+                        help='path to the output .npy file')
+    parser.add_argument('--decoder_format',
+                        metavar='DECODER',
+                        required=True,
+                        help='path to the decoder binary assuming that the three %s syntax')
+    parser.add_argument('--orig_icc_out',
+                        metavar='ORIG_ICC_OUT',
+                        help='path to the original ICC output')
+    parser.add_argument('--metadata_out',
+                        metavar='METADATA_OUT',
+                        help='path to the metadata output')
+    parser.add_argument('--icc_out',
+                        metavar='ICC_OUT',
+                        help='path to the ICC output')
+    parser.add_argument('--norender_spotcolors',
+                        action='store_true',
+                        help='flag to disable rendering of spot colors')
+    parser.add_argument('--output_flag',
+                        metavar='OUTPUT_FLAG',
+                        help='the name of hte flag used by the decoder to communicate the output file')
+
+    args = parser.parse_args()
+
+    if args.output.endswith('.jpg'):
+        write_reconstruct_jpg(args)
+        return
+
+    subprocess.run(shlex.split(args.decoder_format % (args.input, args.icc_out, args.output)), check=True)
+    write_metadata(args)
+    write_orig_icc(args)
+
+if __name__ == "__main__":
+    main()