forked from mirrors/gecko-dev
Bug 1891457 - Reapply mozilla patches on top of libaom. r=media-playback-reviewers,alwu
Depends on D207745 Differential Revision: https://phabricator.services.mozilla.com/D207746
This commit is contained in:
parent
341cd252bd
commit
40a2e2c293
3 changed files with 28 additions and 0 deletions
11
third_party/aom/aom_dsp/x86/synonyms.h
vendored
11
third_party/aom/aom_dsp/x86/synonyms.h
vendored
|
|
@ -46,12 +46,23 @@ static INLINE __m128i xx_loadu_128(const void *a) {
|
|||
return _mm_loadu_si128((const __m128i *)a);
|
||||
}
|
||||
|
||||
// _mm_loadu_si64 has been introduced in GCC 9, reimplement the function
|
||||
// manually on older compilers.
|
||||
#if !defined(__clang__) && __GNUC_MAJOR__ < 9
|
||||
static INLINE __m128i xx_loadu_2x64(const void *hi, const void *lo) {
|
||||
__m64 hi_, lo_;
|
||||
memcpy(&hi_, hi, sizeof(hi_));
|
||||
memcpy(&lo_, lo, sizeof(lo_));
|
||||
return _mm_set_epi64(hi_, lo_);
|
||||
}
|
||||
#else
|
||||
// Load 64 bits from each of hi and low, and pack into an SSE register
|
||||
// Since directly loading as `int64_t`s and using _mm_set_epi64 may violate
|
||||
// the strict aliasing rule, this takes a different approach
|
||||
static INLINE __m128i xx_loadu_2x64(const void *hi, const void *lo) {
|
||||
return _mm_unpacklo_epi64(_mm_loadu_si64(lo), _mm_loadu_si64(hi));
|
||||
}
|
||||
#endif
|
||||
|
||||
static INLINE void xx_storel_32(void *const a, const __m128i v) {
|
||||
const int val = _mm_cvtsi128_si32(v);
|
||||
|
|
|
|||
15
third_party/aom/aom_dsp/x86/synonyms_avx2.h
vendored
15
third_party/aom/aom_dsp/x86/synonyms_avx2.h
vendored
|
|
@ -71,11 +71,26 @@ static INLINE __m256i yy_set_m128i(__m128i hi, __m128i lo) {
|
|||
return _mm256_insertf128_si256(_mm256_castsi128_si256(lo), hi, 1);
|
||||
}
|
||||
|
||||
#define GCC_VERSION (__GNUC__ * 10000 \
|
||||
+ __GNUC_MINOR__ * 100 \
|
||||
+ __GNUC_PATCHLEVEL__)
|
||||
|
||||
// _mm256_loadu2_m128i has been introduced in GCC 10.1
|
||||
#if !defined(__clang__) && GCC_VERSION < 101000
|
||||
static INLINE __m256i yy_loadu2_128(const void *hi, const void *lo) {
|
||||
__m128i mhi = _mm_loadu_si128((const __m128i *)(hi));
|
||||
__m128i mlo = _mm_loadu_si128((const __m128i *)(lo));
|
||||
return _mm256_set_m128i(mhi, mlo);
|
||||
}
|
||||
#else
|
||||
static INLINE __m256i yy_loadu2_128(const void *hi, const void *lo) {
|
||||
__m128i mhi = _mm_loadu_si128((const __m128i *)(hi));
|
||||
__m128i mlo = _mm_loadu_si128((const __m128i *)(lo));
|
||||
return yy_set_m128i(mhi, mlo);
|
||||
}
|
||||
#endif
|
||||
|
||||
#undef GCC_VERSION
|
||||
|
||||
static INLINE void yy_storeu2_128(void *hi, void *lo, const __m256i a) {
|
||||
_mm_storeu_si128((__m128i *)hi, _mm256_extracti128_si256(a, 1));
|
||||
|
|
|
|||
2
third_party/aom/aom_util/aom_pthread.h
vendored
2
third_party/aom/aom_util/aom_pthread.h
vendored
|
|
@ -36,6 +36,8 @@ typedef HANDLE pthread_t;
|
|||
typedef int pthread_attr_t;
|
||||
typedef CRITICAL_SECTION pthread_mutex_t;
|
||||
|
||||
#include <errno.h>
|
||||
|
||||
#if _WIN32_WINNT < 0x0600
|
||||
#error _WIN32_WINNT must target Windows Vista / Server 2008 or newer.
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Reference in a new issue