Exit before reaching some Nonfatal errors

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 445 matching lines @@
                 break;
             default:
                 break;
         }
     }
 
     ImageGenSrc* src = new ImageGenSrc(path, mode, alphaType, isGpu);
     push_src("image", folder, src);
 }
 
-static void push_codec_srcs(Path path) {
-    SkAutoTUnref<SkData> encoded(SkData::NewFromFileName(path.c_str()));
-    if (!encoded) {
-        info("Couldn't read %s.", path.c_str());
-        return;
-    }
-    SkAutoTDelete<SkCodec> codec(SkCodec::NewFromData(encoded));
-    if (nullptr == codec.get()) {
-        info("Couldn't create codec for %s.", path.c_str());
-        return;
-    }
-
+static void push_codec_srcs(Path path, SkCodec* codec) {
     // native scaling is only supported by WEBP and JPEG
     bool supportsNativeScaling = false;
 
     SkTArray<CodecSrc::Mode> nativeModes;
     nativeModes.push_back(CodecSrc::kCodec_Mode);
     nativeModes.push_back(CodecSrc::kCodecZeroInit_Mode);
     switch (codec->getEncodedFormat()) {
         case SkEncodedFormat::kJPEG_SkEncodedFormat:
             nativeModes.push_back(CodecSrc::kScanline_Mode);
             nativeModes.push_back(CodecSrc::kStripe_Mode);
@@ skipping 146 matching lines @@
     }
 
     if (1 != sampleSize) {
         folder.appendf("_%.3f", 1.0f / (float) sampleSize);
     }
 
     BRDSrc* src = new BRDSrc(path, mode, dstColorType, sampleSize);
     push_src("image", folder, src);
 }
 
-static void push_brd_srcs(Path path) {
+static void push_brd_srcs(Path path, SkCodec* codec) {
     // Only run Index8 and grayscale to one sampleSize and Mode. Though interesting
     // to test these color types, they should not reveal anything across various
     // sampleSizes and Modes
     for (auto type : { CodecSrc::kIndex8_Always_DstColorType,
                        CodecSrc::kGrayscale_Always_DstColorType }) {
         // Arbitrarily choose Mode and sampleSize.
         push_brd_src(path, type, BRDSrc::kFullImage_Mode, 2);
     }
 
 
     // Test on a variety of sampleSizes, making sure to include:
     // - 2, 4, and 8, which are natively supported by jpeg
     // - multiples of 2 which are not divisible by 4 (analogous for 4)
     // - larger powers of two, since BRD clients generally use powers of 2
     // We will only produce output for the larger sizes on large images.
     const uint32_t sampleSizes[] = { 1, 2, 3, 4, 5, 6, 7, 8, 12, 16, 24, 32, 64 };
 
     const BRDSrc::Mode modes[] = {
             BRDSrc::kFullImage_Mode,
             BRDSrc::kDivisor_Mode,
     };
 
+    const int width = codec->getInfo().width();
+    const int height = codec->getInfo().height();
     for (uint32_t sampleSize : sampleSizes) {
+        if ((width / sampleSize <= 10 || height / sampleSize <= 10) && 1 != sampleSize) {
+            // Scaling very small images is uninteresting. After the first iteration,
+            // the image will only get smaller, so break here.
+            break;
+        }
         for (BRDSrc::Mode mode : modes) {
             push_brd_src(path, CodecSrc::kGetFromCanvas_DstColorType, mode, sampleSize);
         }
     }
 }
 
 static bool brd_supported(const char* ext) {
     static const char* const exts[] = {
         "jpg", "jpeg", "png", "webp",
         "JPG", "JPEG", "PNG", "WEBP",
@@ skipping 22 matching lines @@
             push_src("skp", "", new SKPSrc(path));
         }
     }
 
     SkTArray<SkString> images;
     if (!CollectImages(FLAGS_images, &images)) {
         return false;
     }
 
     for (auto image : images) {
-        push_codec_srcs(image);
+        SkAutoTUnref<SkData> encoded(SkData::NewFromFileName(image.c_str()));
+        if (!encoded) {
+            info("Couldn't read %s.", image.c_str());
+            continue;
+        }
+        SkAutoTDelete<SkCodec> codec(SkCodec::NewFromData(encoded));
+        if (nullptr == codec.get()) {
+            info("Couldn't create codec for %s.", image.c_str());
+            continue;
+        }
+
+        push_codec_srcs(image, codec);
         if (FLAGS_simpleCodec) {
             continue;
         }
 
         const char* ext = strrchr(image.c_str(), '.');
         if (ext && brd_supported(ext+1)) {
-            push_brd_srcs(image);
+            push_brd_srcs(image, codec);
         }
     }
 
     SkTArray<SkString> colorImages;
     if (!CollectImages(FLAGS_colorImages, &colorImages)) {
         return false;
     }
 
     for (auto colorImage : colorImages) {
         ColorCodecSrc* src = new ColorCodecSrc(colorImage, ColorCodecSrc::kBaseline_Mode);
@@ skipping 645 matching lines @@
 #endif
 }
 } // namespace skiatest
 
 #if !defined(SK_BUILD_FOR_IOS)
 int main(int argc, char** argv) {
     SkCommandLineFlags::Parse(argc, argv);
     return dm_main();
 }
 #endif