Merge commit '740b0bf03b4bb8b0a0e964750817ac0363a33c55'
[ffmpeg.git] / libavcodec / x86 / proresdsp_init.c
index a99a938..8ca4d4d 100644 (file)
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/attributes.h"
+#include "libavutil/x86/cpu.h"
+#include "libavcodec/idctdsp.h"
 #include "libavcodec/proresdsp.h"
 
-void ff_prores_idct_put_10_sse2(uint16_t *dst, int linesize,
-                                DCTELEM *block, const int16_t *qmat);
-void ff_prores_idct_put_10_sse4(uint16_t *dst, int linesize,
-                                DCTELEM *block, const int16_t *qmat);
-void ff_prores_idct_put_10_avx (uint16_t *dst, int linesize,
-                                DCTELEM *block, const int16_t *qmat);
+void ff_prores_idct_put_10_sse2(uint16_t *dst, ptrdiff_t linesize,
+                                int16_t *block, const int16_t *qmat);
+void ff_prores_idct_put_10_avx (uint16_t *dst, ptrdiff_t linesize,
+                                int16_t *block, const int16_t *qmat);
 
-void ff_proresdsp_x86_init(ProresDSPContext *dsp, AVCodecContext *avctx)
+av_cold void ff_proresdsp_init_x86(ProresDSPContext *dsp, AVCodecContext *avctx)
 {
-#if ARCH_X86_64 && HAVE_YASM
-    int flags = av_get_cpu_flags();
+#if ARCH_X86_64
+    int cpu_flags = av_get_cpu_flags();
 
-    if(avctx->flags & CODEC_FLAG_BITEXACT)
-        return;
-
-    if (flags & AV_CPU_FLAG_SSE2) {
-        dsp->idct_permutation_type = FF_TRANSPOSE_IDCT_PERM;
+    if (EXTERNAL_SSE2(cpu_flags)) {
+        dsp->idct_permutation_type = FF_IDCT_PERM_TRANSPOSE;
         dsp->idct_put = ff_prores_idct_put_10_sse2;
     }
 
-    if (flags & AV_CPU_FLAG_SSE4) {
-        dsp->idct_permutation_type = FF_TRANSPOSE_IDCT_PERM;
-        dsp->idct_put = ff_prores_idct_put_10_sse4;
-    }
-
-#if HAVE_AVX
-    if (flags & AV_CPU_FLAG_AVX) {
-        dsp->idct_permutation_type = FF_TRANSPOSE_IDCT_PERM;
+    if (EXTERNAL_AVX(cpu_flags)) {
+        dsp->idct_permutation_type = FF_IDCT_PERM_TRANSPOSE;
         dsp->idct_put = ff_prores_idct_put_10_avx;
     }
-#endif /* HAVE_AVX */
-#endif /* ARCH_X86_64 && HAVE_YASM */
+#endif /* ARCH_X86_64 */
 }