diff options
author | Vignesh Venkatasubramanian <vigneshv@google.com> | 2022-08-02 13:26:21 -0700 |
---|---|---|
committer | Vignesh Venkatasubramanian <vigneshv@google.com> | 2022-08-25 13:27:22 -0700 |
commit | 51738d52b6c91d4573b75f6483dd045d0affc00b (patch) | |
tree | e8cf5f7cdc94a5abfe84a758a4245d7269b65f8f /files/include/libyuv/compare_row.h | |
parent | fe33d276d689446c03db3f1f761797b01aa06e1f (diff) | |
download | libyuv-51738d52b6c91d4573b75f6483dd045d0affc00b.tar.gz |
Update external/libyuv to r1837
Update external/libyuv to version r1837 (d53f1bee) from upstream.
This brings in some new functions that will be used by libavif.
Also update README.version with local modifications. The files/
subdirectory is a pristine copy of the upstream checkout except
for the local modifications that are listed in README.version.
Bug: b/241008246
Bug: b/228492909
Test: Builds. Media and Camera CTS tests pass.
Merged-In: I1bd041e475666e13fafd8c3792d7142a022d435a
Change-Id: I85df21181e582ff835aab1e9ef13ad3ac8421d30
Diffstat (limited to 'files/include/libyuv/compare_row.h')
-rw-r--r-- | files/include/libyuv/compare_row.h | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/files/include/libyuv/compare_row.h b/files/include/libyuv/compare_row.h index e95b9d93..d8e82d72 100644 --- a/files/include/libyuv/compare_row.h +++ b/files/include/libyuv/compare_row.h @@ -55,20 +55,20 @@ extern "C" { // The following are available for Visual C and clangcl 32 bit: #if !defined(LIBYUV_DISABLE_X86) && defined(_M_IX86) && defined(_MSC_VER) && \ + !defined(__clang__) && \ (defined(VISUALC_HAS_AVX2) || defined(CLANG_HAS_AVX2)) #define HAS_HASHDJB2_AVX2 #define HAS_SUMSQUAREERROR_AVX2 #endif -// The following are available for GCC and clangcl 64 bit: -#if !defined(LIBYUV_DISABLE_X86) && \ - (defined(__x86_64__) || (defined(__i386__) && !defined(_MSC_VER))) +// The following are available for GCC and clangcl: +#if !defined(LIBYUV_DISABLE_X86) && (defined(__x86_64__) || defined(__i386__)) #define HAS_HAMMINGDISTANCE_SSSE3 #endif -// The following are available for GCC and clangcl 64 bit: +// The following are available for GCC and clangcl: #if !defined(LIBYUV_DISABLE_X86) && defined(CLANG_HAS_AVX2) && \ - (defined(__x86_64__) || (defined(__i386__) && !defined(_MSC_VER))) + (defined(__x86_64__) || defined(__i386__)) #define HAS_HAMMINGDISTANCE_AVX2 #endif @@ -84,11 +84,6 @@ extern "C" { #define HAS_SUMSQUAREERROR_MSA #endif -#if !defined(LIBYUV_DISABLE_MMI) && defined(_MIPS_ARCH_LOONGSON3A) -#define HAS_HAMMINGDISTANCE_MMI -#define HAS_SUMSQUAREERROR_MMI -#endif - uint32_t HammingDistance_C(const uint8_t* src_a, const uint8_t* src_b, int count); @@ -107,9 +102,6 @@ uint32_t HammingDistance_NEON(const uint8_t* src_a, uint32_t HammingDistance_MSA(const uint8_t* src_a, const uint8_t* src_b, int count); -uint32_t HammingDistance_MMI(const uint8_t* src_a, - const uint8_t* src_b, - int count); uint32_t SumSquareError_C(const uint8_t* src_a, const uint8_t* src_b, int count); @@ -125,9 +117,6 @@ uint32_t SumSquareError_NEON(const uint8_t* src_a, uint32_t SumSquareError_MSA(const uint8_t* src_a, const uint8_t* src_b, int count); -uint32_t SumSquareError_MMI(const uint8_t* src_a, - const uint8_t* src_b, - int count); uint32_t HashDjb2_C(const uint8_t* src, int count, uint32_t seed); uint32_t HashDjb2_SSE41(const uint8_t* src, int count, uint32_t seed); |