summaryrefslogtreecommitdiff
path: root/libavcodec/vp56.h
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2010-04-30 21:30:22 +0000
committerMåns Rullgård <mans@mansr.com>2010-04-30 21:30:22 +0000
commit5e1ba34bbba7b50c45ef0d10350fe01a3cf63290 (patch)
tree08673c61fff9f1ff3efd5a17e2a2b44c65633711 /libavcodec/vp56.h
parentff866063e981ea6a51036c2ffd9bb152b8219437 (diff)
downloadffmpeg-5e1ba34bbba7b50c45ef0d10350fe01a3cf63290.tar.gz
VP56: move vp56_edge_filter to new VP56DSPContext
Using macro templates allows the vp[56]_adjust functions to be inlined instead of called through function pointers. The new function pointers enable optimised implementations of the filters. 4% faster VP6 decoding on Cortex-A8. Originally committed as revision 22992 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/vp56.h')
-rw-r--r--libavcodec/vp56.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/vp56.h b/libavcodec/vp56.h
index 2d9e2d81b1..89eba0563e 100644
--- a/libavcodec/vp56.h
+++ b/libavcodec/vp56.h
@@ -28,14 +28,13 @@
#include "dsputil.h"
#include "get_bits.h"
#include "bytestream.h"
-
+#include "vp56dsp.h"
typedef struct vp56_context VP56Context;
typedef struct vp56_mv VP56mv;
typedef void (*VP56ParseVectorAdjustment)(VP56Context *s,
VP56mv *vect);
-typedef int (*VP56Adjust)(int v, int t);
typedef void (*VP56Filter)(VP56Context *s, uint8_t *dst, uint8_t *src,
int offset1, int offset2, int stride,
VP56mv mv, int mask, int select, int luma);
@@ -90,6 +89,7 @@ typedef struct {
struct vp56_context {
AVCodecContext *avctx;
DSPContext dsp;
+ VP56DSPContext vp56dsp;
ScanTable scantable;
AVFrame frames[4];
AVFrame *framep[6];
@@ -149,7 +149,6 @@ struct vp56_context {
const uint8_t *vp56_coord_div;
VP56ParseVectorAdjustment parse_vector_adjustment;
- VP56Adjust adjust;
VP56Filter filter;
VP56ParseCoeff parse_coeff;
VP56DefaultModelsInit default_models_init;