Merge SkCodec with SkScanlineDecoder

bench/subset/SubsetTranslateBench.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 "SubsetTranslateBench.h"
 #include "SubsetBenchPriv.h"
 #include "SkData.h"
 #include "SkCodec.h"
 #include "SkImageDecoder.h"
 #include "SkOSFile.h"
-#include "SkScanlineDecoder.h"
 #include "SkStream.h"
 
 /*
  *
  * This benchmark is designed to test the performance of subset decoding.
  * It uses input dimensions to decode the entire image where each block is susbetW x subsetH.
  *
  */
 
 SubsetTranslateBench::SubsetTranslateBench(const SkString& path,
@@ skipping 28 matching lines @@
     return kNonRendering_Backend == backend;
 }
 
 void SubsetTranslateBench::onDraw(const int n, SkCanvas* canvas) {
     // When the color type is kIndex8, we will need to store the color table.  If it is
     // used, it will be initialized by the codec.
     int colorCount;
     SkPMColor colors[256];
     if (fUseCodec) {
         for (int count = 0; count < n; count++) {
-            SkAutoTDelete<SkScanlineDecoder> scanlineDecoder(
-                    SkScanlineDecoder::NewFromStream(fStream->duplicate()));
-            const SkImageInfo info = scanlineDecoder->getInfo().makeColorType(fColorType);
+            SkAutoTDelete<SkCodec> codec(SkCodec::NewFromStream(fStream->duplicate()));
+            const SkImageInfo info = codec->getInfo().makeColorType(fColorType);
             SkAutoTDeleteArray<uint8_t> row(new uint8_t[info.minRowBytes()]);
-            scanlineDecoder->start(info, nullptr, colors, &colorCount);
+            codec->start(info, nullptr, colors, &colorCount);
 
             SkBitmap bitmap;
             // Note that we use the same bitmap for all of the subsets.
             // It might be larger than necessary for the end subsets.
             SkImageInfo subsetInfo = info.makeWH(fSubsetWidth, fSubsetHeight);
             alloc_pixels(&bitmap, subsetInfo, colors, colorCount);
 
             for (int x = 0; x < info.width(); x += fSubsetWidth) {
                 for (int y = 0; y < info.height(); y += fSubsetHeight) {
-                    scanlineDecoder->skipScanlines(y);
+                    codec->skipScanlines(y);
                     const uint32_t currSubsetWidth =
                             x + (int) fSubsetWidth > info.width() ?
                             info.width() - x : fSubsetWidth;
                     const uint32_t currSubsetHeight =
                             y + (int) fSubsetHeight > info.height() ?
                             info.height() - y : fSubsetHeight;
                     const uint32_t bpp = info.bytesPerPixel();
                     for (uint32_t y = 0; y < currSubsetHeight; y++) {
-                        scanlineDecoder->getScanlines(row.get(), 1, 0);
+                        codec->getScanlines(row.get(), 1, 0);
                         memcpy(bitmap.getAddr(0, y), row.get() + x * bpp,
                                 currSubsetWidth * bpp);
                     }
                 }
             }
         }
     } else {
         // We create a color table here to satisfy allocPixels() when the output
         // type is kIndex8.  It's okay that this is uninitialized since we never
         // use it.
@@ skipping 20 matching lines @@
                     const uint32_t currSubsetHeight = y + (int) fSubsetHeight > height ?
                             height - y : fSubsetHeight;
                     SkIRect rect = SkIRect::MakeXYWH(x, y, currSubsetWidth,
                             currSubsetHeight);
                     decoder->decodeSubset(&bitmap, rect, fColorType);
                 }
             }
         }
     }
 }