Mercurial > libavcodec.hg
changeset 11918:823f332655e8 libavcodec
Add intra prediction functions for VP8.
Patch by David Conrad <lessen42 gmail com> and myself.
| author | rbultje |
|---|---|
| date | Tue, 22 Jun 2010 19:17:09 +0000 |
| parents | 2952baf6a266 |
| children | f021be0e837c |
| files | arm/h264pred_init_arm.c h264pred.c h264pred.h |
| diffstat | 3 files changed, 131 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/arm/h264pred_init_arm.c Tue Jun 22 19:15:27 2010 +0000 +++ b/arm/h264pred_init_arm.c Tue Jun 22 19:17:09 2010 +0000 @@ -46,9 +46,10 @@ { h->pred8x8[VERT_PRED8x8 ] = ff_pred8x8_vert_neon; h->pred8x8[HOR_PRED8x8 ] = ff_pred8x8_hor_neon; + if (codec_id != CODEC_ID_VP8) h->pred8x8[PLANE_PRED8x8 ] = ff_pred8x8_plane_neon; h->pred8x8[DC_128_PRED8x8 ] = ff_pred8x8_128_dc_neon; - if (codec_id != CODEC_ID_RV40) { + if (codec_id != CODEC_ID_RV40 && codec_id != CODEC_ID_VP8) { h->pred8x8[DC_PRED8x8 ] = ff_pred8x8_dc_neon; h->pred8x8[LEFT_DC_PRED8x8] = ff_pred8x8_left_dc_neon; h->pred8x8[TOP_DC_PRED8x8 ] = ff_pred8x8_top_dc_neon; @@ -64,7 +65,7 @@ h->pred16x16[LEFT_DC_PRED8x8] = ff_pred16x16_left_dc_neon; h->pred16x16[TOP_DC_PRED8x8 ] = ff_pred16x16_top_dc_neon; h->pred16x16[DC_128_PRED8x8 ] = ff_pred16x16_128_dc_neon; - if (codec_id != CODEC_ID_SVQ3 && codec_id != CODEC_ID_RV40) + if (codec_id != CODEC_ID_SVQ3 && codec_id != CODEC_ID_RV40 && codec_id != CODEC_ID_VP8) h->pred16x16[PLANE_PRED8x8 ] = ff_pred16x16_plane_neon; }
--- a/h264pred.c Tue Jun 22 19:15:27 2010 +0000 +++ b/h264pred.c Tue Jun 22 19:17:09 2010 +0000 @@ -28,6 +28,7 @@ #include "avcodec.h" #include "mpegvideo.h" #include "h264pred.h" +#include "mathops.h" static void pred4x4_vertical_c(uint8_t *src, const uint8_t *topright, int stride){ const uint32_t a= ((uint32_t*)(src-stride))[0]; @@ -104,6 +105,31 @@ const int av_unused t2= src[ 2-1*stride];\ const int av_unused t3= src[ 3-1*stride];\ +static void pred4x4_vertical_vp8_c(uint8_t *src, const uint8_t *topright, int stride){ + const int lt= src[-1-1*stride]; + LOAD_TOP_EDGE + LOAD_TOP_RIGHT_EDGE + uint32_t v = PACK4x8((lt + 2*t0 + t1 + 2) >> 2, + (t0 + 2*t1 + t2 + 2) >> 2, + (t1 + 2*t2 + t3 + 2) >> 2, + (t2 + 2*t3 + t4 + 2) >> 2); + + AV_WN32A(src+0*stride, v); + AV_WN32A(src+1*stride, v); + AV_WN32A(src+2*stride, v); + AV_WN32A(src+3*stride, v); +} + +static void pred4x4_horizontal_vp8_c(uint8_t *src, const uint8_t *topright, int stride){ + const int lt= src[-1-1*stride]; + LOAD_LEFT_EDGE + + AV_WN32A(src+0*stride, ((lt + 2*l0 + l1 + 2) >> 2)*0x01010101); + AV_WN32A(src+1*stride, ((l0 + 2*l1 + l2 + 2) >> 2)*0x01010101); + AV_WN32A(src+2*stride, ((l1 + 2*l2 + l3 + 2) >> 2)*0x01010101); + AV_WN32A(src+3*stride, ((l2 + 2*l3 + l3 + 2) >> 2)*0x01010101); +} + static void pred4x4_down_right_c(uint8_t *src, const uint8_t *topright, int stride){ const int lt= src[-1-1*stride]; LOAD_TOP_EDGE @@ -302,6 +328,28 @@ pred4x4_vertical_left_rv40(src, topright, stride, l0, l1, l2, l3, l3); } +static void pred4x4_vertical_left_vp8_c(uint8_t *src, const uint8_t *topright, int stride){ + LOAD_TOP_EDGE + LOAD_TOP_RIGHT_EDGE + + src[0+0*stride]=(t0 + t1 + 1)>>1; + src[1+0*stride]= + src[0+2*stride]=(t1 + t2 + 1)>>1; + src[2+0*stride]= + src[1+2*stride]=(t2 + t3 + 1)>>1; + src[3+0*stride]= + src[2+2*stride]=(t3 + t4 + 1)>>1; + src[0+1*stride]=(t0 + 2*t1 + t2 + 2)>>2; + src[1+1*stride]= + src[0+3*stride]=(t1 + 2*t2 + t3 + 2)>>2; + src[2+1*stride]= + src[1+3*stride]=(t2 + 2*t3 + t4 + 2)>>2; + src[3+1*stride]= + src[2+3*stride]=(t3 + 2*t4 + t5 + 2)>>2; + src[3+2*stride]=(t4 + 2*t5 + t6 + 2)>>2; + src[3+3*stride]=(t5 + 2*t6 + t7 + 2)>>2; +} + static void pred4x4_horizontal_up_c(uint8_t *src, const uint8_t *topright, int stride){ LOAD_LEFT_EDGE @@ -393,6 +441,21 @@ src[1+3*stride]=(l1 + 2*l2 + l3 + 2)>>2; } +static void pred4x4_tm_vp8_c(uint8_t *src, const uint8_t *topright, int stride){ + uint8_t *cm = ff_cropTbl + MAX_NEG_CROP - src[-1-stride]; + uint8_t *top = src-stride; + int y; + + for (y = 0; y < 4; y++) { + uint8_t *cm_in = cm + src[-1]; + src[0] = cm_in[top[0]]; + src[1] = cm_in[top[1]]; + src[2] = cm_in[top[2]]; + src[3] = cm_in[top[3]]; + src += stride; + } +} + static void pred16x16_vertical_c(uint8_t *src, int stride){ int i; const uint32_t a= ((uint32_t*)(src-stride))[0]; @@ -539,6 +602,33 @@ pred16x16_plane_compat_c(src, stride, 0, 1); } +static void pred16x16_tm_vp8_c(uint8_t *src, int stride){ + uint8_t *cm = ff_cropTbl + MAX_NEG_CROP - src[-1-stride]; + uint8_t *top = src-stride; + int y; + + for (y = 0; y < 16; y++) { + uint8_t *cm_in = cm + src[-1]; + src[0] = cm_in[top[0]]; + src[1] = cm_in[top[1]]; + src[2] = cm_in[top[2]]; + src[3] = cm_in[top[3]]; + src[4] = cm_in[top[4]]; + src[5] = cm_in[top[5]]; + src[6] = cm_in[top[6]]; + src[7] = cm_in[top[7]]; + src[8] = cm_in[top[8]]; + src[9] = cm_in[top[9]]; + src[10] = cm_in[top[10]]; + src[11] = cm_in[top[11]]; + src[12] = cm_in[top[12]]; + src[13] = cm_in[top[13]]; + src[14] = cm_in[top[14]]; + src[15] = cm_in[top[15]]; + src += stride; + } +} + static void pred8x8_vertical_c(uint8_t *src, int stride){ int i; const uint32_t a= ((uint32_t*)(src-stride))[0]; @@ -745,6 +835,25 @@ } } +static void pred8x8_tm_vp8_c(uint8_t *src, int stride){ + uint8_t *cm = ff_cropTbl + MAX_NEG_CROP - src[-1-stride]; + uint8_t *top = src-stride; + int y; + + for (y = 0; y < 8; y++) { + uint8_t *cm_in = cm + src[-1]; + src[0] = cm_in[top[0]]; + src[1] = cm_in[top[1]]; + src[2] = cm_in[top[2]]; + src[3] = cm_in[top[3]]; + src[4] = cm_in[top[4]]; + src[5] = cm_in[top[5]]; + src[6] = cm_in[top[6]]; + src[7] = cm_in[top[7]]; + src += stride; + } +} + #define SRC(x,y) src[(x)+(y)*stride] #define PL(y) \ const int l##y = (SRC(-1,y-1) + 2*SRC(-1,y) + SRC(-1,y+1) + 2) >> 2; @@ -1081,8 +1190,13 @@ // MpegEncContext * const s = &h->s; if(codec_id != CODEC_ID_RV40){ + if(codec_id == CODEC_ID_VP8) { + h->pred4x4[VERT_PRED ]= pred4x4_vertical_vp8_c; + h->pred4x4[HOR_PRED ]= pred4x4_horizontal_vp8_c; + } else { h->pred4x4[VERT_PRED ]= pred4x4_vertical_c; h->pred4x4[HOR_PRED ]= pred4x4_horizontal_c; + } h->pred4x4[DC_PRED ]= pred4x4_dc_c; if(codec_id == CODEC_ID_SVQ3) h->pred4x4[DIAG_DOWN_LEFT_PRED ]= pred4x4_down_left_svq3_c; @@ -1091,11 +1205,16 @@ h->pred4x4[DIAG_DOWN_RIGHT_PRED]= pred4x4_down_right_c; h->pred4x4[VERT_RIGHT_PRED ]= pred4x4_vertical_right_c; h->pred4x4[HOR_DOWN_PRED ]= pred4x4_horizontal_down_c; + if (codec_id == CODEC_ID_VP8) { + h->pred4x4[VERT_LEFT_PRED ]= pred4x4_vertical_left_vp8_c; + } else h->pred4x4[VERT_LEFT_PRED ]= pred4x4_vertical_left_c; h->pred4x4[HOR_UP_PRED ]= pred4x4_horizontal_up_c; h->pred4x4[LEFT_DC_PRED ]= pred4x4_left_dc_c; h->pred4x4[TOP_DC_PRED ]= pred4x4_top_dc_c; h->pred4x4[DC_128_PRED ]= pred4x4_128_dc_c; + if(codec_id == CODEC_ID_VP8) + h->pred4x4[TM_VP8_PRED ]= pred4x4_tm_vp8_c; }else{ h->pred4x4[VERT_PRED ]= pred4x4_vertical_c; h->pred4x4[HOR_PRED ]= pred4x4_horizontal_c; @@ -1129,8 +1248,11 @@ h->pred8x8[VERT_PRED8x8 ]= pred8x8_vertical_c; h->pred8x8[HOR_PRED8x8 ]= pred8x8_horizontal_c; + if (codec_id != CODEC_ID_VP8) { h->pred8x8[PLANE_PRED8x8 ]= pred8x8_plane_c; - if(codec_id != CODEC_ID_RV40){ + } else + h->pred8x8[PLANE_PRED8x8]= pred8x8_tm_vp8_c; + if(codec_id != CODEC_ID_RV40 && codec_id != CODEC_ID_VP8){ h->pred8x8[DC_PRED8x8 ]= pred8x8_dc_c; h->pred8x8[LEFT_DC_PRED8x8]= pred8x8_left_dc_c; h->pred8x8[TOP_DC_PRED8x8 ]= pred8x8_top_dc_c; @@ -1156,6 +1278,9 @@ case CODEC_ID_RV40: h->pred16x16[PLANE_PRED8x8 ]= pred16x16_plane_rv40_c; break; + case CODEC_ID_VP8: + h->pred16x16[PLANE_PRED8x8 ]= pred16x16_tm_vp8_c; + break; default: h->pred16x16[PLANE_PRED8x8 ]= pred16x16_plane_c; }
--- a/h264pred.h Tue Jun 22 19:15:27 2010 +0000 +++ b/h264pred.h Tue Jun 22 19:17:09 2010 +0000 @@ -49,6 +49,8 @@ #define TOP_DC_PRED 10 #define DC_128_PRED 11 +#define TM_VP8_PRED 9 ///< "True Motion", used instead of plane + #define DIAG_DOWN_LEFT_PRED_RV40_NODOWN 12 #define HOR_UP_PRED_RV40_NODOWN 13 #define VERT_LEFT_PRED_RV40_NODOWN 14