mirror of
https://github.com/webmproject/libwebp.git
synced 2024-12-26 13:48:21 +01:00
dsp: s/USE_INTRINSICS/WEBP_USE_INTRINSICS/
for consistency with other defines shared across modules Change-Id: I30cdb9f892e9ea48265883f560500ffb1d6799ee
This commit is contained in:
parent
ce73abe054
commit
f8740f0d6c
@ -494,7 +494,7 @@ static void ApplyFilter2(const int8x16_t p0s, const int8x16_t q0s,
|
||||
*oq0 = FlipSignBack(sq0);
|
||||
}
|
||||
|
||||
#if defined(USE_INTRINSICS)
|
||||
#if defined(WEBP_USE_INTRINSICS)
|
||||
|
||||
static void DoFilter2(const uint8x16_t p1, const uint8x16_t p0,
|
||||
const uint8x16_t q0, const uint8x16_t q1,
|
||||
@ -626,7 +626,7 @@ static void SimpleHFilter16(uint8_t* p, int stride, int thresh) {
|
||||
);
|
||||
}
|
||||
|
||||
#endif // USE_INTRINSICS
|
||||
#endif // WEBP_USE_INTRINSICS
|
||||
|
||||
static void SimpleVFilter16i(uint8_t* p, int stride, int thresh) {
|
||||
uint32_t k;
|
||||
@ -986,7 +986,7 @@ static void HFilter8i(uint8_t* u, uint8_t* v, int stride,
|
||||
static const int16_t kC1 = 20091;
|
||||
static const int16_t kC2 = 17734; // half of kC2, actually. See comment above.
|
||||
|
||||
#if defined(USE_INTRINSICS)
|
||||
#if defined(WEBP_USE_INTRINSICS)
|
||||
static WEBP_INLINE void Transpose8x2(const int16x8_t in0, const int16x8_t in1,
|
||||
int16x8x2_t* const out) {
|
||||
// a0 a1 a2 a3 | b0 b1 b2 b3 => a0 b0 c0 d0 | a1 b1 c1 d1
|
||||
@ -1163,7 +1163,7 @@ static void TransformOne(const int16_t* in, uint8_t* dst) {
|
||||
);
|
||||
}
|
||||
|
||||
#endif // USE_INTRINSICS
|
||||
#endif // WEBP_USE_INTRINSICS
|
||||
|
||||
static void TransformTwo(const int16_t* in, uint8_t* dst, int do_two) {
|
||||
TransformOne(in, dst);
|
||||
|
@ -74,7 +74,7 @@ extern "C" {
|
||||
|
||||
#if defined(_MSC_VER) && _MSC_VER >= 1700 && defined(_M_ARM)
|
||||
#define WEBP_USE_NEON
|
||||
#define USE_INTRINSICS
|
||||
#define WEBP_USE_INTRINSICS
|
||||
#endif
|
||||
|
||||
#if defined(__mips__) && !defined(__mips64) && (__mips_isa_rev < 6)
|
||||
|
@ -32,9 +32,9 @@ static const int16_t kC2 = 17734; // half of kC2, actually. See comment above.
|
||||
|
||||
// This code works but is *slower* than the inlined-asm version below
|
||||
// (with gcc-4.6). So we disable it for now. Later, it'll be conditional to
|
||||
// USE_INTRINSICS define.
|
||||
// WEBP_USE_INTRINSICS define.
|
||||
// With gcc-4.8, it's a little faster speed than inlined-assembly.
|
||||
#if defined(USE_INTRINSICS)
|
||||
#if defined(WEBP_USE_INTRINSICS)
|
||||
|
||||
// Treats 'v' as an uint8x8_t and zero extends to an int16x8_t.
|
||||
static WEBP_INLINE int16x8_t ConvertU8ToS16(uint32x2_t v) {
|
||||
@ -241,7 +241,7 @@ static void ITransformOne(const uint8_t* ref,
|
||||
);
|
||||
}
|
||||
|
||||
#endif // USE_INTRINSICS
|
||||
#endif // WEBP_USE_INTRINSICS
|
||||
|
||||
static void ITransform(const uint8_t* ref,
|
||||
const int16_t* in, uint8_t* dst, int do_two) {
|
||||
@ -263,7 +263,7 @@ static uint8x16_t Load4x4(const uint8_t* src) {
|
||||
|
||||
// Forward transform.
|
||||
|
||||
#if defined(USE_INTRINSICS)
|
||||
#if defined(WEBP_USE_INTRINSICS)
|
||||
|
||||
static WEBP_INLINE void Transpose4x4_S16(const int16x4_t A, const int16x4_t B,
|
||||
const int16x4_t C, const int16x4_t D,
|
||||
|
@ -141,7 +141,7 @@ static void ConvertBGRAToRGB(const uint32_t* src,
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
#ifdef USE_INTRINSICS
|
||||
#ifdef WEBP_USE_INTRINSICS
|
||||
|
||||
static WEBP_INLINE uint32_t Average2(const uint32_t* const a,
|
||||
const uint32_t* const b) {
|
||||
@ -295,7 +295,7 @@ static void AddGreenToBlueAndRed(uint32_t* argb_data, int num_pixels) {
|
||||
|
||||
#endif // !__aarch64__
|
||||
|
||||
#endif // USE_INTRINSICS
|
||||
#endif // WEBP_USE_INTRINSICS
|
||||
|
||||
#endif // WEBP_USE_NEON
|
||||
|
||||
@ -309,7 +309,7 @@ WEBP_TSAN_IGNORE_FUNCTION void VP8LDspInitNEON(void) {
|
||||
VP8LConvertBGRAToBGR = ConvertBGRAToBGR;
|
||||
VP8LConvertBGRAToRGB = ConvertBGRAToRGB;
|
||||
|
||||
#ifdef USE_INTRINSICS
|
||||
#ifdef WEBP_USE_INTRINSICS
|
||||
VP8LPredictors[5] = Predictor5;
|
||||
VP8LPredictors[6] = Predictor6;
|
||||
VP8LPredictors[7] = Predictor7;
|
||||
|
@ -19,7 +19,7 @@
|
||||
// Right now, some intrinsics functions seem slower, so we disable them
|
||||
// everywhere except aarch64 where the inline assembly is incompatible.
|
||||
#if defined(__aarch64__)
|
||||
#define USE_INTRINSICS // use intrinsics when possible
|
||||
#define WEBP_USE_INTRINSICS // use intrinsics when possible
|
||||
#endif
|
||||
|
||||
#define INIT_VECTOR2(v, a, b) do { \
|
||||
|
Loading…
Reference in New Issue
Block a user