# HG changeset patch # User michael # Date 1267401264 0 # Node ID c4c8c8c426ebc7a08c5590d74f12cb812bf7fdbd # Parent 5cc6cb5167d80c383bffbd2b2a7a5e589a8f5d33 Remove some unneeded fill_rectangle() for 16x16 blocks. diff -r 5cc6cb5167d8 -r c4c8c8c426eb h264_cabac.c --- a/h264_cabac.c Sun Feb 28 19:58:26 2010 +0000 +++ b/h264_cabac.c Sun Feb 28 23:54:24 2010 +0000 @@ -1503,8 +1503,7 @@ }else ref=0; fill_rectangle(&h->ref_cache[list][ scan8[0] ], 4, 4, 8, ref, 1); - }else - fill_rectangle(&h->ref_cache[list][ scan8[0] ], 4, 4, 8, (uint8_t)LIST_NOT_USED, 1); //FIXME factorize and the other fill_rect below too + } } for(list=0; listlist_count; list++){ if(IS_DIR(mb_type, 0, list)){ @@ -1515,8 +1514,7 @@ fill_rectangle(h->mvd_cache[list][ scan8[0] ], 4, 4, 8, pack8to16(mpx,mpy), 2); fill_rectangle(h->mv_cache[list][ scan8[0] ], 4, 4, 8, pack16to32(mx,my), 4); - }else - fill_rectangle(h->mv_cache[list][ scan8[0] ], 4, 4, 8, 0, 4); + } } } else if(IS_16X8(mb_type)){ diff -r 5cc6cb5167d8 -r c4c8c8c426eb h264_cavlc.c --- a/h264_cavlc.c Sun Feb 28 19:58:26 2010 +0000 +++ b/h264_cavlc.c Sun Feb 28 23:54:24 2010 +0000 @@ -789,22 +789,18 @@ return -1; } } - }else - val= LIST_NOT_USED&0xFF; fill_rectangle(&h->ref_cache[list][ scan8[0] ], 4, 4, 8, val, 1); + } } for(list=0; listlist_count; list++){ - unsigned int val; if(IS_DIR(mb_type, 0, list)){ pred_motion(h, 0, 4, list, h->ref_cache[list][ scan8[0] ], &mx, &my); mx += get_se_golomb(&s->gb); my += get_se_golomb(&s->gb); tprintf(s->avctx, "final mv:%d %d\n", mx, my); - val= pack16to32(mx,my); - }else - val=0; - fill_rectangle(h->mv_cache[list][ scan8[0] ], 4, 4, 8, val, 4); + fill_rectangle(h->mv_cache[list][ scan8[0] ], 4, 4, 8, pack16to32(mx,my), 4); + } } } else if(IS_16X8(mb_type)){