Push sigma-based blur interface into our GMs/benches/tests/samplecode

bench/BlurRectBench.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBenchmark.h"
 #include "SkCanvas.h"
 #include "SkPaint.h"
 #include "SkRandom.h"
 #include "SkShader.h"
 #include "SkString.h"
 #include "SkBlurMask.h"
 
 #define SMALL   SkIntToScalar(2)
 #define REAL    SkFloatToScalar(1.5f)
+static const SkScalar kMedium = SkIntToScalar(5);
 #define BIG     SkIntToScalar(10)
+static const SkScalar kMedBig = SkIntToScalar(20);
 #define REALBIG SkFloatToScalar(30.5f)
 
 class BlurRectBench: public SkBenchmark {
     int         fLoopCount;
     SkScalar    fRadius;
     SkString    fName;
 
 public:
     BlurRectBench(void *param, SkScalar rad) : INHERITED(param) {
         fRadius = rad;
@@ skipping 47 matching lines @@
  public:
     BlurRectDirectBench(void *param, SkScalar rad) : INHERITED(param, rad) {
         SkString name;
 
         if (SkScalarFraction(rad) != 0) {
             name.printf("blurrect_direct_%.2f", SkScalarToFloat(rad));
         } else {
             name.printf("blurrect_direct_%d", SkScalarRoundToInt(rad));
         }
 
-        setName(name);
+        this->setName(name);
     }
 protected:
     virtual void makeBlurryRect(const SkRect& r) SK_OVERRIDE {
         SkMask mask;
-        SkBlurMask::BlurRect(&mask, r, this->radius(), SkBlurMask::kNormal_Style);
+        SkBlurMask::BlurRect(SkBlurMask::ConvertRadiusToSigma(this->radius()), 
+                             &mask, r, SkBlurMask::kNormal_Style);
         SkMask::FreeImage(mask.fImage);
     }
 private:
     typedef BlurRectBench INHERITED;
 };
 
 class BlurRectSeparableBench: public BlurRectBench {
 
 public:
     BlurRectSeparableBench(void *param, SkScalar rad) : INHERITED(param, rad) {
@@ skipping 18 matching lines @@
 
     SkMask fSrcMask;
 private:
     typedef BlurRectBench INHERITED;
 };
 
 class BlurRectBoxFilterBench: public BlurRectSeparableBench {
 public:
     BlurRectBoxFilterBench(void *param, SkScalar rad) : INHERITED(param, rad) {
         SkString name;
+
         if (SkScalarFraction(rad) != 0) {
             name.printf("blurrect_boxfilter_%.2f", SkScalarToFloat(rad));
         } else {
             name.printf("blurrect_boxfilter_%d", SkScalarRoundToInt(rad));
         }
-        setName(name);
+
+        this->setName(name);
     }
 
 protected:
 
     virtual void makeBlurryRect(const SkRect&) SK_OVERRIDE {
         SkMask mask;
         mask.fImage = NULL;
-        SkBlurMask::Blur(&mask, fSrcMask, this->radius(),
-                         SkBlurMask::kNormal_Style,
-                         SkBlurMask::kHigh_Quality);
+        SkBlurMask::BoxBlur(&mask, fSrcMask, SkBlurMask::ConvertRadiusToSigma(this->radius()),
+                            SkBlurMask::kNormal_Style,
+                            SkBlurMask::kHigh_Quality);
         SkMask::FreeImage(mask.fImage);
     }
 private:
     typedef BlurRectSeparableBench INHERITED;
 };
 
 class BlurRectGaussianBench: public BlurRectSeparableBench {
 public:
     BlurRectGaussianBench(void *param, SkScalar rad) : INHERITED(param, rad) {
         SkString name;
+
         if (SkScalarFraction(rad) != 0) {
             name.printf("blurrect_gaussian_%.2f", SkScalarToFloat(rad));
         } else {
             name.printf("blurrect_gaussian_%d", SkScalarRoundToInt(rad));
         }
-        setName(name);
+ 
+        this->setName(name);
     }
 
 protected:
 
     virtual void makeBlurryRect(const SkRect&) SK_OVERRIDE {
         SkMask mask;
         mask.fImage = NULL;
-        SkBlurMask::BlurGroundTruth(&mask, fSrcMask, this->radius(),
-                                    SkBlurMask::kNormal_Style);
+        SkBlurMask::BlurGroundTruth(SkBlurMask::ConvertRadiusToSigma(this->radius()),
+                                    &mask, fSrcMask, SkBlurMask::kNormal_Style);
         SkMask::FreeImage(mask.fImage);
     }
 private:
     typedef BlurRectSeparableBench INHERITED;
 };
 
 DEF_BENCH(return new BlurRectBoxFilterBench(p, SMALL);)
 DEF_BENCH(return new BlurRectBoxFilterBench(p, BIG);)
 DEF_BENCH(return new BlurRectBoxFilterBench(p, REALBIG);)
 DEF_BENCH(return new BlurRectBoxFilterBench(p, REAL);)
 DEF_BENCH(return new BlurRectGaussianBench(p, SMALL);)
 DEF_BENCH(return new BlurRectGaussianBench(p, BIG);)
 DEF_BENCH(return new BlurRectGaussianBench(p, REALBIG);)
 DEF_BENCH(return new BlurRectGaussianBench(p, REAL);)
 DEF_BENCH(return new BlurRectDirectBench(p, SMALL);)
 DEF_BENCH(return new BlurRectDirectBench(p, BIG);)
 DEF_BENCH(return new BlurRectDirectBench(p, REALBIG);)
 DEF_BENCH(return new BlurRectDirectBench(p, REAL);)
 
-DEF_BENCH(return new BlurRectDirectBench(p, SkIntToScalar(5));)
-DEF_BENCH(return new BlurRectDirectBench(p, SkIntToScalar(20));)
+DEF_BENCH(return new BlurRectDirectBench(p, kMedium);)
+DEF_BENCH(return new BlurRectDirectBench(p, kMedBig);)
 
-DEF_BENCH(return new BlurRectBoxFilterBench(p, SkIntToScalar(5));)
-DEF_BENCH(return new BlurRectBoxFilterBench(p, SkIntToScalar(20));)
+DEF_BENCH(return new BlurRectBoxFilterBench(p, kMedium);)
+DEF_BENCH(return new BlurRectBoxFilterBench(p, kMedBig);)
 
 #if 0
 // disable Gaussian benchmarks; the algorithm works well enough
 // and serves as a baseline for ground truth, but it's too slow
 // to use in production for non-trivial radii, so no real point
 // in having the bots benchmark it all the time.
 
 DEF_BENCH(return new BlurRectGaussianBench(p, SkIntToScalar(1));)
 DEF_BENCH(return new BlurRectGaussianBench(p, SkIntToScalar(2));)
 DEF_BENCH(return new BlurRectGaussianBench(p, SkIntToScalar(3));)
 DEF_BENCH(return new BlurRectGaussianBench(p, SkIntToScalar(4));)
 DEF_BENCH(return new BlurRectGaussianBench(p, SkIntToScalar(5));)
 DEF_BENCH(return new BlurRectGaussianBench(p, SkIntToScalar(6));)
 DEF_BENCH(return new BlurRectGaussianBench(p, SkIntToScalar(7));)
 DEF_BENCH(return new BlurRectGaussianBench(p, SkIntToScalar(8));)
 DEF_BENCH(return new BlurRectGaussianBench(p, SkIntToScalar(9));)
 DEF_BENCH(return new BlurRectGaussianBench(p, SkIntToScalar(10));)
 DEF_BENCH(return new BlurRectGaussianBench(p, SkIntToScalar(11));)
 DEF_BENCH(return new BlurRectGaussianBench(p, SkIntToScalar(12));)
 DEF_BENCH(return new BlurRectGaussianBench(p, SkIntToScalar(13));)
 DEF_BENCH(return new BlurRectGaussianBench(p, SkIntToScalar(14));)
 DEF_BENCH(return new BlurRectGaussianBench(p, SkIntToScalar(15));)
 DEF_BENCH(return new BlurRectGaussianBench(p, SkIntToScalar(16));)
 DEF_BENCH(return new BlurRectGaussianBench(p, SkIntToScalar(17));)
 DEF_BENCH(return new BlurRectGaussianBench(p, SkIntToScalar(18));)
 DEF_BENCH(return new BlurRectGaussianBench(p, SkIntToScalar(19));)
 DEF_BENCH(return new BlurRectGaussianBench(p, SkIntToScalar(20));)
 #endif