Make SkAndroidCodec support gif

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 212 matching lines @@
 static void push_codec_src(Path path, CodecSrc::Mode mode, CodecSrc::DstColorType dstColorType,
         float scale) {
     SkString folder;
     switch (mode) {
         case CodecSrc::kCodec_Mode:
             folder.append("codec");
             break;
         case CodecSrc::kScanline_Mode:
             folder.append("scanline");
             break;
-        case CodecSrc::kScanline_Subset_Mode:

[msarett, 2015/11/16 23:20:58]

I'm kind of on the fence about deleting this test.  SkAndroidCodec and BRD have
similar tests.  And it was breaking for gifs...now that I've redesigned, I'm
realizing that I probably could get it to pass for gifs if we want to keep the
test.

[scroggo, 2015/11/17 14:56:26]

It sounds like we have a bug that isn't being caught by other tests?

[msarett, 2015/11/17 18:00:50]

Well, the bug is that we don't decode subsets properly for framed gifs.  And I
think we intentionally don't bother to do this.

SkAndroidCodec and BRD subset tests also would catch this, but we don't run
those tests on gifs.

I think there are three options:
(1) Delete the test.
(2) Disable the test for gifs (and might as well for bmps and wbmps as well).
(3) Fix SkSwizzler to support subsets on framed gifs.

[scroggo, 2015/11/17 18:18:25]

Ah, of course. Yes, I think it makes sense to just delete the test.

-            folder.append("scanline_subset");
-            break;
         case CodecSrc::kStripe_Mode:
             folder.append("stripe");
             break;
         case CodecSrc::kSubset_Mode:
             folder.append("codec_subset");
             break;
     }
 
     switch (dstColorType) {
         case CodecSrc::kGrayscale_Always_DstColorType:
@@ skipping 57 matching lines @@
         return;
     }
 
     // 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
     const float nativeScales[] = { 0.125f, 0.25f, 0.375f, 0.5f, 0.625f, 0.750f, 0.875f, 1.0f };
 
     const CodecSrc::Mode nativeModes[] = { CodecSrc::kCodec_Mode, CodecSrc::kScanline_Mode,
-            CodecSrc::kScanline_Subset_Mode, CodecSrc::kStripe_Mode, CodecSrc::kSubset_Mode };
+            CodecSrc::kStripe_Mode, CodecSrc::kSubset_Mode };
 
     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 https://bug.skia.org/3683 .
             // This causes us to try to convert grayscale jpegs to kIndex8.  We currently
             // fail non-fatally in this case.
             colorTypes[0] = CodecSrc::kGetFromCanvas_DstColorType;
@@ skipping 32 matching lines @@
         if (path.endsWith(ext)) {
             subset = true;
             break;
         }
     }
 
     bool full = false;
     // The following image types are only supported by BitmapFactory,
     // so we only need to test full image decodes.
     static const char* fullExts[] = {
-        "wbmp", "bmp",
-        "WBMP", "BMP",
+        "wbmp", "bmp", "gif",
+        "WBMP", "BMP", "GIF",
     };
     for (const char* ext : fullExts) {
         if (path.endsWith(ext)) {
             full = true;
             break;
         }
     }
 
     if (!full && !subset) {
         return;
@@ skipping 768 matching lines @@
     #endif  // SK_PDF_IMAGE_STATS
     return 0;
 }
 
 #if !defined(SK_BUILD_FOR_IOS)
 int main(int argc, char** argv) {
     SkCommandLineFlags::Parse(argc, argv);
     return dm_main();
 }
 #endif