From 812bfd7b4480094e1169f7dfabd5b44e2158379d Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Sat, 13 Feb 2010 02:47:41 +0000
Subject: [PATCH] Special case for spatial direct MV predictor being 0. a
little less than 200 cpu cycles faster with the cathedral sample.
Originally committed as revision 21785 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavcodec/h264_direct.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/libavcodec/h264_direct.c b/libavcodec/h264_direct.c
index 96ee7c5cbe6..8f297c4c5c6 100644
--- a/libavcodec/h264_direct.c
+++ b/libavcodec/h264_direct.c
@@ -265,7 +265,13 @@ single_col:
sub_mb_type |= MB_TYPE_L0L1;
}
- if(IS_INTERLACED(*mb_type) != IS_INTERLACED(mb_type_col[0])){
+ if(!is_b8x8 && (mv[0]|mv[1]) == 0){
+ fill_rectangle(&h->ref_cache[0][scan8[0]], 4, 4, 8, (uint8_t)ref[0], 1);
+ fill_rectangle(&h->ref_cache[1][scan8[0]], 4, 4, 8, (uint8_t)ref[1], 1);
+ fill_rectangle(&h->mv_cache[0][scan8[0]], 4, 4, 8, 0, 4);
+ fill_rectangle(&h->mv_cache[1][scan8[0]], 4, 4, 8, 0, 4);
+ *mb_type= (*mb_type & ~(MB_TYPE_8x8|MB_TYPE_16x8|MB_TYPE_8x16|MB_TYPE_P1L0|MB_TYPE_P1L1))|MB_TYPE_16x16|MB_TYPE_DIRECT2;
+ }else if(IS_INTERLACED(*mb_type) != IS_INTERLACED(mb_type_col[0])){
int n=0;
for(i8=0; i8<4; i8++){
int x8 = i8&1;
--
GitLab