Implementation of SkBitmapRegionDecoder using SkAndroidCodec

bench/nanobench.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 <ctype.h>
 
 #include "nanobench.h"
@@ skipping 578 matching lines @@
         // This should not print a message since it is not an error.
         return false;
     }
 
     return true;
 }
 
 static bool valid_brd_bench(SkData* encoded, SkBitmapRegionDecoderInterface::Strategy strategy,
         SkColorType colorType, uint32_t sampleSize, uint32_t minOutputSize, int* width,
         int* height) {
-    SkStreamRewindable* stream = new SkMemoryStream(encoded);
     SkAutoTDelete<SkBitmapRegionDecoderInterface> brd(
-            SkBitmapRegionDecoderInterface::CreateBitmapRegionDecoder(stream, strategy));
+            SkBitmapRegionDecoderInterface::CreateBitmapRegionDecoder(encoded, strategy));
     if (nullptr == brd.get()) {
         // This is indicates that subset decoding is not supported for a particular image format.
         return false;
     }
 
     SkAutoTDelete<SkBitmap> bitmap(brd->decodeRegion(0, 0, brd->width(), brd->height(), 1,
             colorType));
     if (nullptr == bitmap.get() || colorType != bitmap->colorType()) {
         // This indicates that conversion to the requested color type is not supported for the
         // particular image.
@@ skipping 343 matching lines @@
             fCurrentSubsetImage = 0;
             fUseCodec++;
         }
 
         // Run the BRDBenches
         // We will benchmark multiple BRD strategies.
         static const struct {
             SkBitmapRegionDecoderInterface::Strategy    fStrategy;
             const char*                                 fName;
         } strategies[] = {
-            { SkBitmapRegionDecoderInterface::kOriginal_Strategy,   "BRD" },
-            { SkBitmapRegionDecoderInterface::kCanvas_Strategy,     "BRD_canvas" },
+            { SkBitmapRegionDecoderInterface::kOriginal_Strategy,    "BRD" },
+            { SkBitmapRegionDecoderInterface::kCanvas_Strategy,      "BRD_canvas" },
+            { SkBitmapRegionDecoderInterface::kAndroidCodec_Strategy, "BRD_android_codec" },
         };
 
         // We intend to create benchmarks that model the use cases in
         // android/libraries/social/tiledimage.  In this library, an image is decoded in 512x512
         // tiles.  The image can be translated freely, so the location of a tile may be anywhere in
         // the image.  For that reason, we will benchmark decodes in five representative locations
         // in the image.  Additionally, this use case utilizes power of two scaling, so we will
         // test on power of two sample sizes.  The output tile is always 512x512, so, when a
         // sampleSize is used, the size of the subset that is decoded is always
         // (sampleSize*512)x(sampleSize*512).
@@ skipping 387 matching lines @@
 
     return 0;
 }
 
 #if !defined SK_BUILD_FOR_IOS
 int main(int argc, char** argv) {
     SkCommandLineFlags::Parse(argc, argv);
     return nanobench_main();
 }
 #endif