[SCM] libav/experimental: Split *_type setting up, 4 cpu cycles faster.
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 17:01:57 UTC 2013
The following commit has been merged in the experimental branch:
commit 82fb5bb2ee991405e7cd60c961b2df0605ce3a18
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Sat Feb 27 03:46:16 2010 +0000
Split *_type setting up, 4 cpu cycles faster.
Originally committed as revision 22085 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavcodec/h264.h b/libavcodec/h264.h
index 5eae1e2..d4d87b1 100644
--- a/libavcodec/h264.h
+++ b/libavcodec/h264.h
@@ -811,11 +811,18 @@ static void fill_decode_neighbors(H264Context *h, int mb_type){
h->left_mb_xy[0] = left_xy[0];
h->left_mb_xy[1] = left_xy[1];
//FIXME do we need all in the context?
- h->topleft_type = h->slice_table[topleft_xy ] == h->slice_num ? s->current_picture.mb_type[topleft_xy] : 0;
- h->top_type = h->slice_table[top_xy ] == h->slice_num ? s->current_picture.mb_type[top_xy] : 0;
- h->topright_type= h->slice_table[topright_xy] == h->slice_num ? s->current_picture.mb_type[topright_xy]: 0;
- h->left_type[0] = h->slice_table[left_xy[0] ] == h->slice_num ? s->current_picture.mb_type[left_xy[0]] : 0;
- h->left_type[1] = h->slice_table[left_xy[1] ] == h->slice_num ? s->current_picture.mb_type[left_xy[1]] : 0;
+
+ h->topleft_type = s->current_picture.mb_type[topleft_xy] ;
+ h->top_type = s->current_picture.mb_type[top_xy] ;
+ h->topright_type= s->current_picture.mb_type[topright_xy];
+ h->left_type[0] = s->current_picture.mb_type[left_xy[0]] ;
+ h->left_type[1] = s->current_picture.mb_type[left_xy[1]] ;
+
+ if(h->slice_table[topleft_xy ] != h->slice_num) h->topleft_type = 0;
+ if(h->slice_table[top_xy ] != h->slice_num) h->top_type = 0;
+ if(h->slice_table[topright_xy] != h->slice_num) h->topright_type= 0;
+ if(h->slice_table[left_xy[0] ] != h->slice_num) h->left_type[0] = 0;
+ if(h->slice_table[left_xy[1] ] != h->slice_num) h->left_type[1] = 0;
}
static void fill_decode_caches(H264Context *h, int mb_type){
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list