RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-16 04:15:05 +00:00
Code Issues Projects Releases Wiki Activity

Reorder intra4x4_pred_mode so that we can read/write 4 values at once.

Browse Source 
3-7 cpu cycles faster

Originally committed as revision 22053 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2010-02-25 14:26:12 +00:00
parent 5b0fb5244d
commit 662a5b2370
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/h264.c
View File

@ -54,13 +54,10 @@ static const uint8_t div6[52]={
void ff_h264_write_back_intra_pred_mode(H264Context *h){
int8_t *mode= h->intra4x4_pred_mode + h->mb2br_xy[h->mb_xy];
mode[0]= h->intra4x4_pred_mode_cache[7+8*1];
mode[1]= h->intra4x4_pred_mode_cache[7+8*2];
mode[2]= h->intra4x4_pred_mode_cache[7+8*3];
mode[3]= h->intra4x4_pred_mode_cache[7+8*4];
mode[4]= h->intra4x4_pred_mode_cache[4+8*4];
mode[5]= h->intra4x4_pred_mode_cache[5+8*4];
mode[6]= h->intra4x4_pred_mode_cache[6+8*4];
AV_COPY32(mode, h->intra4x4_pred_mode_cache + 4 + 8*4);
mode[4]= h->intra4x4_pred_mode_cache[7+8*3];
mode[5]= h->intra4x4_pred_mode_cache[7+8*2];
mode[6]= h->intra4x4_pred_mode_cache[7+8*1];
}
/**

10
libavcodec/h264.h
View File

@ -886,11 +886,7 @@ static void fill_decode_caches(H264Context *h, int mb_type){
if(IS_INTRA4x4(mb_type)){
if(IS_INTRA4x4(top_type)){
int8_t *mode= h->intra4x4_pred_mode + h->mb2br_xy[top_xy];
h->intra4x4_pred_mode_cache[4+8*0]= mode[4];
h->intra4x4_pred_mode_cache[5+8*0]= mode[5];
h->intra4x4_pred_mode_cache[6+8*0]= mode[6];
h->intra4x4_pred_mode_cache[7+8*0]= mode[3];
AV_COPY32(h->intra4x4_pred_mode_cache+4+8*0, h->intra4x4_pred_mode + h->mb2br_xy[top_xy]);
}else{
int pred;
if(!(top_type & type_mask))
@ -906,8 +902,8 @@ static void fill_decode_caches(H264Context *h, int mb_type){
for(i=0; i<2; i++){
if(IS_INTRA4x4(left_type[i])){
int8_t *mode= h->intra4x4_pred_mode + h->mb2br_xy[left_xy[i]];
h->intra4x4_pred_mode_cache[3+8*1 + 2*8*i]= mode[left_block[0+2*i]];
h->intra4x4_pred_mode_cache[3+8*2 + 2*8*i]= mode[left_block[1+2*i]];
h->intra4x4_pred_mode_cache[3+8*1 + 2*8*i]= mode[6-left_block[0+2*i]];
h->intra4x4_pred_mode_cache[3+8*2 + 2*8*i]= mode[6-left_block[1+2*i]];
}else{
int pred;
if(!(left_type[i] & type_mask))