#include "libavutil/common.h"
#include "libavutil/internal.h"
#include "libavutil/intreadwrite.h"
+#include "libavutil/mem_internal.h"
static const uint32_t pixel_mask[3] = { 0xffffffff, 0x01ff01ff, 0x03ff03ff };
static const uint32_t pixel_mask_lf[3] = { 0xff0fff0f, 0x01ff000f, 0x03ff000f };
c = c*9/10;
}
-#define CHECK_LOOP_FILTER(name, align, ...) \
+#define CHECK_LOOP_FILTER(name, align, idc) \
do { \
- if (check_func(h.name, #name "_%dbpp", bit_depth)) { \
+ if (check_func(h.name, #name #idc "_%dbpp", bit_depth)) { \
for (j = 0; j < 36; j++) { \
intptr_t off = 8 * 32 + (j & 15) * 4 * !align; \
for (i = 0; i < 1024; i+=4) { \
call_ref(dst0 + off, 32, alphas[j], betas[j], tc0[j]); \
call_new(dst1 + off, 32, alphas[j], betas[j], tc0[j]); \
if (memcmp(dst0, dst1, 32 * 16 * SIZEOF_PIXEL)) { \
- fprintf(stderr, #name ": j:%d, alpha:%d beta:%d " \
+ fprintf(stderr, #name #idc ": j:%d, alpha:%d beta:%d " \
"tc0:{%d,%d,%d,%d}\n", j, alphas[j], betas[j], \
tc0[j][0], tc0[j][1], tc0[j][2], tc0[j][3]); \
fail(); \
} \
} while (0)
- CHECK_LOOP_FILTER(h264_v_loop_filter_luma, 1);
- CHECK_LOOP_FILTER(h264_h_loop_filter_luma, 0);
- CHECK_LOOP_FILTER(h264_h_loop_filter_luma_mbaff, 0);
- CHECK_LOOP_FILTER(h264_v_loop_filter_chroma, 1);
- CHECK_LOOP_FILTER(h264_h_loop_filter_chroma, 0);
- CHECK_LOOP_FILTER(h264_h_loop_filter_chroma_mbaff, 0);
+ CHECK_LOOP_FILTER(h264_v_loop_filter_luma, 1,);
+ CHECK_LOOP_FILTER(h264_h_loop_filter_luma, 0,);
+ CHECK_LOOP_FILTER(h264_h_loop_filter_luma_mbaff, 0,);
+ CHECK_LOOP_FILTER(h264_v_loop_filter_chroma, 1,);
+ CHECK_LOOP_FILTER(h264_h_loop_filter_chroma, 0,);
+ CHECK_LOOP_FILTER(h264_h_loop_filter_chroma_mbaff, 0,);
+
+ ff_h264dsp_init(&h, bit_depth, 2);
+ CHECK_LOOP_FILTER(h264_h_loop_filter_chroma, 0, 422);
+ CHECK_LOOP_FILTER(h264_h_loop_filter_chroma_mbaff, 0, 422);
#undef CHECK_LOOP_FILTER
}
}
a = a*9/10;
}
-#define CHECK_LOOP_FILTER(name, align) \
+#define CHECK_LOOP_FILTER(name, align, idc) \
do { \
- if (check_func(h.name, #name "_%dbpp", bit_depth)) { \
+ if (check_func(h.name, #name #idc "_%dbpp", bit_depth)) { \
for (j = 0; j < 36; j++) { \
intptr_t off = 8 * 32 + (j & 15) * 4 * !align; \
for (i = 0; i < 1024; i+=4) { \
call_ref(dst0 + off, 32, alphas[j], betas[j]); \
call_new(dst1 + off, 32, alphas[j], betas[j]); \
if (memcmp(dst0, dst1, 32 * 16 * SIZEOF_PIXEL)) { \
- fprintf(stderr, #name ": j:%d, alpha:%d beta:%d\n", \
+ fprintf(stderr, #name #idc ": j:%d, alpha:%d beta:%d\n", \
j, alphas[j], betas[j]); \
fail(); \
} \
} \
} while (0)
- CHECK_LOOP_FILTER(h264_v_loop_filter_luma_intra, 1);
- CHECK_LOOP_FILTER(h264_h_loop_filter_luma_intra, 0);
- CHECK_LOOP_FILTER(h264_h_loop_filter_luma_mbaff_intra, 0);
- CHECK_LOOP_FILTER(h264_v_loop_filter_chroma_intra, 1);
- CHECK_LOOP_FILTER(h264_h_loop_filter_chroma_intra, 0);
- CHECK_LOOP_FILTER(h264_h_loop_filter_chroma_mbaff_intra, 0);
+ CHECK_LOOP_FILTER(h264_v_loop_filter_luma_intra, 1,);
+ CHECK_LOOP_FILTER(h264_h_loop_filter_luma_intra, 0,);
+ CHECK_LOOP_FILTER(h264_h_loop_filter_luma_mbaff_intra, 0,);
+ CHECK_LOOP_FILTER(h264_v_loop_filter_chroma_intra, 1,);
+ CHECK_LOOP_FILTER(h264_h_loop_filter_chroma_intra, 0,);
+ CHECK_LOOP_FILTER(h264_h_loop_filter_chroma_mbaff_intra, 0,);
+
+ ff_h264dsp_init(&h, bit_depth, 2);
+ CHECK_LOOP_FILTER(h264_h_loop_filter_chroma_intra, 0, 422);
+ CHECK_LOOP_FILTER(h264_h_loop_filter_chroma_mbaff_intra, 0, 422);
#undef CHECK_LOOP_FILTER
}
}