Fill incomplete images in SkCodec parent class

src/codec/SkCodec_libgif.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_libgif.h"
 #include "SkCodecPriv.h"
 #include "SkColorPriv.h"
@@ skipping 512 matching lines @@
 
     // Initialize the swizzler
     if (fFrameIsSubset) {
         const SkImageInfo subsetDstInfo = dstInfo.makeWH(fFrameDims.width(), fFrameDims.height());
         if (kSuccess != this->initializeSwizzler(subsetDstInfo, opts.fZeroInitialized)) {
             return gif_error("Could not initialize swizzler.\n", kUnimplemented);
         }
 
         // Fill the background
         const SkPMColor* colorPtr = get_color_ptr(fColorTable.get());
-        SkSwizzler::Fill(dst, dstInfo, dstRowBytes, this->getInfo().height(),
-                fFillIndex, colorPtr, opts.fZeroInitialized);
+        SkSwizzler::Fill(dst, dstInfo, dstRowBytes, this->getFillValue(dstInfo),
+                opts.fZeroInitialized);
 
         // Modify the dst pointer
         const int32_t dstBytesPerPixel = SkColorTypeBytesPerPixel(dstInfo.colorType());
         dst = SkTAddOffset<void*>(dst, dstRowBytes * fFrameDims.top() +
                 dstBytesPerPixel * fFrameDims.left());
     } else {
         if (kSuccess != this->initializeSwizzler(dstInfo, opts.fZeroInitialized)) {
             return gif_error("Could not initialize swizzler.\n", kUnimplemented);
         }
     }
 
     // Check the interlace flag and iterate over rows of the input
     uint32_t width = fFrameDims.width();
     uint32_t height = fFrameDims.height();
     if (fGif->Image.Interlace) {
         // In interlace mode, the rows of input are rearranged in
         // the output image.  We a helper function to help us
         // rearrange the decoded rows.
         for (uint32_t y = 0; y < height; y++) {
             if (kSuccess != this->readRow()) {
-                // Recover from error by filling remainder of image
-                memset(fSrcBuffer.get(), fFillIndex, width);
+                // Incomplete interlaced gifs are a unique case.  Rather than,
+                // relying on the base class, we will fill the remaining lines
+                // here.
+                const SkImageInfo fillInfo = dstInfo.makeWH(dstInfo.width(), 1);
+                const uint32_t fillValue = this->getFillValue(fillInfo);
                 for (; y < height; y++) {
                     void* dstRow = SkTAddOffset<void>(dst,
                             dstRowBytes * get_output_row_interlaced(y, height));
-                    fSwizzler->swizzle(dstRow, fSrcBuffer.get());
+                    SkSwizzler::Fill(dstRow, fillInfo, dstRowBytes, fillValue,
+                            opts.fZeroInitialized);
                 }
                 return gif_error("Could not decode line.\n", kIncompleteInput);
             }
             void* dstRow = SkTAddOffset<void>(dst,
                     dstRowBytes * get_output_row_interlaced(y, height));
             fSwizzler->swizzle(dstRow, fSrcBuffer.get());
         }
     } else {
         // Standard mode
         void* dstRow = dst;
         for (uint32_t y = 0; y < height; y++) {
             if (kSuccess != this->readRow()) {
-                const SkPMColor* colorPtr = get_color_ptr(fColorTable.get());
-                SkSwizzler::Fill(dstRow, dstInfo, dstRowBytes,
-                        height - y, fFillIndex, colorPtr, opts.fZeroInitialized);
+                this->setIncompleteScanlines(height - y);
                 return gif_error("Could not decode line\n", kIncompleteInput);
             }
             fSwizzler->swizzle(dstRow, fSrcBuffer.get());
             dstRow = SkTAddOffset<void>(dstRow, dstRowBytes);
         }
     }
     return kSuccess;
 }
 
+uint32_t SkGifCodec::onGetFillValue(const SkImageInfo& dstInfo) const {
+    const SkPMColor* colorPtr = get_color_ptr(fColorTable.get());
+    return get_color_table_fill_value(dstInfo.colorType(), colorPtr, fFillIndex);
+}
+
 // TODO (msarett): skbug.com/3582
 //                 Should we implement reallyHasAlpha?  Or should we read extension blocks in the
 //                 header?  Or should we do both?
 
 class SkGifScanlineDecoder : public SkScanlineDecoder {
 public:
-    SkGifScanlineDecoder(const SkImageInfo& srcInfo, SkGifCodec* codec)
-        : INHERITED(srcInfo)
+    SkGifScanlineDecoder(SkGifCodec* codec)
+        : INHERITED(codec, codec->getInfo())
         , fCodec(codec)
     {}
 
     SkEncodedFormat onGetEncodedFormat() const override {
         return kGIF_SkEncodedFormat;
     }
 
     SkCodec::Result onStart(const SkImageInfo& dstInfo, const SkCodec::Options& opts,
                             SkPMColor inputColorPtr[], int* inputColorCount) override {
         SkCodec::Result result = fCodec->prepareToDecode(dstInfo, inputColorPtr, inputColorCount,
@@ skipping 22 matching lines @@
             }
         } else {
             if (SkCodec::kSuccess != fCodec->initializeSwizzler(dstInfo, opts.fZeroInitialized)) {
                 return gif_error("Could not initialize swizzler.\n", SkCodec::kUnimplemented);
             }
         }
 
         return SkCodec::kSuccess;
     }
 
