commit 831d763a3a49876a6223c0bcc339e01a247f6383
author liubolun <bolun.liu@intel.com> Thu Oct 10 16:56:07 2013 +0800
committer Patrick Tjin <pattjin@google.com> Mon Jul 21 21:51:41 2014 -0700
tree 414ff3b2453e9d26eb303d5d28fb61ff1f6148f0
parent fe67cf9b0660bee3653dc89dba026293b7597b32

Fix qcif/cif Vp8 encode quality issue.

BZ: 132033

Copy cacheable source surface to uncacheable for VP8 encode
to avoid corruption issue.

Signed-off-by: liubolun <bolun.liu@intel.com>

Change-Id: I27ac41595e0544bbfa9636bc93bdb1bde0e3688d
Signed-off-by: liubolun <bolun.liu@intel.com>
Reviewed-on: http://android.intel.com:8080/137744
Reviewed-by: Shi, PingX <pingx.shi@intel.com>
Tested-by: Shi, PingX <pingx.shi@intel.com>
Reviewed-by: cactus <cactus@intel.com>
Tested-by: cactus <cactus@intel.com>

videoencoder/VideoEncoderBase.cpp

diff --git a/videoencoder/VideoEncoderBase.cpp b/videoencoder/VideoEncoderBase.cpp
index 41c069d..af16152 100644
--- a/videoencoder/VideoEncoderBase.cpp
+++ b/videoencoder/VideoEncoderBase.cpp
@@ -178,8 +178,16 @@
         height_aligned = ((mComParams.resolution.height + 15) / 16 ) * 16;
     }else{
            // this alignment is used for AVC. For vp8 encode, driver will handle the alignment
-           stride_aligned = ((mComParams.resolution.width + 63) / 64 ) * 64;  //on Merr, stride must be 64 aligned.
-           height_aligned = ((mComParams.resolution.height + 31) / 32 ) * 32;
+           if(mComParams.profile == VAProfileVP8Version0_3)
+           {
+                stride_aligned = mComParams.resolution.width;
+                height_aligned = mComParams.resolution.height;
+           }
+           else
+           {
+                stride_aligned = ((mComParams.resolution.width + 63) / 64 ) * 64;  //on Merr, stride must be 64 aligned.
+                height_aligned = ((mComParams.resolution.height + 31) / 32 ) * 32;
+           }
     }
 
     ValueInfo vinfo;
@@ -1707,7 +1715,7 @@
     LOG_I("Surface ID created from Malloc = 0x%08x\n", map->value);
 
     //Merrifield limitation, should use mAutoReference to check if on Merr
-    if ((mComParams.profile == VAProfileVP8Version0_3)||((mAutoReference == false) || (map->vinfo.lumaStride % 64 == 0)))
+    if ((mAutoReference == false) || (map->vinfo.lumaStride % 64 == 0))
         map->surface = surface;
     else {
         map->surface_backup = surface;
@@ -1715,7 +1723,10 @@
         //TODO: need optimization for both width/height not aligned case
         VASurfaceID surfaceId;
         unsigned int stride_aligned;
-        stride_aligned = ((mComParams.resolution.width + 63) / 64 ) * 64;
+        if(mComParams.profile == VAProfileVP8Version0_3)
+            stride_aligned = mComParams.resolution.width;
+        else
+            stride_aligned = ((mComParams.resolution.width + 63) / 64 ) * 64;
         vaStatus = vaCreateSurfaces(mVADisplay, VA_RT_FORMAT_YUV420,
                     stride_aligned, map->vinfo.height, &surfaceId, 1, NULL, 0);