Refactor SkBitmapRegionDecoderInterface for Android

bench/BitmapRegionDecoderBench.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 "BitmapRegionDecoderBench.h"
 #include "CodecBenchPriv.h"
 #include "SkBitmap.h"
 #include "SkCodecTools.h"
 #include "SkOSFile.h"
 
 BitmapRegionDecoderBench::BitmapRegionDecoderBench(const char* baseName, SkData* encoded,
         SkBitmapRegionDecoderInterface::Strategy strategy, SkColorType colorType,
         uint32_t sampleSize, const SkIRect& subset)
     : fBRD(nullptr)
     , fData(SkRef(encoded))
     , fStrategy(strategy)
     , fColorType(colorType)
     , fSampleSize(sampleSize)
     , fSubset(subset)
+    , fColorTable(nullptr)
 {
     // Choose a useful name for the region decoding strategy
     const char* strategyName;
     switch (strategy) {
         case SkBitmapRegionDecoderInterface::kOriginal_Strategy:
             strategyName = "Original";
             break;
         case SkBitmapRegionDecoderInterface::kCanvas_Strategy:
             strategyName = "Canvas";
             break;
         case SkBitmapRegionDecoderInterface::kAndroidCodec_Strategy:
             strategyName = "AndroidCodec";
             break;
         default:
             SkASSERT(false);
             strategyName = "";
             break;
     }
 
     // Choose a useful name for the color type
     const char* colorName = color_type_to_str(colorType);
 
     fName.printf("BRD_%s_%s_%s", baseName, strategyName, colorName);
     if (1 != sampleSize) {
         fName.appendf("_%.3f", get_scale_from_sample_size(sampleSize));
     }
+
+    if (kIndex_8_SkColorType == fColorType) {
+        SkPMColor colors[256];
+        fColorTable.reset(new SkColorTable(colors, 256));
+    }
 }
 
 const char* BitmapRegionDecoderBench::onGetName() {
     return fName.c_str();
 }
 
 bool BitmapRegionDecoderBench::isSuitableFor(Backend backend) {
     return kNonRendering_Backend == backend;
 }
 
 void BitmapRegionDecoderBench::onDelayedSetup() {
     fBRD.reset(SkBitmapRegionDecoderInterface::CreateBitmapRegionDecoder(fData, fStrategy));
 }
 
 void BitmapRegionDecoderBench::onDraw(int n, SkCanvas* canvas) {
-    SkAutoTDelete<SkBitmap> bitmap;
     for (int i = 0; i < n; i++) {
-        bitmap.reset(fBRD->decodeRegion(fSubset.left(), fSubset.top(), fSubset.width(),
-                fSubset.height(), fSampleSize, fColorType));
-        SkASSERT(nullptr != bitmap.get());
+        SkImageInfo info;
+#ifdef SK_DEBUG
+        bool result =
+#endif
+        fBRD->prepareRegion(fSubset, fSampleSize, fColorType, false, &info);

[scroggo, 2015/10/27 15:00:50]

You could also change this to:

  SkAssertResult(fBRD->prepareRegion(...));

This runs the code in release, and also asserts in debug. You could do the same
below.

+        SkASSERT(result);
+
+        SkBitmap bitmap;
+        if (SkBitmapRegionDecoderInterface::kOriginal_Strategy != fStrategy) {
+            bitmap.allocPixels(info, nullptr, fColorTable);
+        }
+
+#ifdef SK_DEBUG
+        result =
+#endif
+        fBRD->decodeRegion(bitmap);
+        SkASSERT(result);
     }
 }