Use SkEncodedInfo in place of SkSwizzler::SrcConfig

include/codec/SkEncodedInfo.h

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkEncodedInfo_DEFINED
 #define SkEncodedInfo_DEFINED
 
@@ skipping 50 matching lines @@
 
         // JPEG
         // Photoshop actually writes inverted CMYK data into JPEGs, where zero
         // represents 100% ink coverage.  For this reason, we treat CMYK JPEGs
         // as having inverted CMYK.  libjpeg-turbo warns that this may break
         // other applications, but the CMYK JPEGs we see on the web expect to
         // be treated as inverted CMYK.
         kInvertedCMYK_Color,
         kYCCK_Color,
 
+        // Used internally to indicate that the decoding library has
+        // pre-swizzled to the desired output format.
+        kPreSwizzled_Color,
+
         // Allows us to have a default constructor.  Should be treated as
         // invalid.
         kUnknown_Color,
     };
 
     static SkEncodedInfo Make(Color color, Alpha alpha, int bitsPerComponent) {

[reed1, 2016/04/22 15:08:35]

Do we need to allow the public to create EncodedInfos with kPreSwizzled or
kUnknown ? That seems weird.

[msarett, 2016/04/22 16:13:26]

Agreed that is weird.

We already disallow kUnknown (except in the default constructor case).

I have now disallowed kPreSwizzled by making SkJpegCodec a friend class and
adding a private setColor() function.

         SkASSERT(1 == bitsPerComponent ||
                  2 == bitsPerComponent ||
                  4 == bitsPerComponent ||
                  8 == bitsPerComponent ||
                  16 == bitsPerComponent);
 
         switch (color) {
             case kGray_Color:
                 SkASSERT(kOpaque_Alpha == alpha);
                 break;
@@ skipping 17 matching lines @@
                 break;
             case kRGBA_Color:
                 SkASSERT(kOpaque_Alpha != alpha);
                 SkASSERT(bitsPerComponent >= 8);
                 break;
             case kBGRA_Color:
             case kYUVA_Color:
                 SkASSERT(kOpaque_Alpha != alpha);
                 SkASSERT(8 == bitsPerComponent);
                 break;
+            case kPreSwizzled_Color:
+                break;
             default:
                 SkASSERT(false);
                 break;
         }
 
         return SkEncodedInfo(color, alpha, bitsPerComponent);
     }
 
     /*
      * Returns an SkImageInfo with Skia color and alpha types that are the
@@ skipping 25 matching lines @@
             case kBGRA_Color:
             case kYUVA_Color:
                 SkASSERT(kOpaque_Alpha != fAlpha);
                 return SkImageInfo::Make(width, height, kN32_SkColorType, kUnpremul_SkAlphaType);
             default:
                 SkASSERT(false);
                 return SkImageInfo::MakeUnknown();
         }
     }
 
+    Color color() const { return fColor; }
+    Alpha alpha() const { return fAlpha; }
+    uint8_t bitsPerComponent() const { return fBitsPerComponent; }
+
+    SkEncodedInfo makeColor(Color color) const {
+        return SkEncodedInfo::Make(color, fAlpha, fBitsPerComponent);
+    }
+
+    uint8_t bitsPerPixel() const {
+        switch (fColor) {
+            case kGray_Color:
+                return fBitsPerComponent;
+            case kGrayAlpha_Color:
+                return 2 * fBitsPerComponent;
+            case kPalette_Color:
+                return fBitsPerComponent;
+            case kRGB_Color:
+            case kBGR_Color:
+            case kYUV_Color:
+                return 3 * fBitsPerComponent;
+            case kRGBA_Color:
+            case kBGRA_Color:
+            case kBGRX_Color:
+            case kYUVA_Color:
+            case kInvertedCMYK_Color:
+            case kYCCK_Color:
+                return 4 * fBitsPerComponent;
+            default:
+                SkASSERT(false);
+                return 0;
+        }
+    }
+
     SkEncodedInfo()
         : fColor(kUnknown_Color)
         , fAlpha(kUnknown_Alpha)
         , fBitsPerComponent(0)
     {}
 
 private:
 
     SkEncodedInfo(Color color, Alpha alpha, uint8_t bitsPerComponent)
         : fColor(color)
         , fAlpha(alpha)
         , fBitsPerComponent(bitsPerComponent)
     {}
 
     Color   fColor;
     Alpha   fAlpha;
     uint8_t fBitsPerComponent;
 };
 
 #endif