diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2010-02-25 15:27:55 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2010-02-25 15:27:55 +0000 |
| commit | 5e350863cc527a8d06735ec0b321248b97c47e62 (patch) | |
| tree | faaa3679d149f29424497e5cafdabc57f3d14b05 /libavcodec/h264.h | |
| parent | 013202d7202b6697ee235b408358a59f1ea38644 (diff) | |
Store data in direct_table interleaved.
seems 20cpu cycles faster
Originally committed as revision 22055 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/h264.h')
| -rw-r--r-- | libavcodec/h264.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index 071b23c31a..83db570ec4 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -1088,9 +1088,9 @@ static void fill_decode_caches(H264Context *h, int mb_type){ if(IS_DIRECT(top_type)){ AV_WN32A(&h->direct_cache[scan8[0] - 1*8], 0x01010101*(MB_TYPE_DIRECT2>>1)); }else if(IS_8X8(top_type)){ - int b8_xy = h->mb2b8_xy[top_xy] + h->b8_stride; - h->direct_cache[scan8[0] + 0 - 1*8]= h->direct_table[b8_xy]; - h->direct_cache[scan8[0] + 2 - 1*8]= h->direct_table[b8_xy + 1]; + int b8_xy = 4*top_xy; + h->direct_cache[scan8[0] + 0 - 1*8]= h->direct_table[b8_xy + 2]; + h->direct_cache[scan8[0] + 2 - 1*8]= h->direct_table[b8_xy + 3]; }else{ AV_WN32A(&h->direct_cache[scan8[0] - 1*8], 0x01010101*(MB_TYPE_16x16>>1)); } @@ -1098,14 +1098,14 @@ static void fill_decode_caches(H264Context *h, int mb_type){ if(IS_DIRECT(left_type[0])) h->direct_cache[scan8[0] - 1 + 0*8]= MB_TYPE_DIRECT2>>1; else if(IS_8X8(left_type[0])) - h->direct_cache[scan8[0] - 1 + 0*8]= h->direct_table[h->mb2b8_xy[left_xy[0]] + 1 + h->b8_stride*(left_block[0]>>1)]; + h->direct_cache[scan8[0] - 1 + 0*8]= h->direct_table[4*left_xy[0] + 1 + (left_block[0]&~1)]; else h->direct_cache[scan8[0] - 1 + 0*8]= MB_TYPE_16x16>>1; if(IS_DIRECT(left_type[1])) h->direct_cache[scan8[0] - 1 + 2*8]= MB_TYPE_DIRECT2>>1; else if(IS_8X8(left_type[1])) - h->direct_cache[scan8[0] - 1 + 2*8]= h->direct_table[h->mb2b8_xy[left_xy[1]] + 1 + h->b8_stride*(left_block[2]>>1)]; + h->direct_cache[scan8[0] - 1 + 2*8]= h->direct_table[4*left_xy[1] + 1 + (left_block[2]&~1)]; else h->direct_cache[scan8[0] - 1 + 2*8]= MB_TYPE_16x16>>1; } @@ -1433,10 +1433,10 @@ static inline void write_back_motion(H264Context *h, int mb_type){ if(h->slice_type_nos == FF_B_TYPE && CABAC){ if(IS_8X8(mb_type)){ - uint8_t *direct_table = &h->direct_table[b8_xy]; - direct_table[1+0*h->b8_stride] = h->sub_mb_type[1]>>1; - direct_table[0+1*h->b8_stride] = h->sub_mb_type[2]>>1; - direct_table[1+1*h->b8_stride] = h->sub_mb_type[3]>>1; + uint8_t *direct_table = &h->direct_table[4*h->mb_xy]; + direct_table[1] = h->sub_mb_type[1]>>1; + direct_table[2] = h->sub_mb_type[2]>>1; + direct_table[3] = h->sub_mb_type[3]>>1; } } } |