From: Xiang, Haihao <haihao.xiang@intel.com>
Date: Thu, 21 Apr 2011 05:23:56 +0000 (+0800)
Subject: i965_drv_video/encode: fix macroblock instra struct in VME message
X-Git-Tag: libva-1.0.13~30^2~13
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=172d562acbdc995e3ef70c707776e28ac29b87d3;p=platform%2Fupstream%2Flibva.git

i965_drv_video/encode: fix macroblock instra struct in VME message

Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
---

diff --git a/i965_drv_video/gen6_vme.c b/i965_drv_video/gen6_vme.c
index 2158894..9e95559 100644
--- a/i965_drv_video/gen6_vme.c
+++ b/i965_drv_video/gen6_vme.c
@@ -498,9 +498,9 @@ static int gen6_vme_media_object_intra(VADriverContextP ctx,
     if ( mb_y > 0)
         i |= 0x10;
     if ( mb_x > 0 && mb_y > 0)
-        i |= 0x08;
-    if ( mb_x > 0 && mb_y > 0 && mb_x < (mb_width - 1) )
         i |= 0x04;
+    if ( mb_y > 0 && mb_x < (mb_width - 1) )
+        i |= 0x08;
     OUT_BATCH(ctx, (i << 8) | 6 );		/*M1.7 Neighbor MBS and Intra mode masks*/
 
     drm_intel_gem_bo_map_gtt( obj_surface->bo );
@@ -631,9 +631,9 @@ static int gen6_vme_media_object_inter(VADriverContextP ctx,
     if ( mb_y > 0)
         i |= 0x10;
     if ( mb_x > 0 && mb_y > 0)
-        i |= 0x08;
-    if ( mb_x > 0 && mb_y > 0 && mb_x < (mb_width - 1) )
         i |= 0x04;
+    if ( mb_y > 0 && mb_x < (mb_width - 1) )
+        i |= 0x08;
     OUT_BATCH(ctx, (i << 8) | 6 );		/*M1.7 Neighbor MBS and Intra mode masks*/
 
     drm_intel_gem_bo_map_gtt( obj_surface->bo );