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

Fix FindMatchLength with non-aligned buffers.

Browse Source 
The 32-bit buffers are actually rarely 64-bit aligned.
The new solution uses memcmp and is alignment agnostic.
It is also slightly faster.

Change-Id: I863003e9ee4ee8a3eed25b7b2478cb82a0ddbb20
This commit is contained in:
Vincent Rabaud 2015-12-04 10:19:58 +01:00
parent a90e1e3f01
commit 010ca3d10d
1 changed files with 16 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/enc/backward_references.c
View File

@ -16,6 +16,7 @@
#include "./backward_references.h" #include "./backward_references.h"
#include "./histogram.h" #include "./histogram.h"
#include "../dsp/lossless.h" #include "../dsp/lossless.h"
#include "../dsp/dsp.h"
#include "../utils/color_cache.h" #include "../utils/color_cache.h"
#include "../utils/utils.h" #include "../utils/utils.h"
@ -56,46 +57,32 @@ static int DistanceToPlaneCode(int xsize, int dist) {
return dist + 120; return dist + 120;
} }
// Returns the exact index where array1 and array2 are different if this
// index is strictly superior to best_len_match. Otherwise, it returns 0.
// If no two elements are the same, it returns max_limit.
static WEBP_INLINE int FindMatchLength(const uint32_t* const array1, static WEBP_INLINE int FindMatchLength(const uint32_t* const array1,
const uint32_t* const array2, const uint32_t* const array2,
int best_len_match, int best_len_match,
int max_limit) { int max_limit) {
#if !defined(__x86_64__) int match_len;
// TODO(vrabaud): Compare on other architectures.
int match_len = 0;
// Before 'expensive' linear match, check if the two arrays match at the // Before 'expensive' linear match, check if the two arrays match at the
// current best length index. // current best length index.
if (array1[best_len_match] != array2[best_len_match]) return 0; if (array1[best_len_match] != array2[best_len_match]) return 0;
#if defined(WEBP_USE_SSE2)
// Check if anything is different up to best_len_match excluded.
// memcmp seems to be slower on ARM so it is disabled for now.
if (memcmp(array1, array2, best_len_match * sizeof(*array1))) return 0;
match_len = best_len_match + 1;
#else
match_len = 0;
#endif
while (match_len < max_limit && array1[match_len] == array2[match_len]) { while (match_len < max_limit && array1[match_len] == array2[match_len]) {
++match_len; ++match_len;
} }
return match_len; return match_len;
#else
const uint32_t* array1_32 = array1;
const uint32_t* array2_32 = array2;
// max value is aligned to (uint64_t*) array1
const uint32_t* const array1_32_max = array1 + (max_limit & ~1);
// Before 'expensive' linear match, check if the two arrays match at the
// current best length index.
if (array1[best_len_match] != array2[best_len_match]) return 0;
// TODO(vrabaud): add __predict_true on bound checking?
while (array1_32 < array1_32_max) {
if (*(uint64_t*)array1_32 == *(uint64_t*)array2_32) {
array1_32 += 2;
array2_32 += 2;
} else {
// if the uint32_t pointed to are the same, then the following ones have
// to be different
return (int)((array1_32 - array1) + (*array1_32 == *array2_32));
}
}
// Deal with the potential last uint32_t.
if ((max_limit & 1) && (*array1_32 != *array2_32)) return max_limit - 1;
return max_limit;
#endif
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------