dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2024-11-20 12:28:26 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

WEBP_SWAP_16BIT_CSP: remove code dup

Browse Source 
and prepare for potentially supporting both RGBA4444 and BARG4444

Change-Id: If5200289bc6338757a2ceb2df1a19de732595052
This commit is contained in:
skal 2014-02-03 13:24:33 -08:00
parent 1d1cd3bbd6
commit 926ff40229
1 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/dsp/upsampling.c
View File

@ -276,38 +276,40 @@ static WEBP_INLINE uint8_t multiply(uint8_t x, uint32_t m) {
return (x * m) >> 16; return (x * m) >> 16;
} }
static void ApplyAlphaMultiply4444(uint8_t* rgba4444, static WEBP_INLINE void ApplyAlphaMultiply4444(uint8_t* rgba4444,
int w, int h, int stride) { int w, int h, int stride,
int rg_byte_pos /* 0 or 1 */) {
while (h-- > 0) { while (h-- > 0) {
int i; int i;
for (i = 0; i < w; ++i) { for (i = 0; i < w; ++i) {
#ifdef WEBP_SWAP_16BIT_CSP const uint32_t rg = rgba4444[2 * i + rg_byte_pos];
const uint8_t a = (rgba4444[2 * i + 0] & 0x0f); const uint32_t ba = rgba4444[2 * i + (rg_byte_pos ^ 1)];
const uint8_t a = ba & 0x0f;
const uint32_t mult = MULTIPLIER(a); const uint32_t mult = MULTIPLIER(a);
const uint8_t r = multiply(dither_hi(rgba4444[2 * i + 1]), mult); const uint8_t r = multiply(dither_hi(rg), mult);
const uint8_t g = multiply(dither_lo(rgba4444[2 * i + 1]), mult); const uint8_t g = multiply(dither_lo(rg), mult);
const uint8_t b = multiply(dither_hi(rgba4444[2 * i + 0]), mult); const uint8_t b = multiply(dither_hi(ba), mult);
rgba4444[2 * i + 1] = (r & 0xf0) | ((g >> 4) & 0x0f); rgba4444[2 * i + rg_byte_pos] = (r & 0xf0) | ((g >> 4) & 0x0f);
rgba4444[2 * i + 0] = (b & 0xf0) | a; rgba4444[2 * i + (rg_byte_pos ^ 1)] = (b & 0xf0) | a;
#else
const uint8_t a = (rgba4444[2 * i + 1] & 0x0f);
const uint32_t mult = MULTIPLIER(a);
const uint8_t r = multiply(dither_hi(rgba4444[2 * i + 0]), mult);
const uint8_t g = multiply(dither_lo(rgba4444[2 * i + 0]), mult);
const uint8_t b = multiply(dither_hi(rgba4444[2 * i + 1]), mult);
rgba4444[2 * i + 0] = (r & 0xf0) | ((g >> 4) & 0x0f);
rgba4444[2 * i + 1] = (b & 0xf0) | a;
#endif
} }
rgba4444 += stride; rgba4444 += stride;
} }
} }
#undef MULTIPLIER #undef MULTIPLIER
static void ApplyAlphaMultiply_16b(uint8_t* rgba4444,
int w, int h, int stride) {
#ifdef WEBP_SWAP_16BIT_CSP
ApplyAlphaMultiply4444(rgba4444, w, h, stride, 1);
#else
ApplyAlphaMultiply4444(rgba4444, w, h, stride, 0);
#endif
}
void (*WebPApplyAlphaMultiply)(uint8_t*, int, int, int, int) void (*WebPApplyAlphaMultiply)(uint8_t*, int, int, int, int)
= ApplyAlphaMultiply; = ApplyAlphaMultiply;
void (*WebPApplyAlphaMultiply4444)(uint8_t*, int, int, int) void (*WebPApplyAlphaMultiply4444)(uint8_t*, int, int, int)
= ApplyAlphaMultiply4444; = ApplyAlphaMultiply_16b;
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// Main call // Main call
@ -363,7 +365,7 @@ void WebPInitSamplers(void) {
void WebPInitPremultiply(void) { void WebPInitPremultiply(void) {
WebPApplyAlphaMultiply = ApplyAlphaMultiply; WebPApplyAlphaMultiply = ApplyAlphaMultiply;
WebPApplyAlphaMultiply4444 = ApplyAlphaMultiply4444; WebPApplyAlphaMultiply4444 = ApplyAlphaMultiply_16b;
#ifdef FANCY_UPSAMPLING #ifdef FANCY_UPSAMPLING
WebPUpsamplers[MODE_rgbA] = UpsampleRgbaLinePair; WebPUpsamplers[MODE_rgbA] = UpsampleRgbaLinePair;