-    SkCodec::Result onGetScanlines(void* dst, int count, size_t rowBytes) override {
+    uint32_t onGetScanlines(void* dst, int count, size_t rowBytes) override {
         if (fCodec->fFrameIsSubset) {
             // Fill the requested rows
-            const SkPMColor* colorPtr = get_color_ptr(fCodec->fColorTable.get());
-            SkSwizzler::Fill(dst, this->dstInfo(), rowBytes, count, fCodec->fFillIndex,
-                    colorPtr, this->options().fZeroInitialized);
+            SkSwizzler::Fill(dst, this->dstInfo().makeWH(this->dstInfo().width(), count), rowBytes,
+                    fCodec->onGetFillValue(dstInfo()), this->options().fZeroInitialized);
 
             // Do nothing for rows before the image frame
             int rowsBeforeFrame = fCodec->fFrameDims.top() - INHERITED::getY();
             if (rowsBeforeFrame > 0) {
                 count = SkTMin(0, count - rowsBeforeFrame);
                 dst = SkTAddOffset<void>(dst, rowBytes * rowsBeforeFrame);
             }
 
             // Do nothing for rows after the image frame
             int rowsAfterFrame = INHERITED::getY() + count - fCodec->fFrameDims.bottom();
             if (rowsAfterFrame > 0) {
                 count = SkTMin(0, count - rowsAfterFrame);
             }
 
             // Adjust dst pointer for left offset
             dst = SkTAddOffset<void>(dst, SkColorTypeBytesPerPixel(
                     this->dstInfo().colorType()) * fCodec->fFrameDims.left());
         }
 
+        void* dstRow = dst;
         for (int i = 0; i < count; i++) {
             if (SkCodec::kSuccess != fCodec->readRow()) {

[scroggo, 2015/09/22 18:02:48]

Should readRow just return a boolean?

[msarett, 2015/09/23 13:22:40]

Yes!

-                const SkPMColor* colorPtr = get_color_ptr(fCodec->fColorTable.get());
-                SkSwizzler::Fill(dst, this->dstInfo(), rowBytes,
-                        count - i, fCodec->fFillIndex, colorPtr,
-                        this->options().fZeroInitialized);
-                return gif_error("Could not decode line\n", SkCodec::kIncompleteInput);
+                return i;
             }
-            fCodec->fSwizzler->swizzle(dst, fCodec->fSrcBuffer.get());
-            dst = SkTAddOffset<void>(dst, rowBytes);
+            fCodec->fSwizzler->swizzle(dstRow, fCodec->fSrcBuffer.get());
+            dstRow = SkTAddOffset<void>(dstRow, rowBytes);
         }
-        return SkCodec::kSuccess;
+        return count;
     }
 
     SkScanlineOrder onGetScanlineOrder() const override {
         if (fCodec->fGif->Image.Interlace) {
             return kOutOfOrder_SkScanlineOrder;
         } else {
             return kTopDown_SkScanlineOrder;
         }
     }
 
-    int onGetY() const override {
+    int onGetY(int encodedY) const override {
         if (fCodec->fGif->Image.Interlace) {
-            return get_output_row_interlaced(INHERITED::onGetY(), this->dstInfo().height());
+            return get_output_row_interlaced(encodedY, this->dstInfo().height());
         } else {
-            return INHERITED::onGetY();
+            return encodedY;
         }
     }
 
 private:
-    SkAutoTDelete<SkGifCodec>   fCodec;
+    SkGifCodec* fCodec; // Owned by parent class
 
     typedef SkScanlineDecoder INHERITED;
 };
 
 SkScanlineDecoder* SkGifCodec::NewSDFromStream(SkStream* stream) {
     SkAutoTDelete<SkGifCodec> codec (static_cast<SkGifCodec*>(SkGifCodec::NewFromStream(stream)));
     if (!codec) {
         return NULL;
     }
 
-    const SkImageInfo& srcInfo = codec->getInfo();
-
-    return SkNEW_ARGS(SkGifScanlineDecoder, (srcInfo, codec.detach()));
+    return SkNEW_ARGS(SkGifScanlineDecoder, (codec.detach()));
 }