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

Merge "speed-up MapToPalette() with binary search"

Browse Source
This commit is contained in:
Pascal Massimino 2016-05-23 14:09:34 +00:00 committed by Gerrit Code Review
commit 0209d7e6d6
1 changed files with 39 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/enc/vp8l.c
View File

@ -1192,8 +1192,35 @@ static WebPEncodingError MakeInputImageCopy(VP8LEncoder* const enc) {
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
static void MapToPalette(const uint32_t palette[], int num_colors, static int SearchColor(const uint32_t sorted[], uint32_t color, int hi) {
int low = 0;
if (sorted[low] == color) return low; // loop invariant: sorted[low] != color
while (1) {
const int mid = (low + hi) >> 1;
if (sorted[mid] == color) {
return mid;
} else if (sorted[mid] < color) {
low = mid;
} else {
hi = mid;
}
}
}
// Sort palette in increasing order and prepare an inverse mapping array.
static void PrepareMapToPalette(const uint32_t palette[], int num_colors,
uint32_t sorted[], int idx_map[]) {
int i;
memcpy(sorted, palette, num_colors * sizeof(*sorted));
qsort(sorted, num_colors, sizeof(*sorted), PaletteCompareColorsForQsort);
for (i = 0; i < num_colors; ++i) {
idx_map[SearchColor(sorted, palette[i], num_colors)] = i;
}
}
static void MapToPalette(const uint32_t sorted_palette[], int num_colors,
uint32_t* const last_pix, int* const last_idx, uint32_t* const last_pix, int* const last_idx,
const int idx_map[],
const uint32_t* src, uint8_t* dst, int width) { const uint32_t* src, uint8_t* dst, int width) {
int x; int x;
int prev_idx = *last_idx; int prev_idx = *last_idx;
@ -1201,14 +1228,8 @@ static void MapToPalette(const uint32_t palette[], int num_colors,
for (x = 0; x < width; ++x) { for (x = 0; x < width; ++x) {
const uint32_t pix = src[x]; const uint32_t pix = src[x];
if (pix != prev_pix) { if (pix != prev_pix) {
int i; prev_idx = idx_map[SearchColor(sorted_palette, pix, num_colors)];
for (i = 0; i < num_colors; ++i) { prev_pix = pix;
if (pix == palette[i]) {
prev_idx = i;
prev_pix = pix;
break;
}
}
} }
dst[x] = prev_idx; dst[x] = prev_idx;
} }
@ -1255,11 +1276,16 @@ static WebPEncodingError ApplyPalette(const uint32_t* src, uint32_t src_stride,
} }
} else { } else {
// Use 1 pixel cache for ARGB pixels. // Use 1 pixel cache for ARGB pixels.
uint32_t last_pix = palette[0]; uint32_t last_pix;
int last_idx = 0; int last_idx;
uint32_t sorted[MAX_PALETTE_SIZE];
int idx_map[MAX_PALETTE_SIZE];
PrepareMapToPalette(palette, palette_size, sorted, idx_map);
last_pix = palette[0];
last_idx = 0;
for (y = 0; y < height; ++y) { for (y = 0; y < height; ++y) {
MapToPalette(palette, palette_size, &last_pix, &last_idx, MapToPalette(sorted, palette_size, &last_pix, &last_idx,
src, tmp_row, width); idx_map, src, tmp_row, width);
VP8LBundleColorMap(tmp_row, width, xbits, dst); VP8LBundleColorMap(tmp_row, width, xbits, dst);
src += src_stride; src += src_stride;
dst += dst_stride; dst += dst_stride;