dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2024-12-27 06:08:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Lossless encoder: correction in Palette storage

Browse Source 
(Essentially, there was no need of a separate 'argb_palette' array. And
argb_palette[0] was never being set).

Change-Id: Id0a8c7e063d3af41e39fc9b8661611b51ccc55cd
This commit is contained in:
Urvang Joshi 2012-04-20 14:43:01 +00:00 committed by James Zern
parent 4a6362357a
commit 4d02d5863f
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/enc/vp8l.c
View File

@ -1068,10 +1068,10 @@ static WebPEncodingError ApplyPalette(VP8LBitWriter* const bw,
WebPEncodingError err = VP8_ENC_OK; WebPEncodingError err = VP8_ENC_OK;
int i; int i;
uint32_t* argb = enc->pic_->argb; uint32_t* argb = enc->pic_->argb;
const uint32_t* const palette = enc->palette_; uint32_t* const palette = enc->palette_;
const int palette_size = enc->palette_size_; const int palette_size = enc->palette_size_;
uint32_t argb_palette[MAX_PALETTE_SIZE];
// Replace each input pixel by corresponding palette index.
for (i = 0; i < width * height; ++i) { for (i = 0; i < width * height; ++i) {
int k; int k;
for (k = 0; k < palette_size; ++k) { for (k = 0; k < palette_size; ++k) {
@ -1082,26 +1082,27 @@ static WebPEncodingError ApplyPalette(VP8LBitWriter* const bw,
} }
} }
} }
// Save palette to bitstream.
VP8LWriteBits(bw, 1, 1); VP8LWriteBits(bw, 1, 1);
VP8LWriteBits(bw, 2, 3); VP8LWriteBits(bw, 2, 3);
VP8LWriteBits(bw, 8, palette_size - 1); VP8LWriteBits(bw, 8, palette_size - 1);
for (i = palette_size - 1; i >= 1; --i) { for (i = palette_size - 1; i >= 1; --i) {
argb_palette[i] = VP8LSubPixels(palette[i], palette[i - 1]); palette[i] = VP8LSubPixels(palette[i], palette[i - 1]);
} }
if (!EncodeImageInternal(bw, argb_palette, palette_size, 1, quality, if (!EncodeImageInternal(bw, palette, palette_size, 1, quality, 0, 0)) {
0, 0)) {
err = VP8_ENC_ERROR_INVALID_CONFIGURATION; err = VP8_ENC_ERROR_INVALID_CONFIGURATION;
goto Error; goto Error;
} }
if (palette_size <= 16) { if (palette_size <= 16) {
// Image can be packed (multiple pixels per uint32_t).
int xbits = 1; int xbits = 1;
if (palette_size <= 2) { if (palette_size <= 2) {
xbits = 3; xbits = 3;
} else if (palette_size <= 4) { } else if (palette_size <= 4) {
xbits = 2; xbits = 2;
} }
// Image can be packed (multiple pixels per uint32).
err = AllocateTransformBuffer(enc, height, VP8LSubSampleSize(width, xbits)); err = AllocateTransformBuffer(enc, height, VP8LSubSampleSize(width, xbits));
if (err != VP8_ENC_OK) goto Error; if (err != VP8_ENC_OK) goto Error;
BundleColorMap(argb, width, height, xbits, enc->argb_, enc->current_width_); BundleColorMap(argb, width, height, xbits, enc->argb_, enc->current_width_);