#include "vp56dsp.h"
#include "libavutil/common.h"
+#define VP56_EDGE_FILTER(pfx, suf, pix_inc, line_inc) \
+static void pfx ## _edge_filter_ ## suf(uint8_t *yuv, ptrdiff_t stride, \
+ int t) \
+{ \
+ int pix2_inc = 2 * pix_inc; \
+ int i, v; \
+ \
+ for (i=0; i<12; i++) { \
+ v = (yuv[-pix2_inc] + 3*(yuv[0]-yuv[-pix_inc]) - yuv[pix_inc] + 4)>>3;\
+ v = pfx##_adjust(v, t); \
+ yuv[-pix_inc] = av_clip_uint8(yuv[-pix_inc] + v); \
+ yuv[0] = av_clip_uint8(yuv[0] - v); \
+ yuv += line_inc; \
+ } \
+}
+
+#if CONFIG_VP5_DECODER
/* Gives very similar result than the vp6 version except in a few cases */
static int vp5_adjust(int v, int t)
{
return v;
}
+
+VP56_EDGE_FILTER(vp5, hor, 1, stride)
+VP56_EDGE_FILTER(vp5, ver, stride, 1)
+
+av_cold void ff_vp5dsp_init(VP56DSPContext *s)
+{
+ s->edge_filter_hor = vp5_edge_filter_hor;
+ s->edge_filter_ver = vp5_edge_filter_ver;
+}
+#endif /* CONFIG_VP5_DECODER */
+
+#if CONFIG_VP6_DECODER
static int vp6_adjust(int v, int t)
{
int V = v, s = v >> 31;
return V;
}
-
-#define VP56_EDGE_FILTER(pfx, suf, pix_inc, line_inc) \
-static void pfx ## _edge_filter_ ## suf(uint8_t *yuv, ptrdiff_t stride, \
- int t) \
-{ \
- int pix2_inc = 2 * pix_inc; \
- int i, v; \
- \
- for (i=0; i<12; i++) { \
- v = (yuv[-pix2_inc] + 3*(yuv[0]-yuv[-pix_inc]) - yuv[pix_inc] + 4)>>3;\
- v = pfx##_adjust(v, t); \
- yuv[-pix_inc] = av_clip_uint8(yuv[-pix_inc] + v); \
- yuv[0] = av_clip_uint8(yuv[0] - v); \
- yuv += line_inc; \
- } \
-}
-
-VP56_EDGE_FILTER(vp5, hor, 1, stride)
-VP56_EDGE_FILTER(vp5, ver, stride, 1)
VP56_EDGE_FILTER(vp6, hor, 1, stride)
VP56_EDGE_FILTER(vp6, ver, stride, 1)
-av_cold void ff_vp56dsp_init(VP56DSPContext *s, enum AVCodecID codec)
+av_cold void ff_vp6dsp_init(VP56DSPContext *s)
{
- if (codec == AV_CODEC_ID_VP5) {
- s->edge_filter_hor = vp5_edge_filter_hor;
- s->edge_filter_ver = vp5_edge_filter_ver;
- } else {
- s->edge_filter_hor = vp6_edge_filter_hor;
- s->edge_filter_ver = vp6_edge_filter_ver;
+ s->edge_filter_hor = vp6_edge_filter_hor;
+ s->edge_filter_ver = vp6_edge_filter_ver;
- if (CONFIG_VP6_DECODER) {
- s->vp6_filter_diag4 = ff_vp6_filter_diag4_c;
+ s->vp6_filter_diag4 = ff_vp6_filter_diag4_c;
- if (ARCH_ARM)
- ff_vp6dsp_init_arm(s, codec);
- if (ARCH_X86)
- ff_vp6dsp_init_x86(s, codec);
- }
- }
+ if (ARCH_ARM)
+ ff_vp6dsp_init_arm(s);
+ if (ARCH_X86)
+ ff_vp6dsp_init_x86(s);
}
+#endif /* CONFIG_VP6_DECODER */
#include <stddef.h>
#include <stdint.h>
-#include "avcodec.h"
-
typedef struct VP56DSPContext {
void (*edge_filter_hor)(uint8_t *yuv, ptrdiff_t stride, int t);
void (*edge_filter_ver)(uint8_t *yuv, ptrdiff_t stride, int t);
void ff_vp6_filter_diag4_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride,
const int16_t *h_weights, const int16_t *v_weights);
-void ff_vp56dsp_init(VP56DSPContext *s, enum AVCodecID codec);
-void ff_vp6dsp_init_arm(VP56DSPContext *s, enum AVCodecID codec);
-void ff_vp6dsp_init_x86(VP56DSPContext* c, enum AVCodecID codec);
+void ff_vp5dsp_init(VP56DSPContext *s);
+void ff_vp6dsp_init(VP56DSPContext *s);
+
+void ff_vp6dsp_init_arm(VP56DSPContext *s);
+void ff_vp6dsp_init_x86(VP56DSPContext *s);
#endif /* AVCODEC_VP56DSP_H */