Provides multiple implementations of Android's SkBitmapRegionDecoder

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 264 matching lines @@
         push_src("image", "stripe", new CodecSrc(path, CodecSrc::kStripe_Mode,
                 CodecSrc::kGetFromCanvas_DstColorType, scale));
         // Note: The only codec which supports subsets natively is SkWebpCodec, which will never
         // report kIndex_8 or kGray_8, so there is no need to test kSubset_mode with those color
         // types specifically requested.
         push_src("image", "codec_subset", new CodecSrc(path, CodecSrc::kSubset_Mode,
                 CodecSrc::kGetFromCanvas_DstColorType, scale));
     }
 }
 
+static void push_brd_srcs(Path path) {
+    // Choose sample sizes to test.
+    const uint32_t sampleSizes[] = { 1, 2, 3, 4, 5, 6, 7, 8 };
+
+    for (uint32_t sampleSize : sampleSizes) {
+        // Directly specify the color types that we want to test on.  We will
+        // only test on the 8888 backend to avoid duplication of tests.
+
+        // Canvas Strategy supports N32 and 565
+        push_src("image", "brd_canvas_kN32", new BRDSrc(path,

[scroggo, 2015/09/01 22:05:28]

I think this can be cleaned up to behave similarly to your other DM change.

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

Yes it can!  Done.

+                SkBitmapRegionDecoder::kCanvas_Strategy, BRDSrc::kFullImage_Mode,
+                kN32_SkColorType, sampleSize));
+        push_src("image", "brd_canvas_subset_kN32", new BRDSrc(path,
+                SkBitmapRegionDecoder::kCanvas_Strategy, BRDSrc::kDivisor_Mode,
+                kN32_SkColorType, sampleSize));
+        push_src("image", "brd_canvas_k565", new BRDSrc(path,
+                SkBitmapRegionDecoder::kCanvas_Strategy, BRDSrc::kFullImage_Mode,
+                kRGB_565_SkColorType, sampleSize));
+        push_src("image", "brd_canvas_subset_k565", new BRDSrc(path,
+                SkBitmapRegionDecoder::kCanvas_Strategy, BRDSrc::kDivisor_Mode,
+                kRGB_565_SkColorType, sampleSize));
+
+        // Sample Strategy supports N32, 565, Alpha8, and Index8
+        push_src("image", "brd_sample_kN32", new BRDSrc(path,
+                SkBitmapRegionDecoder::kOriginal_Strategy, BRDSrc::kFullImage_Mode,
+                kN32_SkColorType, sampleSize));
+        push_src("image", "brd_sample_subset_kN32", new BRDSrc(path,
+                SkBitmapRegionDecoder::kOriginal_Strategy, BRDSrc::kDivisor_Mode,
+                kN32_SkColorType, sampleSize));
+        push_src("image", "brd_sample_k565", new BRDSrc(path,
+                SkBitmapRegionDecoder::kOriginal_Strategy, BRDSrc::kFullImage_Mode,
+                kRGB_565_SkColorType, sampleSize));
+        push_src("image", "brd_sample_subset_k565", new BRDSrc(path,
+                SkBitmapRegionDecoder::kOriginal_Strategy, BRDSrc::kDivisor_Mode,
+                kRGB_565_SkColorType, sampleSize));
+        push_src("image", "brd_sample_kAlpha", new BRDSrc(path,
+                SkBitmapRegionDecoder::kOriginal_Strategy, BRDSrc::kFullImage_Mode,
+                kAlpha_8_SkColorType, sampleSize));
+        push_src("image", "brd_sample_subset_kAlpha", new BRDSrc(path,
+                SkBitmapRegionDecoder::kOriginal_Strategy, BRDSrc::kDivisor_Mode,
+                kAlpha_8_SkColorType, sampleSize));
+        push_src("image", "brd_sample_kIndex", new BRDSrc(path,
+                SkBitmapRegionDecoder::kOriginal_Strategy, BRDSrc::kFullImage_Mode,
+                kIndex_8_SkColorType, sampleSize));
+        push_src("image", "brd_sample_subset_kIndex", new BRDSrc(path,
+                SkBitmapRegionDecoder::kOriginal_Strategy, BRDSrc::kDivisor_Mode,
+                kIndex_8_SkColorType, sampleSize));
+    }
+
+}
+
 static bool codec_supported(const char* ext) {

[scroggo, 2015/09/01 22:05:28]

I was glancing at this earlier - do we still need this? Doesn't this cover all
the types? You could repurpose it to be used for BRD, where I think we should
only support PNG, JPG and WEBP.

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

You are correct that it's no longer needed.  I will repurpose it.

     // 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",
     };
 
     for (uint32_t i = 0; i < SK_ARRAY_COUNT(exts); i++) {
         if (0 == strcmp(exts[i], ext)) {
             return true;
@@ skipping 26 matching lines @@
         if (sk_isdir(flag)) {
             for (size_t j = 0; j < SK_ARRAY_COUNT(exts); j++) {
                 SkOSFile::Iter it(flag, exts[j]);
                 for (SkString file; it.next(&file); ) {
                     SkString path = SkOSPath::Join(flag, file.c_str());
                     push_src("image", "decode", new ImageSrc(path)); // Decode entire image
                     push_src("image", "subset", new ImageSrc(path, 2)); // Decode into 2x2 subsets
                     if (codec_supported(exts[j])) {
                         push_codec_srcs(path);
                     }
+                    push_brd_srcs(path);
                 }
             }
         } else if (sk_exists(flag)) {
             // assume that FLAGS_images[i] is a valid image if it is a file.
             push_src("image", "decode", new ImageSrc(flag)); // Decode entire image.
             push_src("image", "subset", new ImageSrc(flag, 2)); // Decode into 2 x 2 subsets
             push_codec_srcs(flag);
+            push_brd_srcs(flag);
         }
     }
 }
 
 static GrGLStandard get_gpu_api() {
     if (FLAGS_gpuAPI.contains("gl"))   { return kGL_GrGLStandard; }
     if (FLAGS_gpuAPI.contains("gles")) { return kGLES_GrGLStandard; }
     return kNone_GrGLStandard;
 }
 
@@ skipping 564 matching lines @@
     }
     return 0;
 }
 
 #if !defined(SK_BUILD_FOR_IOS)
 int main(int argc, char** argv) {
     SkCommandLineFlags::Parse(argc, argv);
     return dm_main();
 }
 #endif