diff options
| author | Austin Hu <austin.hu@intel.com> | 2016-04-18 19:37:17 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-18 19:37:17 +0000 |
| commit | 058936abe360c150890bb735e7f9b8e07e316620 (patch) | |
| tree | 101b8582892412c4e3ff60f654296e1d3b390407 | |
| parent | 134d5f74e45d796b48419dd9b4bd93d0d2ee25a2 (diff) | |
| parent | 44c7c2d3b65abe47e2f67590166d9a4cacd5abf8 (diff) | |
| download | wrs_omxil_core-058936abe360c150890bb735e7f9b8e07e316620.tar.gz | |
Revert "Fixed the incorrect stride and slice height settings of OMX video port."aandroid-n-mr1-preview-2android-n-mr1-preview-1
am: 44c7c2d
* commit '44c7c2d3b65abe47e2f67590166d9a4cacd5abf8':
Revert "Fixed the incorrect stride and slice height settings of OMX video port."a
Change-Id: I88162b6df4eae656bfb2ee476389242850ad805b
| -rw-r--r-- | base/src/portbase.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
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_ERRORTYPE PortBase::SetPortDefinition( 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; } |