Add SkEncodedInfo to report properties of encoded image data

include/codec/SkCodec.h

Index: include/codec/SkCodec.h
diff --git a/include/codec/SkCodec.h b/include/codec/SkCodec.h
index 629274d21ccacc734259c981b670d60cf1d37c5e..50875e46c4a42cfbef1d204a0af3bfa01a74b38c 100644
--- a/include/codec/SkCodec.h
+++ b/include/codec/SkCodec.h
@@ -11,6 +11,7 @@
 #include "../private/SkTemplates.h"
 #include "SkColor.h"
 #include "SkEncodedFormat.h"
+#include "SkEncodedInfo.h"
 #include "SkImageInfo.h"
 #include "SkSize.h"
 #include "SkStream.h"
@@ -100,6 +101,8 @@ public:
      */
     const SkImageInfo& getInfo() const { return fSrcInfo; }
 
+    const SkEncodedInfo& getEncodedInfo() const { return fEncodedInfo; }
+
     /**
      *  Returns the color space associated with the codec.
      *  Does not affect ownership.
@@ -511,7 +514,9 @@ protected:
     /**
      *  Takes ownership of SkStream*
      */
-    SkCodec(const SkImageInfo&,
+    SkCodec(int width,
+            int height,
+            const SkEncodedInfo&,
             SkStream*,
             sk_sp<SkColorSpace> = nullptr,
             Origin = kTopLeft_Origin);
@@ -642,6 +647,7 @@ protected:
     virtual int onOutputScanline(int inputScanline) const;
 
 private:
+    const SkEncodedInfo         fEncodedInfo;
     const SkImageInfo           fSrcInfo;
     SkAutoTDelete<SkStream>     fStream;
     bool                        fNeedsRewind;