diff options
author | Ronald S. Bultje <rsbultje@gmail.com> | 2010-12-28 20:37:19 +0300 |
---|---|---|
committer | Ronald S. Bultje <rsbultje@gmail.com> | 2010-12-28 20:37:19 +0300 |
commit | ee555de7dd54b280234ab5e0f45cacd792433983 (patch) | |
tree | 4c58942b3e38cb6085d334ba158de0b57092177c /libavcodec/h264pred.h | |
parent | b59dd1ea4f39c8d5a7efb51ef378f810c0279c09 (diff) |
Support CODEC_FLAG_EMU_EDGE in VP8 decoder.
Originally committed as revision 26117 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/h264pred.h')
-rw-r--r-- | libavcodec/h264pred.h | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/libavcodec/h264pred.h b/libavcodec/h264pred.h index b7fd2a2b7a..a492ae0ecc 100644 --- a/libavcodec/h264pred.h +++ b/libavcodec/h264pred.h @@ -45,29 +45,45 @@ #define VERT_LEFT_PRED 7 #define HOR_UP_PRED 8 +// DC edge (not for VP8) #define LEFT_DC_PRED 9 #define TOP_DC_PRED 10 #define DC_128_PRED 11 -#define TM_VP8_PRED 9 ///< "True Motion", used instead of plane - +// RV40 specific #define DIAG_DOWN_LEFT_PRED_RV40_NODOWN 12 #define HOR_UP_PRED_RV40_NODOWN 13 #define VERT_LEFT_PRED_RV40_NODOWN 14 +// VP8 specific +#define TM_VP8_PRED 9 ///< "True Motion", used instead of plane +#define VERT_VP8_PRED 10 ///< for VP8, #VERT_PRED is the average of + ///< (left col+cur col x2+right col) / 4; + ///< this is the "unaveraged" one +#define HOR_VP8_PRED 11 ///< unaveraged version of #HOR_PRED, see + ///< #VERT_VP8_PRED for details +#define DC_127_PRED 12 +#define DC_129_PRED 13 + #define DC_PRED8x8 0 #define HOR_PRED8x8 1 #define VERT_PRED8x8 2 #define PLANE_PRED8x8 3 +// DC edge #define LEFT_DC_PRED8x8 4 #define TOP_DC_PRED8x8 5 #define DC_128_PRED8x8 6 +// H264/SVQ3 (8x8) specific #define ALZHEIMER_DC_L0T_PRED8x8 7 #define ALZHEIMER_DC_0LT_PRED8x8 8 #define ALZHEIMER_DC_L00_PRED8x8 9 #define ALZHEIMER_DC_0L0_PRED8x8 10 + +// VP8 specific +#define DC_127_PRED8x8 7 +#define DC_129_PRED8x8 8 //@} /** @@ -77,7 +93,7 @@ typedef struct H264PredContext{ void (*pred4x4 [9+3+3])(uint8_t *src, const uint8_t *topright, int stride);//FIXME move to dsp? void (*pred8x8l [9+3])(uint8_t *src, int topleft, int topright, int stride); void (*pred8x8 [4+3+4])(uint8_t *src, int stride); - void (*pred16x16[4+3])(uint8_t *src, int stride); + void (*pred16x16[4+3+2])(uint8_t *src, int stride); void (*pred4x4_add [2])(uint8_t *pix/*align 4*/, const DCTELEM *block/*align 16*/, int stride); void (*pred8x8l_add [2])(uint8_t *pix/*align 8*/, const DCTELEM *block/*align 16*/, int stride); |