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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: src/codec/SkSwizzler.cpp

Issue 947283002: Bmp Image Decoding (Closed) Base URL: https://skia.googlesource.com/skia.git@decode-leon-3
Patch Set: Improved efficiency of ResultAlpha and code sharing Created 5 years, 9 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/codec/SkSwizzler.h ('K') | « src/codec/SkSwizzler.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/codec/SkSwizzler.cpp
diff --git a/src/codec/SkSwizzler.cpp b/src/codec/SkSwizzler.cpp
index 563933f13a03c16e880c2b8132c7df3657fc4868..6115b6f0592a085885890913d032eb79b161bc62 100644
--- a/src/codec/SkSwizzler.cpp
+++ b/src/codec/SkSwizzler.cpp
@@ -9,103 +9,182 @@
#include "SkSwizzler.h"
#include "SkTemplates.h"
-// index
+#define UPDATE_ALPHA(alpha, zeroAlpha, maxAlpha) \
+ zeroAlpha |= (alpha); \
+ maxAlpha &= (alpha);
-#define A32_MASK_IN_PLACE (SkPMColor)(SK_A32_MASK << SK_A32_SHIFT)
+static inline size_t compute_row_bytes(int width, int pixelsPerByte) {
scroggo 2015/03/12 19:58:40 It seems like this is part of the if case of the o
msarett 2015/03/12 21:59:41 Done.
+ return (width + pixelsPerByte - 1) / pixelsPerByte;
+}
+
+inline SkSwizzler::ResultAlpha SkSwizzler::GetResult(uint8_t zeroAlpha,
+ uint8_t maxAlpha) {
+ // In the transparent case, this returns 0x0000
+ // In the opaque case, this returns 0xFFFF
+ // If the row is neither transparent nor opaque, returns something else
+ return (((uint16_t) maxAlpha) << 8) | zeroAlpha;
+}
+
+// kIndex1, kIndex2, kIndex4
+
+static SkSwizzler::ResultAlpha swizzle_small_index_to_n32(
+ void* SK_RESTRICT dstRow, const uint8_t* SK_RESTRICT src, int width,
+ int bitsPerPixel, int y, const SkPMColor ctable[]) {
+
+ SkPMColor* SK_RESTRICT dst = (SkPMColor*) dstRow;
+ uint8_t maxAlpha = SkSwizzler::kMaxAlphaInit;
+ uint8_t zeroAlpha = SkSwizzler::kZeroAlphaInit;
+ const uint32_t pixelsPerByte = 8 / bitsPerPixel;
+ const size_t rowBytes = compute_row_bytes(width, pixelsPerByte);
+ const uint8_t mask = (1 << bitsPerPixel) - 1;
+ int x = 0;
+ for (uint32_t byte = 0; byte < rowBytes; byte++) {
+ uint8_t pixelData = src[byte];
+ for (uint32_t p = 0; p < pixelsPerByte && x < width; p++) {
+ uint8_t index = (pixelData >> (8 - bitsPerPixel)) & mask;
+ SkPMColor c = ctable[index];
+ UPDATE_ALPHA(c >> SK_A32_SHIFT, zeroAlpha, maxAlpha);
+ dst[x] = c;
+ pixelData <<= bitsPerPixel;
+ x++;
+ }
+ }
+ return SkSwizzler::GetResult(zeroAlpha, maxAlpha);
+}
-static bool swizzle_index_to_n32(void* SK_RESTRICT dstRow,
- const uint8_t* SK_RESTRICT src,
- int width, int deltaSrc, int, const SkPMColor ctable[]) {
+// kIndex
+
+static SkSwizzler::ResultAlpha swizzle_index_to_n32(
+ void* SK_RESTRICT dstRow, const uint8_t* SK_RESTRICT src, int width,
+ int bytesPerPixel, int y, const SkPMColor ctable[]) {
SkPMColor* SK_RESTRICT dst = (SkPMColor*)dstRow;
- SkPMColor cc = A32_MASK_IN_PLACE;
+ uint8_t maxAlpha = SkSwizzler::kMaxAlphaInit;
+ uint8_t zeroAlpha = SkSwizzler::kZeroAlphaInit;
for (int x = 0; x < width; x++) {
SkPMColor c = ctable[*src];
- cc &= c;
+ UPDATE_ALPHA(c >> SK_A32_SHIFT, zeroAlpha, maxAlpha);
dst[x] = c;
- src += deltaSrc;
+ src++;
}
- return cc != A32_MASK_IN_PLACE;
+ return SkSwizzler::GetResult(zeroAlpha, maxAlpha);
}
-static bool swizzle_index_to_n32_skipZ(void* SK_RESTRICT dstRow,
- const uint8_t* SK_RESTRICT src,
- int width, int deltaSrc, int,
- const SkPMColor ctable[]) {
+static SkSwizzler::ResultAlpha swizzle_index_to_n32_skipZ(
+ void* SK_RESTRICT dstRow, const uint8_t* SK_RESTRICT src, int width,
+ int bytesPerPixel, int y, const SkPMColor ctable[]) {
SkPMColor* SK_RESTRICT dst = (SkPMColor*)dstRow;
- SkPMColor cc = A32_MASK_IN_PLACE;
+ uint8_t maxAlpha = SkSwizzler::kMaxAlphaInit;
+ uint8_t zeroAlpha = SkSwizzler::kZeroAlphaInit;
for (int x = 0; x < width; x++) {
SkPMColor c = ctable[*src];
- cc &= c;
+ UPDATE_ALPHA(c >> SK_A32_SHIFT, zeroAlpha, maxAlpha);
if (c != 0) {
dst[x] = c;
}
- src += deltaSrc;
+ src++;
}
- return cc != A32_MASK_IN_PLACE;
+ return SkSwizzler::GetResult(zeroAlpha, maxAlpha);
}
#undef A32_MASK_IN_PLACE
+static SkSwizzler::ResultAlpha swizzle_bgrx_to_n32(
+ void* SK_RESTRICT dstRow, const uint8_t* SK_RESTRICT src, int width,
+ int bytesPerPixel, int y, const SkPMColor ctable[]) {
+
+ SkPMColor* SK_RESTRICT dst = (SkPMColor*)dstRow;
+ for (int x = 0; x < width; x++) {
+ dst[x] = SkPackARGB32NoCheck(0xFF, src[2], src[1], src[0]);
+ src += bytesPerPixel;
+ }
+ return SkSwizzler::kOpaque_ResultAlpha;
+}
+
+// kBGRA
+
+static SkSwizzler::ResultAlpha swizzle_bgra_to_n32(
+ void* SK_RESTRICT dstRow, const uint8_t* SK_RESTRICT src, int width,
+ int bytesPerPixel, int y, const SkPMColor ctable[]) {
+
+ SkPMColor* SK_RESTRICT dst = (SkPMColor*)dstRow;
+ uint8_t maxAlpha = SkSwizzler::kMaxAlphaInit;
+ uint8_t zeroAlpha = SkSwizzler::kZeroAlphaInit;
+ for (int x = 0; x < width; x++) {
+ uint8_t alpha = src[3];
+ UPDATE_ALPHA(alpha, zeroAlpha, maxAlpha);
+ dst[x] = SkPackARGB32NoCheck(alpha, src[2], src[1], src[0]);
+ src += bytesPerPixel;
+ }
+ return SkSwizzler::GetResult(zeroAlpha, maxAlpha);
+}
+
// n32
-static bool swizzle_rgbx_to_n32(void* SK_RESTRICT dstRow,
- const uint8_t* SK_RESTRICT src,
- int width, int deltaSrc, int, const SkPMColor[]) {
+static SkSwizzler::ResultAlpha swizzle_rgbx_to_n32(
+ void* SK_RESTRICT dstRow, const uint8_t* SK_RESTRICT src, int width,
+ int bytesPerPixel, int y, const SkPMColor ctable[]) {
+
SkPMColor* SK_RESTRICT dst = (SkPMColor*)dstRow;
for (int x = 0; x < width; x++) {
dst[x] = SkPackARGB32(0xFF, src[0], src[1], src[2]);
- src += deltaSrc;
+ src += bytesPerPixel;
}
- return false;
+ return SkSwizzler::kOpaque_ResultAlpha;
}
-static bool swizzle_rgba_to_n32_premul(void* SK_RESTRICT dstRow,
- const uint8_t* SK_RESTRICT src,
- int width, int deltaSrc, int, const SkPMColor[]) {
+static SkSwizzler::ResultAlpha swizzle_rgba_to_n32_premul(
+ void* SK_RESTRICT dstRow, const uint8_t* SK_RESTRICT src, int width,
+ int bytesPerPixel, int y, const SkPMColor ctable[]) {
+
SkPMColor* SK_RESTRICT dst = (SkPMColor*)dstRow;
- unsigned alphaMask = 0xFF;
+ uint8_t maxAlpha = SkSwizzler::kMaxAlphaInit;
+ uint8_t zeroAlpha = SkSwizzler::kZeroAlphaInit;
for (int x = 0; x < width; x++) {
unsigned alpha = src[3];
+ UPDATE_ALPHA(alpha, zeroAlpha, maxAlpha);
dst[x] = SkPreMultiplyARGB(alpha, src[0], src[1], src[2]);
- src += deltaSrc;
- alphaMask &= alpha;
+ src += bytesPerPixel;
}
- return alphaMask != 0xFF;
+ return SkSwizzler::GetResult(zeroAlpha, maxAlpha);
}
-static bool swizzle_rgba_to_n32_unpremul(void* SK_RESTRICT dstRow,
- const uint8_t* SK_RESTRICT src,
- int width, int deltaSrc, int,
- const SkPMColor[]) {
+static SkSwizzler::ResultAlpha swizzle_rgba_to_n32_unpremul(
+ void* SK_RESTRICT dstRow, const uint8_t* SK_RESTRICT src, int width,
+ int bytesPerPixel, int y, const SkPMColor ctable[]) {
+
uint32_t* SK_RESTRICT dst = reinterpret_cast<uint32_t*>(dstRow);
- unsigned alphaMask = 0xFF;
+ uint8_t maxAlpha = SkSwizzler::kMaxAlphaInit;
+ uint8_t zeroAlpha = SkSwizzler::kZeroAlphaInit;
for (int x = 0; x < width; x++) {
unsigned alpha = src[3];
+ UPDATE_ALPHA(alpha, zeroAlpha, maxAlpha);
dst[x] = SkPackARGB32NoCheck(alpha, src[0], src[1], src[2]);
- src += deltaSrc;
- alphaMask &= alpha;
+ src += bytesPerPixel;
}
- return alphaMask != 0xFF;
+ return SkSwizzler::GetResult(zeroAlpha, maxAlpha);
}
-static bool swizzle_rgba_to_n32_premul_skipZ(void* SK_RESTRICT dstRow,
- const uint8_t* SK_RESTRICT src,
- int width, int deltaSrc, int,
- const SkPMColor[]) {
+static SkSwizzler::ResultAlpha swizzle_rgba_to_n32_premul_skipZ(
+ void* SK_RESTRICT dstRow, const uint8_t* SK_RESTRICT src, int width,
+ int bytesPerPixel, int y, const SkPMColor ctable[]) {
+
SkPMColor* SK_RESTRICT dst = (SkPMColor*)dstRow;
- unsigned alphaMask = 0xFF;
+ uint8_t maxAlpha = SkSwizzler::kMaxAlphaInit;
+ uint8_t zeroAlpha = SkSwizzler::kZeroAlphaInit;
for (int x = 0; x < width; x++) {
unsigned alpha = src[3];
+ UPDATE_ALPHA(alpha, zeroAlpha, maxAlpha);
if (0 != alpha) {
dst[x] = SkPreMultiplyARGB(alpha, src[0], src[1], src[2]);
}
- src += deltaSrc;
- alphaMask &= alpha;
+ src += bytesPerPixel;
}
- return alphaMask != 0xFF;
+ return SkSwizzler::GetResult(zeroAlpha, maxAlpha);
}
+#undef UPDATE_ALPHA
+
/**
FIXME: This was my idea to cheat in order to continue taking advantage of skipping zeroes.
This would be fine for drawing normally, but not for drawing with transfer modes. Being
@@ -114,7 +193,7 @@ static bool swizzle_rgba_to_n32_premul_skipZ(void* SK_RESTRICT dstRow,
decide whether to switch to unpremul default.
static bool swizzle_rgba_to_n32_unpremul_skipZ(void* SK_RESTRICT dstRow,
const uint8_t* SK_RESTRICT src,
- int width, int deltaSrc, int,
+ int width, int bitsPerPixel,
const SkPMColor[]) {
SkPMColor* SK_RESTRICT dst = (SkPMColor*)dstRow;
unsigned alphaMask = 0xFF;
@@ -133,31 +212,61 @@ static bool swizzle_rgba_to_n32_unpremul_skipZ(void* SK_RESTRICT dstRow,
}
*/
-SkSwizzler* SkSwizzler::CreateSwizzler(SkSwizzler::SrcConfig sc, const SkPMColor* ctable,
+SkSwizzler* SkSwizzler::CreateSwizzler(SkSwizzler::SrcConfig sc,
+ const SkPMColor* ctable,
const SkImageInfo& info, void* dst,
size_t dstRowBytes, bool skipZeroes) {
- if (info.colorType() == kUnknown_SkColorType) {
+ if (kUnknown_SkColorType == info.colorType()) {
return NULL;
}
if (info.minRowBytes() > dstRowBytes) {
return NULL;
}
- if (kIndex == sc && NULL == ctable) {
+ if ((kIndex == sc || kIndex4 == sc || kIndex2 == sc || kIndex1 == sc)
+ && NULL == ctable) {
return NULL;
}
RowProc proc = NULL;
switch (sc) {
+ case kIndex1:
+ case kIndex2:
+ case kIndex4:
+ switch (info.colorType()) {
+ case kN32_SkColorType:
+ proc = &swizzle_small_index_to_n32;
+ break;
+ default:
+ break;
+ }
+ break;
case kIndex:
switch (info.colorType()) {
case kN32_SkColorType:
- // We assume the color premultiplied ctable (or not) as desired.
if (skipZeroes) {
proc = &swizzle_index_to_n32_skipZ;
} else {
proc = &swizzle_index_to_n32;
}
break;
-
+ default:
+ break;
+ }
+ break;
+ case kBGR:
+ case kBGRX:
+ switch (info.colorType()) {
+ case kN32_SkColorType:
+ proc = &swizzle_bgrx_to_n32;
+ break;
+ default:
+ break;
+ }
+ break;
+ case kBGRA:
+ switch (info.colorType()) {
+ case kN32_SkColorType:
+ proc = &swizzle_bgra_to_n32;
+ break;
default:
break;
}
@@ -190,32 +299,63 @@ SkSwizzler* SkSwizzler::CreateSwizzler(SkSwizzler::SrcConfig sc, const SkPMColor
break;
}
break;
+ case kRGB:
+ switch (info.colorType()) {
+ case kN32_SkColorType:
+ proc = &swizzle_rgbx_to_n32;
+ break;
+ default:
+ break;
+ }
+ break;
default:
break;
}
if (NULL == proc) {
return NULL;
}
- return SkNEW_ARGS(SkSwizzler, (proc, ctable, BytesPerPixel(sc), info, dst, dstRowBytes));
+ return SkNEW_ARGS(SkSwizzler, (proc, ctable, DeltaSrc(sc), info, dst,
+ dstRowBytes));
}
-SkSwizzler::SkSwizzler(RowProc proc, const SkPMColor* ctable, int srcBpp,
- const SkImageInfo& info, void* dst, size_t rowBytes)
+SkSwizzler::SkSwizzler(RowProc proc, const SkPMColor* ctable,
+ int deltaSrc, const SkImageInfo& info, void* dst,
+ size_t rowBytes)
: fRowProc(proc)
, fColorTable(ctable)
- , fSrcPixelSize(srcBpp)
+ , fDeltaSrc(deltaSrc)
, fDstInfo(info)
, fDstRow(dst)
, fDstRowBytes(rowBytes)
, fCurrY(0)
{
+ SkDEBUGCODE(fNextMode = kUninitialized_NextMode);
}
-bool SkSwizzler::next(const uint8_t* SK_RESTRICT src) {
- SkASSERT(fCurrY < fDstInfo.height());
- const bool hadAlpha = fRowProc(fDstRow, src, fDstInfo.width(), fSrcPixelSize,
- fCurrY, fColorTable);
- fCurrY++;
+SkSwizzler::ResultAlpha SkSwizzler::next(const uint8_t* SK_RESTRICT src) {
+ SkASSERT(0 <= fCurrY && fCurrY < fDstInfo.height());
+ SkASSERT(kDesignateRow_NextMode != fNextMode);
+ SkDEBUGCODE(fNextMode = kConsecutive_NextMode);
+
+ // Decode a row
+ const ResultAlpha result = fRowProc(fDstRow, src, fDstInfo.width(),
+ fDeltaSrc, fCurrY, fColorTable);
+
+ // Move to the next row and return the result
fDstRow = SkTAddOffset<void>(fDstRow, fDstRowBytes);
- return hadAlpha;
+ return result;
+}
+
+SkSwizzler::ResultAlpha SkSwizzler::next(const uint8_t* SK_RESTRICT src,
+ int y) {
+ SkASSERT(0 <= y && y < fDstInfo.height());
+ SkASSERT(kConsecutive_NextMode != fNextMode);
+ SkDEBUGCODE(fNextMode = kDesignateRow_NextMode);
+
+ // Choose the row
+ void* row = SkTAddOffset<void>(fDstRow, y*fDstRowBytes);
+
+ // Decode the row
+ return fRowProc(row, src, fDstInfo.width(), fDeltaSrc, fCurrY,
+ fColorTable);
}
« src/codec/SkSwizzler.h ('K') | « src/codec/SkSwizzler.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698