Remove unwanted images in Gold

dm/DM.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.
  */
 
 #include "CrashHandler.h"
 #include "DMJsonWriter.h"
 #include "DMSrcSink.h"
@@ skipping 242 matching lines @@
     if (!encoded) {
         SkDebugf("Couldn't read %s.", path.c_str());
         return;
     }
     SkAutoTDelete<SkCodec> codec(SkCodec::NewFromData(encoded));
     if (nullptr == codec.get()) {
         SkDebugf("Couldn't create codec for %s.", path.c_str());
         return;
     }
 
-    // Choose scales for scaling tests.
+    // Native Scales
     // TODO (msarett): Implement scaling tests for SkImageDecoder in order to compare with these
     //                 tests.  SkImageDecoder supports downscales by integer factors.
     // SkJpegCodec natively supports scaling to: 0.125, 0.25, 0.375, 0.5, 0.625, 0.75, 0.875
-    // 0.1, 0.16, 0.2 etc allow us to test SkScaledCodec with sampleSize 10, 6, 5, etc
+    const float nativeScales[] = { 0.125f, 0.25f, 0.375f, 0.5f, 0.625f, 0.750f, 0.875f, 1.0f };
+
+    // SkScaledCodec Scales

[scroggo, 2015/09/02 15:54:16]

I think it would make more sense to move the SkScaledCodec scales (and modes)
down to where they are used.

[msarett, 2015/09/02 18:16:16]

Done.

+    // The native scales are included to make sure that SkScaledCodec defaults to the native
+    // scaling strategy when possible.
+    // 0.1, 0.16, 0.2 etc allow us to test SkScaledCodec with sampleSize 10, 6, 5, etc.
     // 0.4, 0.7 etc allow to test what happens when the client requests a scale that
-    // does not exactly match a sampleSize or native scaling capability
-    const float scales[] = { 0.1f, 0.125f, 0.166f, 0.2f, 0.25f, 0.333f, 0.375f, 0.4f, 0.5f, 0.6f,
-                             0.625f, 0.750f, 0.8f, 0.875f, 1.0f };
+    // does not exactly match a sampleSize or native scaling capability.
+    const float samplingScales[] = { 0.1f, 0.125f, 0.166f, 0.2f, 0.25f, 0.333f, 0.375f, 0.4f, 0.5f,
+            0.6f, 0.625f, 0.750f, 0.8f, 0.875f, 1.0f };
 
-    const CodecSrc::Mode modes[] = { CodecSrc::kCodec_Mode, CodecSrc::kScaledCodec_Mode,
-            CodecSrc::kScanline_Mode, CodecSrc::kScanline_Subset_Mode, CodecSrc::kStripe_Mode,
-            CodecSrc::kSubset_Mode };
+    const CodecSrc::Mode nativeModes[] = { CodecSrc::kCodec_Mode, CodecSrc::kScanline_Mode,
+            CodecSrc::kScanline_Subset_Mode, CodecSrc::kStripe_Mode, CodecSrc::kSubset_Mode };
 
-    const CodecSrc::DstColorType colorTypes[] = { CodecSrc::kGetFromCanvas_DstColorType,
-            CodecSrc::kGrayscale_Always_DstColorType, CodecSrc::kIndex8_Always_DstColorType };
+    const CodecSrc::Mode samplingModes[] = { CodecSrc::kScaledCodec_Mode };
 
-    for (float scale : scales) {
+    CodecSrc::DstColorType colorTypes[3];
+    uint32_t numColorTypes;
+    switch (codec->getInfo().colorType()) {
+        case kGray_8_SkColorType:
+            // FIXME: Is this a long term solution for testing wbmps decodes to kIndex8?
+            // Further discussion on this topic is at skbug.com/3683
+            colorTypes[0] = CodecSrc::kGetFromCanvas_DstColorType;
+            colorTypes[1] = CodecSrc::kGrayscale_Always_DstColorType;
+            colorTypes[2] = CodecSrc::kIndex8_Always_DstColorType;
+            numColorTypes = 3;
+            break;
+        case kIndex_8_SkColorType:
+            colorTypes[0] = CodecSrc::kGetFromCanvas_DstColorType;
+            colorTypes[1] = CodecSrc::kIndex8_Always_DstColorType;
+            numColorTypes = 2;
+            break;
+        default:
+            colorTypes[0] = CodecSrc::kGetFromCanvas_DstColorType;
+            numColorTypes = 1;
+            break;
+    }
+
+    for (float scale : nativeScales) {
         if (scale != 1.0f && (path.endsWith(".webp") || path.endsWith(".WEBP"))) {
             // FIXME: skbug.com/4038 Scaling webp seems to leave some pixels uninitialized/
             // compute their colors based on uninitialized values.
             continue;
         }
 
-        for (CodecSrc::Mode mode : modes) {
-            for (CodecSrc::DstColorType colorType : colorTypes) {
-                push_codec_src(path, mode, colorType, scale);
+        for (CodecSrc::Mode mode : nativeModes) {
+            for (uint32_t i = 0; i < numColorTypes; i++) {
+                push_codec_src(path, mode, colorTypes[i], scale);
             }
         }
     }
+
+    for (float scale : samplingScales) {
+        if (scale != 1.0f && (path.endsWith(".webp") || path.endsWith(".WEBP"))) {
+            // FIXME: skbug.com/4038 Scaling webp seems to leave some pixels uninitialized/
+            // compute their colors based on uninitialized values.
+            continue;
+        }
+
+        for (CodecSrc::Mode mode : samplingModes) {

[scroggo, 2015/09/02 15:54:16]

There is only one mode in samplingModes. Would it make more sense to remove this
loop? Or do you think we'll add more modes in the future?

[msarett, 2015/09/02 18:16:16]

I think we may want to add a mode when we add subsetting to SkScaledCodec.  But
I think it's better to not over-prepare.  We can add the loop back later if we
need it.

+            for (uint32_t i = 0; i < numColorTypes; i++) {
+                push_codec_src(path, mode, colorTypes[i], scale);
+            }
+        }
+    }
 }
 
 static bool codec_supported(const char* ext) {
     // FIXME: Once other versions of SkCodec are available, we can add them to this
     // list (and eventually we can remove this check once they are all supported).
     static const char* const exts[] = {
         "bmp", "gif", "jpg", "jpeg", "png", "ico", "wbmp", "webp",
         "BMP", "GIF", "JPG", "JPEG", "PNG", "ICO", "WBMP", "WEBP",
     };
 
@@ skipping 621 matching lines @@
     }
     return 0;
 }
 
 #if !defined(SK_BUILD_FOR_IOS)
 int main(int argc, char** argv) {
     SkCommandLineFlags::Parse(argc, argv);
     return dm_main();
 }
 #endif