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

Merge "Small LZ77 speedups."

Browse Source
This commit is contained in:
Pascal Massimino 2016-09-22 12:50:13 +00:00 committed by Gerrit Code Review
commit eee0cce158
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/enc/backward_references.c
View File

@ -247,7 +247,6 @@ int VP8LHashChainFill(VP8LHashChain* const p, int quality,
int low_effort) { int low_effort) {
const int size = xsize * ysize; const int size = xsize * ysize;
const int iter_max = GetMaxItersForQuality(quality); const int iter_max = GetMaxItersForQuality(quality);
const int iter_min = iter_max - quality / 10;
const uint32_t window_size = GetWindowSizeForHashChain(quality, xsize); const uint32_t window_size = GetWindowSizeForHashChain(quality, xsize);
int pos; int pos;
int argb_comp; int argb_comp;
@ -331,6 +330,7 @@ int VP8LHashChainFill(VP8LHashChain* const p, int quality,
int iter = iter_max; int iter = iter_max;
int best_length = 0; int best_length = 0;
uint32_t best_distance = 0; uint32_t best_distance = 0;
uint32_t best_argb;
const int min_pos = const int min_pos =
(base_position > window_size) ? base_position - window_size : 0; (base_position > window_size) ? base_position - window_size : 0;
const int length_max = (max_len < 256) ? max_len : 256; const int length_max = (max_len < 256) ? max_len : 256;
@ -360,26 +360,21 @@ int VP8LHashChainFill(VP8LHashChain* const p, int quality,
// Skip the for loop if we already have the maximum. // Skip the for loop if we already have the maximum.
if (best_length == MAX_LENGTH) pos = min_pos - 1; if (best_length == MAX_LENGTH) pos = min_pos - 1;
} }
best_argb = argb_start[best_length];
for (; pos >= min_pos; pos = chain[pos]) { for (; pos >= min_pos && --iter; pos = chain[pos]) {
int curr_length; int curr_length;
if (--iter < 0) {
break;
}
assert(base_position > (uint32_t)pos); assert(base_position > (uint32_t)pos);
curr_length = if (argb[pos + best_length] != best_argb) continue;
FindMatchLength(argb + pos, argb_start, best_length, max_len);
curr_length = VP8LVectorMismatch(argb + pos, argb_start, max_len);
if (best_length < curr_length) { if (best_length < curr_length) {
best_length = curr_length; best_length = curr_length;
best_distance = base_position - pos; best_distance = base_position - pos;
// Stop if we have reached the maximum length. Otherwise, make sure best_argb = argb_start[best_length];
// we have executed a minimum number of iterations depending on the // Stop if we have reached a good enough length.
// quality. if (best_length >= length_max) break;
if ((best_length == MAX_LENGTH) ||
(curr_length >= length_max && iter < iter_min)) {
break;
}
} }
} }
// We have the best match but in case the two intervals continue matching // We have the best match but in case the two intervals continue matching