diff options
| author | James Almer <jamrial@gmail.com> | 2015-01-19 09:59:51 +0300 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2017-08-04 20:16:46 +0300 |
| commit | 7bea70f89d4163a776e9606a1d8082e83535dbc7 (patch) | |
| tree | 11e0b2580139381ef19c315696e2148f47adc9f2 | |
| parent | 6e7e29f5ab04ba28f5773979cf395c3768a8bd60 (diff) | |
x86/hevc: correctly mark intrapred functions as SSE4
No SSE4.2 intrinsics are being used
| -rw-r--r-- | libavcodec/x86/hevc_intra_intrinsic.c | 10 | ||||
| -rw-r--r-- | libavcodec/x86/hevcdsp_init.c | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/x86/hevc_intra_intrinsic.c b/libavcodec/x86/hevc_intra_intrinsic.c index 40e44d9f59..3a8a331ed9 100644 --- a/libavcodec/x86/hevc_intra_intrinsic.c +++ b/libavcodec/x86/hevc_intra_intrinsic.c @@ -7,7 +7,7 @@ #ifdef __GNUC__ #pragma GCC push_options -#pragma GCC target("sse4.2") +#pragma GCC target("sse4.1") #endif #if HAVE_SSE2 @@ -16,11 +16,11 @@ #if HAVE_SSSE3 #include <tmmintrin.h> #endif -#if HAVE_SSE42 +#if HAVE_SSE4 #include <smmintrin.h> #endif -#if HAVE_SSE42 +#if HAVE_SSE4 #define _MM_PACKUS_EPI32 _mm_packus_epi32 #else static av_always_inline __m128i _MM_PACKUS_EPI32( __m128i a, __m128i b ) @@ -37,7 +37,7 @@ static av_always_inline __m128i _MM_PACKUS_EPI32( __m128i a, __m128i b ) //////////////////////////////////////////////////////////////////////////////// // //////////////////////////////////////////////////////////////////////////////// -#if HAVE_SSE42 +#if HAVE_SSE4 #define PLANAR_INIT_8() \ uint8_t *src = (uint8_t*)_src; \ const uint8_t *top = (const uint8_t*)_top; \ @@ -634,7 +634,7 @@ PRED_PLANAR_3(10) //////////////////////////////////////////////////////////////////////////////// // //////////////////////////////////////////////////////////////////////////////// -#if HAVE_SSE42 +#if HAVE_SSE4 #define ANGULAR_COMPUTE_10(W) \ for (x = 0; x < W; x += 4) { \ r3 = _mm_set1_epi32((fact << 16) + (32 - fact)); \ diff --git a/libavcodec/x86/hevcdsp_init.c b/libavcodec/x86/hevcdsp_init.c index 418dd478f0..b6ded8f133 100644 --- a/libavcodec/x86/hevcdsp_init.c +++ b/libavcodec/x86/hevcdsp_init.c @@ -1192,12 +1192,12 @@ void ff_hevc_pred_init_x86(HEVCPredContext *hpc, int bit_depth) int mm_flags = av_get_cpu_flags(); if (bit_depth == 8) { - if (HAVE_SSE42 && EXTERNAL_SSE42(mm_flags)) { + if (EXTERNAL_SSE4(mm_flags)) { HEVC_PRED(8); } } if (bit_depth == 10) { - if (HAVE_SSE42 && EXTERNAL_SSE42(mm_flags)) { + if (EXTERNAL_SSE4(mm_flags)) { HEVC_PRED(10); } } |