From 1be49ce54b7ce9ffe8ce514d7c05df6a88f31261 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Mon, 8 Feb 2010 17:25:50 +0000
Subject: [PATCH] Set partitioning to 16x16 for spatial direct MBs with mixed
 interlacing. 11cylcles slower MV generation 98cycles faster MC

Originally committed as revision 21691 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavcodec/h264_direct.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libavcodec/h264_direct.c b/libavcodec/h264_direct.c
index a2f1e1d4eb..f126857811 100644
--- a/libavcodec/h264_direct.c
+++ b/libavcodec/h264_direct.c
@@ -270,6 +270,7 @@ single_col:
         }
 
         if(IS_INTERLACED(*mb_type) != IS_INTERLACED(mb_type_col[0])){
+            int n=0;
             for(i8=0; i8<4; i8++){
                 int x8 = i8&1;
                 int y8 = i8>>1;
@@ -291,6 +292,7 @@ single_col:
                         a= pack16to32(mv[0][0],mv[0][1]);
                     if(ref[1] > 0)
                         b= pack16to32(mv[1][0],mv[1][1]);
+                    n++;
                 }else{
                     a= pack16to32(mv[0][0],mv[0][1]);
                     b= pack16to32(mv[1][0],mv[1][1]);
@@ -298,6 +300,8 @@ single_col:
                 fill_rectangle(&h->mv_cache[0][scan8[i8*4]], 2, 2, 8, a, 4);
                 fill_rectangle(&h->mv_cache[1][scan8[i8*4]], 2, 2, 8, b, 4);
             }
+            if(!is_b8x8 && !(n&3))
+                *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_16X16(*mb_type)){
             int a,b;