diff options
| author | trav90 <travawine@palemoon.org> | 2018-09-30 10:40:30 -0500 |
|---|---|---|
| committer | trav90 <travawine@palemoon.org> | 2018-09-30 10:40:30 -0500 |
| commit | edc124b92beccd55e5277062e95efb62a8b3ec7b (patch) | |
| tree | 3486b32f85152ff76b1bee03a8d84b3c34c70a5f /media/ffvpx/libavutil/x86/cpu.c | |
| parent | 8ba6dd1bd12a3d13f9e2c683216dd8778011a72e (diff) | |
| download | UXP-edc124b92beccd55e5277062e95efb62a8b3ec7b.tar UXP-edc124b92beccd55e5277062e95efb62a8b3ec7b.tar.gz UXP-edc124b92beccd55e5277062e95efb62a8b3ec7b.tar.lz UXP-edc124b92beccd55e5277062e95efb62a8b3ec7b.tar.xz UXP-edc124b92beccd55e5277062e95efb62a8b3ec7b.zip | |
[ffvpx] Update ffvp9/ffvp8 to release 4.0.2
Diffstat (limited to 'media/ffvpx/libavutil/x86/cpu.c')
| -rw-r--r-- | media/ffvpx/libavutil/x86/cpu.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/media/ffvpx/libavutil/x86/cpu.c b/media/ffvpx/libavutil/x86/cpu.c index f33088c8c..aca893174 100644 --- a/media/ffvpx/libavutil/x86/cpu.c +++ b/media/ffvpx/libavutil/x86/cpu.c @@ -97,6 +97,7 @@ int ff_get_cpu_flags_x86(void) int max_std_level, max_ext_level, std_caps = 0, ext_caps = 0; int family = 0, model = 0; union { int i[3]; char c[12]; } vendor; + int xcr0_lo = 0, xcr0_hi = 0; if (!cpuid_test()) return 0; /* CPUID not supported */ @@ -132,8 +133,8 @@ int ff_get_cpu_flags_x86(void) /* Check OXSAVE and AVX bits */ if ((ecx & 0x18000000) == 0x18000000) { /* Check for OS support */ - xgetbv(0, eax, edx); - if ((eax & 0x6) == 0x6) { + xgetbv(0, xcr0_lo, xcr0_hi); + if ((xcr0_lo & 0x6) == 0x6) { rval |= AV_CPU_FLAG_AVX; if (ecx & 0x00001000) rval |= AV_CPU_FLAG_FMA3; @@ -147,6 +148,13 @@ int ff_get_cpu_flags_x86(void) #if HAVE_AVX2 if ((rval & AV_CPU_FLAG_AVX) && (ebx & 0x00000020)) rval |= AV_CPU_FLAG_AVX2; +#if HAVE_AVX512 /* F, CD, BW, DQ, VL */ + if ((xcr0_lo & 0xe0) == 0xe0) { /* OPMASK/ZMM state */ + if ((rval & AV_CPU_FLAG_AVX2) && (ebx & 0xd0030000) == 0xd0030000) + rval |= AV_CPU_FLAG_AVX512; + + } +#endif /* HAVE_AVX512 */ #endif /* HAVE_AVX2 */ /* BMI1/2 don't need OS support */ if (ebx & 0x00000008) { @@ -238,6 +246,8 @@ size_t ff_get_cpu_max_align_x86(void) { int flags = av_get_cpu_flags(); + if (flags & AV_CPU_FLAG_AVX512) + return 64; if (flags & (AV_CPU_FLAG_AVX2 | AV_CPU_FLAG_AVX | AV_CPU_FLAG_XOP | |