]> git.cworth.org Git - apitrace/blobdiff - scripts/snapdiff.py
Use just PIL on snapdiff, instead of relying on ImageMagick.
[apitrace] / scripts / snapdiff.py
index 4eb60a09561ff6d98dfec4cf0a6e547b254e3663..0e40419167efdff0b250b4c1ca14fcaf18b5f675 100755 (executable)
@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 ##########################################################################
 #
+# Copyright 2011 Jose Fonseca
 # Copyright 2008-2009 VMware, Inc.
 # All Rights Reserved.
 #
 
 import sys
 import os.path
-import subprocess
 import optparse
+import math
+import operator
 
 import Image
+import ImageChops
+import ImageEnhance
 
 
 thumb_size = 320, 320
 
 
-def compare(im, ref):
-    import ImageMath
-    # See http://www.pythonware.com/library/pil/handbook/imagemath.htm
-    mask = ImageMath.eval("min(abs(a - b), 1)", a=im, b=ref)
-    gray = ref.convert('L')
-    # TODO
+def _compare(ref_image, src_image, delta_image):
+    import subprocess
+    p = subprocess.Popen([
+        'compare', 
+        '-metric', 'AE', 
+        '-fuzz', '%u%%' % options.fuzz, 
+        '-dissimilarity-threshold', '1',
+        ref_image, src_image, delta_image
+    ], stderr=subprocess.PIPE)
+    _, stderr = p.communicate()
+    try:
+        return int(stderr)
+    except ValueError:
+        return 0xffffffff
+
+
+def compare(ref_image, src_image, delta_image):
+    ref_im = Image.open(ref_image)
+    src_im = Image.open(src_image)
+
+    ref_im = ref_im.convert('RGB')
+    src_im = src_im.convert('RGB')
+
+    diff = ImageChops.difference(src_im, ref_im)
+
+    mask = ImageEnhance.Brightness(diff).enhance(100.0/options.fuzz)
+    mask = mask.convert('L')
+
+    lowlight = Image.new('RGB', src_im.size, (0xff, 0xff, 0xff))
+    highlight = Image.new('RGB', src_im.size, (0xf1, 0x00, 0x1e))
+    delta_im = Image.composite(highlight, lowlight, mask)
+
+    delta_im = Image.blend(src_im, delta_im, 0xcc/255.0)
+    delta_im.save(delta_image)
+
+    # See also http://effbot.org/zone/pil-comparing-images.htm
+    # TODO: this is approximate due to the grayscale conversion
+    h = diff.convert('L').histogram()
+    ae = sum(h[255 * options.fuzz // 100 + 1 : 256])
+    return ae
 
 
 def surface(html, image):
-    if False:
-        html.write('        <td><a href="%s"><img src="%s"/></a></td>\n' % (image, image))
-    else:
+    if True:
         name, ext = os.path.splitext(image)
-        thumb = name + '_thumb' + ext
-        if not os.path.exists(thumb) and os.path.exists(image):
+        thumb = name + '.thumb' + ext
+        if os.path.exists(image) \
+           and (not os.path.exists(thumb) \
+                or os.path.getmtime(thumb) < os.path.getmtime(image)):
             im = Image.open(image)
             im.thumbnail(thumb_size)
             im.save(thumb)
-        html.write('        <td><a href="%s"><img src="%s"/></a></td>\n' % (image, thumb))
+    else:
+        thumb = image
+    html.write('        <td><a href="%s"><img src="%s"/></a></td>\n' % (image, thumb))
+
+
+def is_image(path):
+    return \
+        path.endswith('.png') \
+        and not path.endswith('.diff.png') \
+        and not path.endswith('.thumb.png')
+
+
+def find_images(prefix):
+    prefix = os.path.abspath(prefix)
+    if os.path.isdir(prefix):
+        prefix_dir = prefix
+    else:
+        prefix_dir = os.path.dirname(prefix)
+
+    images = []
+    for dirname, dirnames, filenames in os.walk(prefix_dir, followlinks=True):
+        for filename in filenames:
+            filepath = os.path.join(dirname, filename)
+            if filepath.startswith(prefix) and is_image(filepath):
+                images.append(filepath[len(prefix):])
+
+    return images
 
 
 def main():
+    global options
+
     optparser = optparse.OptionParser(
-        usage="\n\t%prog [options] [file] ...",
+        usage="\n\t%prog [options] <ref_prefix> <src_prefix>",
         version="%%prog")
     optparser.add_option(
         '-o', '--output', metavar='FILE',
-        type="string", dest="output",
-        help="output filename [stdout]")
-    optparser.add_option(
-        '--start', metavar='FRAME',
-        type="int", dest="start", default=1,
-        help="start frame [default: %default]")
-    optparser.add_option(
-        '--stop', metavar='FRAME',
-        type="int", dest="stop", default=9999,
-        help="stop frame [default: %default]")
+        type="string", dest="output", default='index.html',
+        help="output filename [default: %default]")
     optparser.add_option(
         '-f', '--fuzz',
-        type="string", dest="fuzz", default='5%',
-        help="fuzz [default: %default]")
+        type="int", dest="fuzz", default=5,
+        help="fuzz percentage [default: %default]")
+    optparser.add_option(
+        '--overwrite',
+        action="store_true", dest="overwrite", default=False,
+        help="overwrite")
 
     (options, args) = optparser.parse_args(sys.argv[1:])
 
     if len(args) != 2:
         optparser.error('incorrect number of arguments')
 
-    ref_prefix = sys.argv[1]
-    src_prefix = sys.argv[2]
+    ref_prefix = args[0]
+    src_prefix = args[1]
+
+    ref_images = find_images(ref_prefix)
+    src_images = find_images(src_prefix)
+    images = list(set(ref_images).intersection(set(src_images)))
+    images.sort()
 
     if options.output:
         html = open(options.output, 'wt')
@@ -93,14 +160,20 @@ def main():
     html.write('<html>\n')
     html.write('  <body>\n')
     html.write('    <table border="1">\n')
-    html.write('      <tr><th><th>ref</th><th>src</th><th>&Delta;</th></tr>\n')
-    for frame_no in range(options.start, options.stop + 1):
-        ref_image = "%s%04u.png" % (ref_prefix, frame_no)
-        src_image = "%s%04u.png" % (src_prefix, frame_no)
-        delta_image = "%s%04u_diff.png" % (src_prefix, frame_no)
+    html.write('      <tr><th>%s</th><th>%s</th><th>&Delta;</th></tr>\n' % (ref_prefix, src_prefix))
+    for image in images:
+        ref_image = ref_prefix + image
+        src_image = src_prefix + image
+        root, ext = os.path.splitext(src_image)
+        delta_image = "%s.diff.png" % (root, )
         if os.path.exists(ref_image) and os.path.exists(src_image):
+            if options.overwrite \
+               or not os.path.exists(delta_image) \
+               or (os.path.getmtime(delta_image) < os.path.getmtime(ref_image) \
+                   and os.path.getmtime(delta_image) < os.path.getmtime(src_image)):
+                compare(ref_image, src_image, delta_image)
+
             html.write('      <tr>\n')
-            subprocess.call(["compare", '-metric', 'AE', '-fuzz', options.fuzz, ref_image, src_image, delta_image])
             surface(html, ref_image)
             surface(html, src_image)
             surface(html, delta_image)