Support more swizzles to 565 in SkCodec

tests/CodexTest.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "Resources.h"
 #include "SkBitmap.h"
 #include "SkCodec.h"
@@ skipping 60 matching lines @@
         rect.fBottom = rand->nextRangeU(0, h);
         rect.sort();
     } while (rect.isEmpty());
     return rect;
 }
 
 static void check(skiatest::Reporter* r,
                   const char path[],
                   SkISize size,
                   bool supportsScanlineDecoding,
-                  bool supportsSubsetDecoding) {
+                  bool supportsSubsetDecoding,
+                  bool supports565 = true) {
     SkAutoTDelete<SkStream> stream(resource(path));
     if (!stream) {
         SkDebugf("Missing resource '%s'\n", path);
         return;
     }
     SkAutoTDelete<SkCodec> codec(SkCodec::NewFromStream(stream.detach()));
     if (!codec) {
         ERRORF(r, "Unable to decode '%s'", path);
         return;
     }
 
     // This test is used primarily to verify rewinding works properly.  Using kN32 allows
     // us to test this without the added overhead of creating different bitmaps depending
     // on the color type (ex: building a color table for kIndex8).  DM is where we test
     // decodes to all possible destination color types.
     SkImageInfo info = codec->getInfo().makeColorType(kN32_SkColorType);
     REPORTER_ASSERT(r, info.dimensions() == size);
+
+    {
+        // Test decoding to 565
+        SkImageInfo info565 = info.makeColorType(kRGB_565_SkColorType);
+        SkCodec::Result expected = (supports565 && info.alphaType() == kOpaque_SkAlphaType) ?
+                SkCodec::kSuccess : SkCodec::kInvalidConversion;
+        test_info(r, codec, info565, expected, NULL);
+    }
+
     SkBitmap bm;
     bm.allocPixels(info);
     SkAutoLockPixels autoLockPixels(bm);
     SkCodec::Result result =
         codec->getPixels(info, bm.getPixels(), bm.rowBytes(), NULL, NULL, NULL);
     REPORTER_ASSERT(r, result == SkCodec::kSuccess);
 
     SkMD5::Digest digest;
     md5(bm, &digest);
 
@@ skipping 97 matching lines @@
     check(r, "color_wheel.ico", SkISize::Make(128, 128), false, false);
     // Decodes an embedded PNG image
     check(r, "google_chrome.ico", SkISize::Make(256, 256), false, false);
 
     // GIF
     check(r, "box.gif", SkISize::Make(200, 55), false, false);
     check(r, "color_wheel.gif", SkISize::Make(128, 128), false, false);
     check(r, "randPixels.gif", SkISize::Make(8, 8), false, false);
 
     // JPG
-    check(r, "CMYK.jpg", SkISize::Make(642, 516), true, false);
+    check(r, "CMYK.jpg", SkISize::Make(642, 516), true, false, false);
     check(r, "color_wheel.jpg", SkISize::Make(128, 128), true, false);
     check(r, "grayscale.jpg", SkISize::Make(128, 128), true, false);
     check(r, "mandrill_512_q075.jpg", SkISize::Make(512, 512), true, false);
     check(r, "randPixels.jpg", SkISize::Make(8, 8), true, false);
 
     // PNG
     check(r, "arrow.png", SkISize::Make(187, 312), true, false);
     check(r, "baby_tux.png", SkISize::Make(240, 246), true, false);
     check(r, "color_wheel.png", SkISize::Make(128, 128), true, false);
     check(r, "half-transparent-white-pixel.png", SkISize::Make(1, 1), true, false);
@@ skipping 130 matching lines @@
     REPORTER_ASSERT(r, SkCodec::kInvalidParameters == result);
     result = decoder->start(
         decoder->getInfo().makeColorType(kIndex_8_SkColorType));
     REPORTER_ASSERT(r, SkCodec::kInvalidParameters == result);
 }
 
 DEF_TEST(Codec_Params, r) {
     test_invalid_parameters(r, "index8.png");
     test_invalid_parameters(r, "mandrill.wbmp");
 }