commit 1e4406b6b79aab5720806558606e079c032257d2
author Austin Hu <austin.hu@intel.com> Mon Apr 18 19:37:08 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Apr 18 19:37:08 2016 +0000
tree 101b8582892412c4e3ff60f654296e1d3b390407
parent 29279a60efae18de2329437e127d47a27a48c2da
parent 44c7c2d3b65abe47e2f67590166d9a4cacd5abf8

Revert "Fixed the incorrect stride and slice height settings of OMX video port."a
am: 44c7c2d

* commit '44c7c2d3b65abe47e2f67590166d9a4cacd5abf8':
  Revert "Fixed the incorrect stride and slice height settings of OMX video port."a

Change-Id: I1f7f80b04f5c2dcb671eea1c5ad845a44ae72099

base/src/portbase.cpp

diff --git a/base/src/portbase.cpp b/base/src/portbase.cpp
index 2f1ec92..a707876 100644
--- a/base/src/portbase.cpp
+++ b/base/src/portbase.cpp
@@ -264,9 +264,13 @@
         OMX_S32 nFrameSize = getFrameBufSize(format->eColorFormat,format->nFrameWidth,format->nFrameHeight);
         if(nFrameSize!=-1)
             temp.nBufferSize = nFrameSize;
-
-        format->nStride = pformat->nStride;
-        format->nSliceHeight = pformat->nSliceHeight;
+        if (overwrite_readonly) {
+            format->nStride = pformat->nStride;
+            format->nSliceHeight = pformat->nSliceHeight;
+        } else {
+            format->nStride = pformat->nFrameWidth;
+            format->nSliceHeight = pformat->nFrameHeight;
+        }
 
         break;
     }