virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
Code Issues Releases Activity

Remove some unneeded fill_rectangle() for 16x16 blocks.

Browse Source 
Originally committed as revision 22124 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2010-02-28 23:54:24 +00:00
parent 11a74f3639
commit 8897b247a5
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/h264_cabac.c
View File

@ -1503,8 +1503,7 @@ decode_intra_mb:
}else }else
ref=0; ref=0;
fill_rectangle(&h->ref_cache[list][ scan8[0] ], 4, 4, 8, ref, 1); 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; list<h->list_count; list++){ for(list=0; list<h->list_count; list++){
if(IS_DIR(mb_type, 0, list)){ if(IS_DIR(mb_type, 0, list)){
@ -1515,8 +1514,7 @@ decode_intra_mb:
fill_rectangle(h->mvd_cache[list][ scan8[0] ], 4, 4, 8, pack8to16(mpx,mpy), 2); 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); 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)){ else if(IS_16X8(mb_type)){

10
libavcodec/h264_cavlc.c
View File

@ -789,22 +789,18 @@ decode_intra_mb:
return -1; return -1;
} }
} }
}else
val= LIST_NOT_USED&0xFF;
fill_rectangle(&h->ref_cache[list][ scan8[0] ], 4, 4, 8, val, 1); fill_rectangle(&h->ref_cache[list][ scan8[0] ], 4, 4, 8, val, 1);
}
} }
for(list=0; list<h->list_count; list++){ for(list=0; list<h->list_count; list++){
unsigned int val;
if(IS_DIR(mb_type, 0, list)){ if(IS_DIR(mb_type, 0, list)){
pred_motion(h, 0, 4, list, h->ref_cache[list][ scan8[0] ], &mx, &my); pred_motion(h, 0, 4, list, h->ref_cache[list][ scan8[0] ], &mx, &my);
mx += get_se_golomb(&s->gb); mx += get_se_golomb(&s->gb);
my += get_se_golomb(&s->gb); my += get_se_golomb(&s->gb);
tprintf(s->avctx, "final mv:%d %d\n", mx, my); tprintf(s->avctx, "final mv:%d %d\n", mx, my);
val= pack16to32(mx,my); fill_rectangle(h->mv_cache[list][ scan8[0] ], 4, 4, 8, pack16to32(mx,my), 4);
}else }
val=0;
fill_rectangle(h->mv_cache[list][ scan8[0] ], 4, 4, 8, val, 4);
} }
} }
else if(IS_16X8(mb_type)){ else if(IS_16X8(mb_type)){