Use SkEncodedInfo in place of SkSwizzler::SrcConfig

src/codec/SkJpegCodec.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 "SkCodec.h"
 #include "SkMSAN.h"
 #include "SkJpegCodec.h"
@@ skipping 492 matching lines @@
             dst = SkTAddOffset<JSAMPLE>(dst, dstRowBytes);
         } else {
             dstRow = SkTAddOffset<JSAMPLE>(dstRow, dstRowBytes);
         }
     }
 
     return kSuccess;
 }
 
 void SkJpegCodec::initializeSwizzler(const SkImageInfo& dstInfo, const Options& options) {
-    SkSwizzler::SrcConfig srcConfig = SkSwizzler::kUnknown;
-    if (JCS_CMYK == fDecoderMgr->dinfo()->out_color_space) {
-        srcConfig = SkSwizzler::kCMYK;
-    } else {
-        // If the out_color_space is not CMYK, the only reason we would need a swizzler is
-        // for sampling and/or subsetting.
-        switch (dstInfo.colorType()) {
-            case kGray_8_SkColorType:
-                srcConfig = SkSwizzler::kNoOp8;
-                break;
-            case kN32_SkColorType:
-                srcConfig = SkSwizzler::kNoOp32;
-                break;
-            case kRGB_565_SkColorType:
-                srcConfig = SkSwizzler::kNoOp16;
-                break;
-            default:
-                // This function should only be called if the colorType is supported by jpeg
-                SkASSERT(false);
-        }
-    }
-
-    if (JCS_RGB == fDecoderMgr->dinfo()->out_color_space) {
-        srcConfig = SkSwizzler::kRGB;
+    // libjpeg-turbo may have already performed color conversion.  In this
+    // case, we must indicate to the swizzler the appropriate encoded format.
+    SkEncodedInfo encodedInfo;
+    switch (fDecoderMgr->dinfo()->out_color_space) {
+        case JCS_GRAYSCALE:
+            encodedInfo = this->getEncodedInfo().makeColor(SkEncodedInfo::kGray_Color);
+            break;
+        case JCS_RGB:
+            encodedInfo = this->getEncodedInfo().makeColor(SkEncodedInfo::kRGB_Color);
+            break;
+#ifdef LIBJPEG_TURBO_VERSION
+        case JCS_EXT_RGBA:
+            encodedInfo = this->getEncodedInfo().makeColor(SkEncodedInfo::kRGBA_Color);
+            break;
+        case JCS_EXT_BGRA:
+            encodedInfo = this->getEncodedInfo().makeColor(SkEncodedInfo::kBGRA_Color);
+            break;
+#endif
+        case JCS_CMYK:
+            encodedInfo = this->getEncodedInfo().makeColor(SkEncodedInfo::kInvertedCMYK_Color);
+            break;
+#ifdef TURBO_HAS_565
+        case JCS_RGB565:
+            encodedInfo = this->getEncodedInfo().makeColor(SkEncodedInfo::kUnknown_Color);

[scroggo, 2016/04/21 15:09:11]

If you don't add a new color type for this, I think there should be a comment
explaining why you're using kUnknown here.

[msarett, 2016/04/21 16:03:41]

Using kPreSwizzled.

+            break;
+#endif
+        default:
+            SkASSERT(false);
+            break;
     }
 
     Options swizzlerOptions = options;
     if (options.fSubset) {
         // Use fSwizzlerSubset if this is a subset decode.  This is necessary in the case
         // where libjpeg-turbo provides a subset and then we need to subset it further.
         // Also, verify that fSwizzlerSubset is initialized and valid.
         SkASSERT(!fSwizzlerSubset.isEmpty() && fSwizzlerSubset.x() <= options.fSubset->x() &&
                 fSwizzlerSubset.width() == options.fSubset->width());
         swizzlerOptions.fSubset = &fSwizzlerSubset;
     }
-    fSwizzler.reset(SkSwizzler::CreateSwizzler(srcConfig, nullptr, dstInfo, swizzlerOptions));
+    fSwizzler.reset(SkSwizzler::CreateSwizzler(encodedInfo, nullptr, dstInfo, swizzlerOptions));
     SkASSERT(fSwizzler);
     fStorage.reset(get_row_bytes(fDecoderMgr->dinfo()));
     fSrcRow = fStorage.get();
 }
 
 SkSampler* SkJpegCodec::getSampler(bool createIfNecessary) {
     if (!createIfNecessary || fSwizzler) {
         SkASSERT(!fSwizzler || (fSrcRow && fStorage.get() == fSrcRow));
         return fSwizzler;
     }
@@ skipping 334 matching lines @@
 
         JDIMENSION linesRead = jpeg_read_raw_data(dinfo, yuv, numRowsPerBlock);
         if (linesRead < remainingRows) {
             // FIXME: Handle incomplete YUV decodes without signalling an error.
             return kInvalidInput;
         }
     }
 
     return kSuccess;
 }