add yee's perceptual metric

experimental/skpdiff/main.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #define __NO_STD_VECTOR // Uses cl::vectpr instead of std::vectpr
 #define __NO_STD_STRING // Uses cl::STRING_CLASS instead of std::string
 #include <CL/cl.hpp>
 
 #include "SkCommandLineFlags.h"
 #include "SkGraphics.h"
 #include "SkOSFile.h"
 #include "SkString.h"
 #include "SkTArray.h"
 #include "SkTDArray.h"
 
 #include "SkImageDiffer.h"
 #include "SkCLImageDiffer.h"
+#include "SkPMetric.h"
 #include "skpdiff_util.h"
 
 #include "SkForceLinking.h"
 __SK_FORCE_IMAGE_DECODER_LINKING;
 
 // Command line argument definitions go here
 DEFINE_bool2(list, l, false, "List out available differs");
 DEFINE_string2(differs, d, "", "The names of the differs to use or all of them by default");
 DEFINE_string2(folders, f, "", "Compare two folders with identical subfile names: <baseline folder> <test folder>");
 DEFINE_string2(patterns, p, "", "Use two patterns to compare images: <baseline> <test>");
@@ skipping 69 matching lines @@
             SkDebugf("Baseline file \"%s\" has no corresponding test file\n", baselineFile.c_str());
         }
     }
 }
 
 
 /// Compares two sets of images identified by glob style patterns with the given differ
 static void diff_patterns(const char baselinePattern[], const char testPattern[], SkImageDiffer* differ) {
     // Get the files in the baseline and test patterns. Because they are in sorted order, it's easy
     // to find corresponding images by matching entry indices.
-    //
+
     SkTArray<SkString> baselineEntries;
     if (!glob_files(baselinePattern, &baselineEntries)) {
         SkDebugf("Unable to get pattern \"%s\"\n", baselinePattern);
         return;
     }
 
     SkTArray<SkString> testEntries;
     if (!glob_files(testPattern, &testEntries)) {
         SkDebugf("Unable to get pattern \"%s\"\n", testPattern);
         return;
@@ skipping 12 matching lines @@
 
         int diffID = differ->queueDiffOfFile(baselineFilename, testFilename);
         if (diffID >= 0) {
             queuedDiffIDs.push(diffID);
             SkDebugf("Result: %f\n", differ->getResult(diffID));
         }
     }
 }
 
 
-static bool init_cl_diff(SkImageDiffer* differ)
-{
+static bool init_cl_diff(SkImageDiffer* differ) {
     // Setup OpenCL
     cl::Device device;
     cl::Context context;
     if (!init_device_and_context(&device, &context)) {
         return false;
     }
 
     // Setup our differ of choice
     SkCLImageDiffer* clDiffer = (SkCLImageDiffer*)differ;
     return clDiffer->init(device(), context());
 }
 
+static bool init_dummy(SkImageDiffer* differ) {
+    return true;
+}
+
+
 // TODO Find a better home for the diff registry. One possibility is to have the differs self
 // register.
 
 // List here every differ
 SkDifferentPixelsImageDiffer gDiffPixel;
+SkPMetric gPDiff;
 
-/// A null terminated array of pointer to every differ declared above
-SkImageDiffer* gDiffers[] = { &gDiffPixel, NULL };
+// A null terminated array of pointer to every differ declared above
+SkImageDiffer* gDiffers[] = { &gDiffPixel, &gPDiff, NULL };
 
-/// A parallel array of functions to initialize the above differs
-bool (*gDiffInits[])(SkImageDiffer*) = { init_cl_diff, NULL };
+// A parallel array of functions to initialize the above differs. The reason we don't initialize
+// everything immediately is that certain differs may require special initialization, but we still
+// want to construct all of them globally so they can be queried for things like their name and
+// description.
+bool (*gDiffInits[])(SkImageDiffer*) = { init_cl_diff, init_dummy, NULL };
 
 
 int main(int argc, char** argv) {
     // Setup command line parsing
     SkCommandLineFlags::SetUsage("Compare images using various metrics.");
     SkCommandLineFlags::Parse(argc, argv);
 
     // Needed by various Skia components
     SkAutoGraphics ag;
 
@@ skipping 41 matching lines @@
             SkDebugf("Patterns flag expects two arguments: <baseline pattern> <test pattern>\n");
             return 1;
         }
     }
 
     // TODO Move the differ loop to after the bitmaps are decoded and/or uploaded to the OpenCL
     // device. Those are often the slowest processes and should not be done more than once if it can
     // be helped.
 
     // Perform each requested diff
-    for (int differIndex = 0; differIndex < chosenDiffers.count(); differIndex++) {
+    for (int chosenDifferIndex = 0; chosenDifferIndex < chosenDiffers.count(); chosenDifferIndex++) {
+        int differIndex = chosenDiffers[chosenDifferIndex];
+
         // Get the chosen differ and say which one they chose
         SkImageDiffer * differ = gDiffers[differIndex];
-        SkDebugf("Using differ \"%s\"\n", differ->getName());
+        SkDebugf("Using metric \"%s\"\n", differ->getName());
 
         // Initialize the differ using the global list of init functions that match the list of
         // differs
         gDiffInits[differIndex](differ);
 
         // Perform a folder diff if one is requested
         if (!FLAGS_folders.isEmpty()) {
             diff_directories(FLAGS_folders[0], FLAGS_folders[1], differ);
         }
 
         // Perform a pattern diff if one is requested
         if (!FLAGS_patterns.isEmpty()) {
             diff_patterns(FLAGS_patterns[0], FLAGS_patterns[1], differ);
         }
     }
 
     return 0;
 }