change pixel-serializer to support reencoding existing data

Trying to evolve this interface so it can
- support rich set of backend-encoders (including ones like ETC1 that can cheaply convert to KXT
- allow for encoding images as well as bitmaps (e.g. for picture serialization)
- perhaps replace SkImageEncoder as an API (assuming we create a factory that returns a serializer given a format)

BUG=skia:

Review URL: https://codereview.chromium.org/1373683003

2 files changed, 31 insertions, 15 deletions

diff --git a/src/images/SkImageDecoder_ktx.cpp b/src/images/SkImageDecoder_ktx.cpp
index a95ab6f602..f903b3fd56 100644
--- a/src/images/SkImageDecoder_ktx.cpp
+++ b/src/images/SkImageDecoder_ktx.cpp
@@ -252,34 +252,40 @@ SkImageDecoder::Result SkKTXImageDecoder::onDecode(SkStream* stream, SkBitmap* b
 class SkKTXImageEncoder : public SkImageEncoder {
 protected:
     bool onEncode(SkWStream* stream, const SkBitmap& bm, int quality) override;
+    SkData* onReencodeData(SkData*) override;
 
 private:
     virtual bool encodePKM(SkWStream* stream, const SkData *data);
     typedef SkImageEncoder INHERITED;
 };
 
+SkData* SkKTXImageEncoder::onReencodeData(SkData* encoded) {
+    const uint8_t* bytes = encoded->bytes();
+    if (etc1_pkm_is_valid(bytes)) {
+        SkDynamicMemoryWStream stream;
+        if (this->encodePKM(&stream, encoded)) {
+            return stream.copyToData();
+        }
+    }
+    // Is it a KTX file??
+    if (SkKTXFile::is_ktx(bytes)) {
+        return SkRef(encoded);
+    }
+    return nullptr;
+}
+
 bool SkKTXImageEncoder::onEncode(SkWStream* stream, const SkBitmap& bitmap, int) {
     if (!bitmap.pixelRef()) {
         return false;
     }
-    SkAutoDataUnref data(bitmap.pixelRef()->refEncodedData());
-
-    // Is this even encoded data?
-    if (data) {
-        const uint8_t *bytes = data->bytes();
-        if (etc1_pkm_is_valid(bytes)) {
-            return this->encodePKM(stream, data);
-        }
 
-        // Is it a KTX file??
-        if (SkKTXFile::is_ktx(bytes)) {
-            return stream->write(bytes, data->size());
+    SkAutoDataUnref encoded(bitmap.pixelRef()->refEncodedData());
+    if (encoded) {
+        SkAutoDataUnref reencoded(this->onReencodeData(encoded));
+        if (reencoded) {
+            return stream->write(reencoded->bytes(), reencoded->size());
         }
-        
-        // If it's neither a KTX nor a PKM, then we need to
-        // get at the actual pixels, so fall through and decompress...
     }
-
     return SkKTXFile::WriteBitmapToKTX(stream, bitmap);
 }
 
diff --git a/src/images/SkImageEncoder.cpp b/src/images/SkImageEncoder.cpp
index cc1b73baa5..4ad12c84cd 100644
--- a/src/images/SkImageEncoder.cpp
+++ b/src/images/SkImageEncoder.cpp
@@ -60,3 +60,13 @@ SkData* SkImageEncoder::EncodeData(const SkImageInfo& info, const void* pixels,
     SkAutoTDelete<SkImageEncoder> enc(SkImageEncoder::Create(t));
     return enc.get() ? enc.get()->encodeData(bm, quality) : nullptr;
 }
+
+SkData* SkImageEncoder::EncodeData(const SkPixmap& pmap, Type t, int quality) {
+    return EncodeData(pmap.info(), pmap.addr(), pmap.rowBytes(), t, quality);
+}
+
+SkData* SkImageEncoder::ReencodeData(SkData* encoded, Type t) {
+    SkAutoTDelete<SkImageEncoder> enc(SkImageEncoder::Create(t));
+    return enc.get() ? enc.get()->onReencodeData(encoded) : nullptr;
+}
+