Mercurial > libavcodec.hg
diff h264pred.c @ 6036:ce3b68242317 libavcodec
Correct spatial prediction mode in RV30/40 for vertical left direction
and add its version that does not rely on down left neighbour subblock.
author | kostya |
---|---|
date | Mon, 17 Dec 2007 18:43:34 +0000 |
parents | 4a26dc4ca11d |
children | c4de4b187b4f |
line wrap: on
line diff
--- a/h264pred.c Mon Dec 17 18:23:18 2007 +0000 +++ b/h264pred.c Mon Dec 17 18:43:34 2007 +0000 @@ -288,10 +288,10 @@ src[3+3*stride]=(t4 + 2*t5 + t6 + 2)>>2; } -static void pred4x4_vertical_left_rv40_c(uint8_t *src, uint8_t *topright, int stride){ +static void pred4x4_vertical_left_rv40(uint8_t *src, uint8_t *topright, int stride, + const int l0, const int l1, const int l2, const int l3, const int l4){ LOAD_TOP_EDGE LOAD_TOP_RIGHT_EDGE - LOAD_LEFT_EDGE src[0+0*stride]=(2*t0 + 2*t1 + l1 + 2*l2 + l3 + 4)>>3; src[1+0*stride]= @@ -301,7 +301,7 @@ src[3+0*stride]= src[2+2*stride]=(t3 + t4+ 1)>>1; src[3+2*stride]=(t4 + t5+ 1)>>1; - src[0+1*stride]=(t0 + 2*t1 + t2 + l2 + 2*l3 + l3 + 4)>>3; + src[0+1*stride]=(t0 + 2*t1 + t2 + l2 + 2*l3 + l4 + 4)>>3; src[1+1*stride]= src[0+3*stride]=(t1 + 2*t2 + t3 + 2)>>2; src[2+1*stride]= @@ -311,6 +311,19 @@ src[3+3*stride]=(t4 + 2*t5 + t6 + 2)>>2; } +static void pred4x4_vertical_left_rv40_c(uint8_t *src, uint8_t *topright, int stride){ + LOAD_LEFT_EDGE + LOAD_DOWN_LEFT_EDGE + + pred4x4_vertical_left_rv40(src, topright, stride, l0, l1, l2, l3, l4); +} + +static void pred4x4_vertical_left_rv40_nodown_c(uint8_t *src, uint8_t *topright, int stride){ + LOAD_LEFT_EDGE + + pred4x4_vertical_left_rv40(src, topright, stride, l0, l1, l2, l3, l3); +} + static void pred4x4_horizontal_up_c(uint8_t *src, uint8_t *topright, int stride){ LOAD_LEFT_EDGE @@ -1010,6 +1023,7 @@ h->pred4x4[DC_128_PRED ]= pred4x4_128_dc_c; h->pred4x4[DIAG_DOWN_LEFT_PRED_RV40_NODOWN]= pred4x4_down_left_rv40_nodown_c; h->pred4x4[HOR_UP_PRED_RV40_NODOWN]= pred4x4_horizontal_up_rv40_nodown_c; + h->pred4x4[VERT_LEFT_PRED_RV40_NODOWN]= pred4x4_vertical_left_rv40_nodown_c; } h->pred8x8l[VERT_PRED ]= pred8x8l_vertical_c;