Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(120)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: src/core/SkBitmapFilter.cpp

Issue 19335002: Production quality fast image up/downsampler (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: avoid using any #defines related to SSE by incorporating padding into the function pointer structure Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« src/core/SkBitmapFilter.h ('K') | « src/core/SkBitmapFilter.h ('k') | src/core/SkBitmapProcState.h » ('j') | src/core/SkBitmapScaler.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkBitmapFilter.cpp
diff --git a/src/core/SkBitmapFilter.cpp b/src/core/SkBitmapFilter.cpp
index 434ea9a53613c92e8fb3de8f4c4e754842c98bca..4cbc99fa77d04e77f9cecd34cee6611fae19ef03 100644
--- a/src/core/SkBitmapFilter.cpp
+++ b/src/core/SkBitmapFilter.cpp
@@ -5,15 +5,23 @@
* found in the LICENSE file.
*/
+#include "SkErrorInternals.h"
+#include "SkConvolver.h"
#include "SkBitmapProcState.h"
#include "SkBitmap.h"
#include "SkColor.h"
#include "SkColorPriv.h"
+#include "SkConvolver.h"
#include "SkUnPreMultiply.h"
#include "SkShader.h"
#include "SkRTConf.h"
#include "SkMath.h"
+// These are the per-scanline callbacks that are used when we must resort to
+// resampling an image as it is blitted. Typically these are used only when
+// the image is rotated or has some other complex transformation applied.
+// Scaled images will usually be rescaled directly before rasterization.
+
void highQualityFilter(const SkBitmapProcState& s, int x, int y,
SkPMColor* SK_RESTRICT colors, int count) {
@@ -68,71 +76,15 @@ void highQualityFilter(const SkBitmapProcState& s, int x, int y,
}
}
-void highQualityFilter_ScaleOnly(const SkBitmapProcState &s, int x, int y,
- SkPMColor *SK_RESTRICT colors, int count) {
- const int maxX = s.fBitmap->width() - 1;
- const int maxY = s.fBitmap->height() - 1;
-
- SkPoint srcPt;
-
- s.fInvProc(s.fInvMatrix, SkFloatToScalar(x + 0.5f),
- SkFloatToScalar(y + 0.5f), &srcPt);
- srcPt.fY -= SK_ScalarHalf;
- int y0 = SkClampMax(SkScalarCeilToInt(srcPt.fY-s.getBitmapFilter()->width()), maxY);
- int y1 = SkClampMax(SkScalarFloorToInt(srcPt.fY+s.getBitmapFilter()->width()), maxY);
-
- while (count-- > 0) {
- s.fInvProc(s.fInvMatrix, SkFloatToScalar(x + 0.5f),
- SkFloatToScalar(y + 0.5f), &srcPt);
- srcPt.fX -= SK_ScalarHalf;
- srcPt.fY -= SK_ScalarHalf;
-
- SkScalar weight = 0;
- SkScalar fr = 0, fg = 0, fb = 0, fa = 0;
-
- int x0 = SkClampMax(SkScalarCeilToInt(srcPt.fX-s.getBitmapFilter()->width()), maxX);
- int x1 = SkClampMax(SkScalarFloorToInt(srcPt.fX+s.getBitmapFilter()->width()), maxX);
-
- for (int srcY = y0; srcY <= y1; srcY++) {
- SkScalar yWeight = s.getBitmapFilter()->lookupScalar((srcPt.fY - srcY));
-
- for (int srcX = x0; srcX <= x1 ; srcX++) {
- SkScalar xWeight = s.getBitmapFilter()->lookupScalar((srcPt.fX - srcX));
-
- SkScalar combined_weight = SkScalarMul(xWeight, yWeight);
-
- SkPMColor c = *s.fBitmap->getAddr32(srcX, srcY);
- fr += combined_weight * SkGetPackedR32(c);
- fg += combined_weight * SkGetPackedG32(c);
- fb += combined_weight * SkGetPackedB32(c);
- fa += combined_weight * SkGetPackedA32(c);
- weight += combined_weight;
- }
- }
-
- fr = SkScalarDiv(fr, weight);
- fg = SkScalarDiv(fg, weight);
- fb = SkScalarDiv(fb, weight);
- fa = SkScalarDiv(fa, weight);
-
- int a = SkClampMax(SkScalarRoundToInt(fa), 255);
- int r = SkClampMax(SkScalarRoundToInt(fr), a);
- int g = SkClampMax(SkScalarRoundToInt(fg), a);
- int b = SkClampMax(SkScalarRoundToInt(fb), a);
-
- *colors++ = SkPackARGB32(a, r, g, b);
-
- x++;
- }
-}
-
-SK_CONF_DECLARE(const char *, c_bitmapFilter, "bitmap.filter", "mitchell", "Which bitmap filter to use [mitchell, sinc, gaussian, triangle, box]");
+SK_CONF_DECLARE(const char *, c_bitmapFilter, "bitmap.filter", "mitchell", "Which scanline bitmap filter to use [mitchell, lanczos, hamming, gaussian, triangle, box]");
-static SkBitmapFilter *allocateBitmapFilter() {
+SkBitmapFilter *SkBitmapFilter::allocate() {
if (!strcmp(c_bitmapFilter, "mitchell")) {
return SkNEW_ARGS(SkMitchellFilter,(1.f/3.f,1.f/3.f));
- } else if (!strcmp(c_bitmapFilter, "sinc")) {
- return SkNEW_ARGS(SkSincFilter,(3));
+ } else if (!strcmp(c_bitmapFilter, "lanczos")) {
+ return SkNEW(SkLanczosFilter);
+ } else if (!strcmp(c_bitmapFilter, "hamming")) {
+ return SkNEW(SkHammingFilter);
} else if (!strcmp(c_bitmapFilter, "gaussian")) {
return SkNEW_ARGS(SkGaussianFilter,(2));
} else if (!strcmp(c_bitmapFilter, "triangle")) {
@@ -168,159 +120,12 @@ SkBitmapProcState::chooseBitmapFilterProc() {
}
if (fInvType & (SkMatrix::kAffine_Mask | SkMatrix::kScale_Mask)) {
- fBitmapFilter = allocateBitmapFilter();
+ fBitmapFilter = SkBitmapFilter::allocate();
reed1 2013/07/19 17:47:23 Static Methods Should Be Capitalized
}
- if (fInvType & SkMatrix::kAffine_Mask) {
+ if (fInvType & SkMatrix::kScale_Mask) {
return highQualityFilter;
- } else if (fInvType & SkMatrix::kScale_Mask) {
- return highQualityFilter_ScaleOnly;
} else {
return NULL;
}
}
-
-static void divideByWeights(SkScalar *sums, SkScalar *weights, SkBitmap *dst) {
- for (int y = 0 ; y < dst->height() ; y++) {
- for (int x = 0 ; x < dst->width() ; x++) {
- SkScalar fr = SkScalarDiv(sums[4*(y*dst->width() + x) + 0], weights[y*dst->width() + x]);
- SkScalar fg = SkScalarDiv(sums[4*(y*dst->width() + x) + 1], weights[y*dst->width() + x]);
- SkScalar fb = SkScalarDiv(sums[4*(y*dst->width() + x) + 2], weights[y*dst->width() + x]);
- SkScalar fa = SkScalarDiv(sums[4*(y*dst->width() + x) + 3], weights[y*dst->width() + x]);
- int a = SkClampMax(SkScalarRoundToInt(fa), 255);
- int r = SkClampMax(SkScalarRoundToInt(fr), a);
- int g = SkClampMax(SkScalarRoundToInt(fg), a);
- int b = SkClampMax(SkScalarRoundToInt(fb), a);
-
- *dst->getAddr32(x,y) = SkPackARGB32(a, r, g, b);
- }
- }
-}
-
-static void upScaleHorizTranspose(const SkBitmap *src, SkBitmap *dst, float scale, SkBitmapFilter *filter) {
- for (int y = 0 ; y < dst->height() ; y++) {
- for (int x = 0 ; x < dst->width() ; x++) {
- float sx = (y + 0.5f) / scale - 0.5f;
- int x0 = SkClampMax(sk_float_ceil2int(sx-filter->width()), src->width()-1);
- int x1 = SkClampMax(sk_float_floor2int(sx+filter->width()), src->width()-1);
-
- SkScalar totalWeight = 0;
- SkScalar fr = 0, fg = 0, fb = 0, fa = 0;
-
- for (int srcX = x0 ; srcX <= x1 ; srcX++) {
- SkScalar weight = filter->lookupScalar(sx - srcX);
- SkPMColor c = *src->getAddr32(srcX, x);
- fr += SkScalarMul(weight,SkGetPackedR32(c));
- fg += SkScalarMul(weight,SkGetPackedG32(c));
- fb += SkScalarMul(weight,SkGetPackedB32(c));
- fa += SkScalarMul(weight,SkGetPackedA32(c));
- totalWeight += weight;
- }
- fr = SkScalarDiv(fr,totalWeight);
- fg = SkScalarDiv(fg,totalWeight);
- fb = SkScalarDiv(fb,totalWeight);
- fa = SkScalarDiv(fa,totalWeight);
-
- int a = SkClampMax(SkScalarRoundToInt(fa), 255);
- int r = SkClampMax(SkScalarRoundToInt(fr), a);
- int g = SkClampMax(SkScalarRoundToInt(fg), a);
- int b = SkClampMax(SkScalarRoundToInt(fb), a);
-
- *dst->getAddr32(x,y) = SkPackARGB32(a, r, g, b);
- }
- }
-}
-
-static void downScaleHoriz(const SkBitmap *src, SkBitmap *dst, float scale, SkBitmapFilter *filter) {
- SkScalar *sums = SkNEW_ARRAY(SkScalar, dst->width() * dst->height() * 4);
- SkScalar *weights = SkNEW_ARRAY(SkScalar, dst->width() * dst->height());
-
- SkAutoTDeleteArray<SkScalar> ada1(sums);
- SkAutoTDeleteArray<SkScalar> ada2(weights);
-
- memset(sums, 0, dst->width() * dst->height() * sizeof(SkScalar) * 4);
- memset(weights, 0, dst->width() * dst->height() * sizeof(SkScalar));
-
- for (int y = 0 ; y < src->height() ; y++) {
- for (int x = 0 ; x < src->width() ; x++) {
- // splat each source pixel into the destination image
- float dx = (x + 0.5f) * scale - 0.5f;
- int x0 = SkClampMax(sk_float_ceil2int(dx-filter->width()), dst->width()-1);
- int x1 = SkClampMax(sk_float_floor2int(dx+filter->width()), dst->width()-1);
-
- SkPMColor c = *src->getAddr32(x,y);
-
- for (int dst_x = x0 ; dst_x <= x1 ; dst_x++) {
- SkScalar weight = filter->lookup(dx - dst_x);
- sums[4*(y*dst->width() + dst_x) + 0] += weight*SkGetPackedR32(c);
- sums[4*(y*dst->width() + dst_x) + 1] += weight*SkGetPackedG32(c);
- sums[4*(y*dst->width() + dst_x) + 2] += weight*SkGetPackedB32(c);
- sums[4*(y*dst->width() + dst_x) + 3] += weight*SkGetPackedA32(c);
- weights[y*dst->width() + dst_x] += weight;
- }
- }
- }
-
- divideByWeights(sums, weights, dst);
-}
-
-static void downScaleVert(const SkBitmap *src, SkBitmap *dst, float scale, SkBitmapFilter *filter) {
- SkScalar *sums = SkNEW_ARRAY(SkScalar, dst->width() * dst->height() * 4);
- SkScalar *weights = SkNEW_ARRAY(SkScalar, dst->width() * dst->height());
-
- SkAutoTDeleteArray<SkScalar> ada1(sums);
- SkAutoTDeleteArray<SkScalar> ada2(weights);
-
- memset(sums, 0, dst->width() * dst->height() * sizeof(SkScalar) * 4);
- memset(weights, 0, dst->width() * dst->height() * sizeof(SkScalar));
-
- for (int y = 0 ; y < src->height() ; y++) {
- for (int x = 0 ; x < src->width() ; x++) {
- // splat each source pixel into the destination image
- float dy = (y + 0.5f) * scale - 0.5f;
- int y0 = SkClampMax(sk_float_ceil2int(dy-filter->width()), dst->height()-1);
- int y1 = SkClampMax(sk_float_ceil2int(dy+filter->width()), dst->height()-1);
-
- SkPMColor c = *src->getAddr32(x,y);
-
- for (int dst_y = y0 ; dst_y <= y1 ; dst_y++) {
- SkScalar weight = filter->lookupScalar(dy - dst_y);
- sums[4*(dst_y*dst->width() + x) + 0] += weight*SkGetPackedR32(c);
- sums[4*(dst_y*dst->width() + x) + 1] += weight*SkGetPackedG32(c);
- sums[4*(dst_y*dst->width() + x) + 2] += weight*SkGetPackedB32(c);
- sums[4*(dst_y*dst->width() + x) + 3] += weight*SkGetPackedA32(c);
- weights[dst_y*dst->width() + x] += weight;
- }
- }
- }
-
- divideByWeights(sums, weights, dst);
-}
-
-void SkBitmap::scale(SkBitmap *dst) const {
-
- SkBitmap horizTemp;
-
- horizTemp.setConfig(SkBitmap::kARGB_8888_Config, height(), dst->width());
- horizTemp.allocPixels();
-
- SkBitmapFilter *filter = allocateBitmapFilter();
-
- float horizScale = float(dst->width()) / width();
-
- if (horizScale >= 1) {
- upScaleHorizTranspose(this, &horizTemp, horizScale, filter);
- } else if (horizScale < 1) {
- downScaleHoriz(this, &horizTemp, horizScale, filter);
- }
-
- float vertScale = float(dst->height()) / height();
-
- if (vertScale >= 1) {
- upScaleHorizTranspose(&horizTemp, dst, vertScale, filter);
- } else if (vertScale < 1) {
- downScaleVert(&horizTemp, dst, vertScale, filter);
- }
-
- SkDELETE(filter);
-}
« src/core/SkBitmapFilter.h ('K') | « src/core/SkBitmapFilter.h ('k') | src/core/SkBitmapProcState.h » ('j') | src/core/SkBitmapScaler.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698