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

Merge "Revert Average3 and Average4"

Browse Source
This commit is contained in:
Vincent Rabaud 2016-12-07 15:38:56 +00:00 committed by Gerrit Code Review
commit 95b12a08ae
1 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/dsp/lossless_sse2.c
View File

@ -99,6 +99,14 @@ static WEBP_INLINE void Average2_uint32(const uint32_t a0, const uint32_t a1,
*avg = _mm_sub_epi8(avg1, one); *avg = _mm_sub_epi8(avg1, one);
} }
static WEBP_INLINE __m128i Average2_uint32_16(uint32_t a0, uint32_t a1) {
const __m128i zero = _mm_setzero_si128();
const __m128i A0 = _mm_unpacklo_epi8(_mm_cvtsi32_si128(a0), zero);
const __m128i A1 = _mm_unpacklo_epi8(_mm_cvtsi32_si128(a1), zero);
const __m128i sum = _mm_add_epi16(A1, A0);
return _mm_srli_epi16(sum, 1);
}
static WEBP_INLINE uint32_t Average2(uint32_t a0, uint32_t a1) { static WEBP_INLINE uint32_t Average2(uint32_t a0, uint32_t a1) {
__m128i output; __m128i output;
Average2_uint32(a0, a1, &output); Average2_uint32(a0, a1, &output);
@ -106,20 +114,25 @@ static WEBP_INLINE uint32_t Average2(uint32_t a0, uint32_t a1) {
} }
static WEBP_INLINE uint32_t Average3(uint32_t a0, uint32_t a1, uint32_t a2) { static WEBP_INLINE uint32_t Average3(uint32_t a0, uint32_t a1, uint32_t a2) {
const __m128i A1 = _mm_cvtsi32_si128(a1); const __m128i zero = _mm_setzero_si128();
__m128i output, avg1; const __m128i avg1 = Average2_uint32_16(a0, a2);
Average2_uint32(a0, a2, &avg1); const __m128i A1 = _mm_unpacklo_epi8(_mm_cvtsi32_si128(a1), zero);
Average2_m128i(&avg1, &A1, &output); const __m128i sum = _mm_add_epi16(avg1, A1);
return _mm_cvtsi128_si32(output); const __m128i avg2 = _mm_srli_epi16(sum, 1);
const __m128i A2 = _mm_packus_epi16(avg2, avg2);
const uint32_t output = _mm_cvtsi128_si32(A2);
return output;
} }
static WEBP_INLINE uint32_t Average4(uint32_t a0, uint32_t a1, static WEBP_INLINE uint32_t Average4(uint32_t a0, uint32_t a1,
uint32_t a2, uint32_t a3) { uint32_t a2, uint32_t a3) {
__m128i avg1, avg2, avg3; const __m128i avg1 = Average2_uint32_16(a0, a1);
Average2_uint32(a0, a1, &avg1); const __m128i avg2 = Average2_uint32_16(a2, a3);
Average2_uint32(a2, a3, &avg2); const __m128i sum = _mm_add_epi16(avg2, avg1);
Average2_m128i(&avg1, &avg2, &avg3); const __m128i avg3 = _mm_srli_epi16(sum, 1);
return _mm_cvtsi128_si32(avg3); const __m128i A0 = _mm_packus_epi16(avg3, avg3);
const uint32_t output = _mm_cvtsi128_si32(A0);
return output;
} }
static uint32_t Predictor5_SSE2(uint32_t left, const uint32_t* const top) { static uint32_t Predictor5_SSE2(uint32_t left, const uint32_t* const top) {