Add ETC1 format to SkTextureCompressor

src/images/SkImageDecoder_pkm.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkColorPriv.h"
 #include "SkImageDecoder.h"
 #include "SkScaledBitmapSampler.h"
 #include "SkStream.h"
 #include "SkStreamPriv.h"
+#include "SkTextureCompressor.h"
 #include "SkTypes.h"
 
 #include "etc1.h"
 
 class SkPKMImageDecoder : public SkImageDecoder {
 public:
     SkPKMImageDecoder() { }
 
     virtual Format getFormat() const SK_OVERRIDE {
         return kPKM_Format;
@@ skipping 50 matching lines @@
     if (!sampler.begin(bm, SkScaledBitmapSampler::kRGB, *this)) {
         return false;
     }
 
     // Advance buffer past the header
     buf += ETC_PKM_HEADER_SIZE;
 
     // ETC1 Data is encoded as RGB pixels, so we should extract it as such
     int nPixels = width * height;
     SkAutoMalloc outRGBData(nPixels * 3);
-    etc1_byte *outRGBDataPtr = reinterpret_cast<etc1_byte *>(outRGBData.get());
+    uint8_t *outRGBDataPtr = reinterpret_cast<uint8_t *>(outRGBData.get());
 
     // Decode ETC1
-    if (etc1_decode_image(buf, outRGBDataPtr, width, height, 3, width*3)) {
+    if (!SkTextureCompressor::DecompressBufferFromFormat(
+            outRGBDataPtr, width*3, buf, width, height, SkTextureCompressor::kETC1_Format)) {
         return false;
     }
 
     // Set each of the pixels...
     const int srcRowBytes = width * 3;
     const int dstHeight = sampler.scaledHeight();
     const uint8_t *srcRow = reinterpret_cast<uint8_t *>(outRGBDataPtr);
     srcRow += sampler.srcY0() * srcRowBytes;
     for (int y = 0; y < dstHeight; ++y) {
         sampler.next(srcRow);
@@ skipping 27 matching lines @@
 static SkImageDecoder_DecodeReg gReg(sk_libpkm_dfactory);
 
 static SkImageDecoder::Format get_format_pkm(SkStreamRewindable* stream) {
     if (is_pkm(stream)) {
         return SkImageDecoder::kPKM_Format;
     }
     return SkImageDecoder::kUnknown_Format;
 }
 
 static SkImageDecoder_FormatReg gFormatReg(get_format_pkm);