FATE: add a test for the overlay filter

[ffmpeg] / libavcodec / h264dsp.c

diff --git a/libavcodec/h264dsp.c b/libavcodec/h264dsp.c
index ba967079fbabb0c6089ffde4348bd6d944d831d9..b739758e2465bd2dc5517fff76cf20c3cf7106ce 100644 (file)
--- a/libavcodec/h264dsp.c
+++ b/libavcodec/h264dsp.c
@@ -28,6 +28,8 @@
 #include <stdint.h>
 #include "avcodec.h"
 #include "h264dsp.h"
+#include "h264idct.h"
+#include "libavutil/common.h"
 
 #define BIT_DEPTH 8
 #include "h264dsp_template.c"
@@ -41,11 +43,29 @@
 #include "h264dsp_template.c"
 #undef BIT_DEPTH
 
+#define BIT_DEPTH 8
+#include "h264addpx_template.c"
+#undef BIT_DEPTH
+
+#define BIT_DEPTH 16
+#include "h264addpx_template.c"
+#undef BIT_DEPTH
+
 void ff_h264dsp_init(H264DSPContext *c, const int bit_depth, const int chroma_format_idc)
 {
 #undef FUNC
 #define FUNC(a, depth) a ## _ ## depth ## _c
 
+#define ADDPX_DSP(depth) \
+    c->h264_add_pixels4 = FUNC(ff_h264_add_pixels4, depth);\
+    c->h264_add_pixels8 = FUNC(ff_h264_add_pixels8, depth)
+
+    if (bit_depth > 8 && bit_depth <= 16) {
+        ADDPX_DSP(16);
+    } else {
+        ADDPX_DSP(8);
+    }
+
 #define H264_DSP(depth) \
     c->h264_idct_add= FUNC(ff_h264_idct_add, depth);\
     c->h264_idct8_add= FUNC(ff_h264_idct8_add, depth);\
@@ -113,5 +133,5 @@ void ff_h264dsp_init(H264DSPContext *c, const int bit_depth, const int chroma_fo
 
     if (ARCH_ARM) ff_h264dsp_init_arm(c, bit_depth, chroma_format_idc);
     if (HAVE_ALTIVEC) ff_h264dsp_init_ppc(c, bit_depth, chroma_format_idc);
-    if (HAVE_MMX) ff_h264dsp_init_x86(c, bit_depth, chroma_format_idc);
+    if (ARCH_X86) ff_h264dsp_init_x86(c, bit_depth, chroma_format_idc);
 }