commit 1a83d96f0b491b5b53a06a629d5e14e5765ce6db
author ywan171 <yi.a.wang@intel.com> Wed Dec 18 21:11:10 2013 +0800
committer Patrick Tjin <pattjin@google.com> Mon Jul 21 21:51:46 2014 -0700
tree af2dcbd2dc8a6b8914261db2cff4894328ea068e
parent 57a96092435d46885052e42faf0b26e38932e7f0

modify some va parameter to integration mix with GEN driver for DRC

BZ: 158110

modify some va parameter to integration mix with GEN driver for DRC

Change-Id: I244ccd763602d66bb8219ba391706790df5e576c
Signed-off-by: ywan171 <yi.a.wang@intel.com>

videodecoder/VideoDecoderBase.cpp

diff --git a/videodecoder/VideoDecoderBase.cpp b/videodecoder/VideoDecoderBase.cpp
index fed382e..cb6a663 100644
--- a/videodecoder/VideoDecoderBase.cpp
+++ b/videodecoder/VideoDecoderBase.cpp
@@ -840,16 +840,16 @@
         }
         mVASurfaceAttrib->num_buffers = mNumSurfaces;
         mVASurfaceAttrib->pixel_format = VA_FOURCC_NV12;
-        mVASurfaceAttrib->width = mVideoFormatInfo.width;
-        mVASurfaceAttrib->height = mVideoFormatInfo.height;
-        mVASurfaceAttrib->data_size = mConfigBuffer.graphicBufferStride * mVideoFormatInfo.height * 1.5;
+        mVASurfaceAttrib->width = mVideoFormatInfo.surfaceWidth;
+        mVASurfaceAttrib->height = mVideoFormatInfo.surfaceHeight;
+        mVASurfaceAttrib->data_size = mConfigBuffer.graphicBufferStride * mVideoFormatInfo.surfaceHeight * 1.5;
         mVASurfaceAttrib->num_planes = 2;
         mVASurfaceAttrib->pitches[0] = mConfigBuffer.graphicBufferStride;
         mVASurfaceAttrib->pitches[1] = mConfigBuffer.graphicBufferStride;
         mVASurfaceAttrib->pitches[2] = 0;
         mVASurfaceAttrib->pitches[3] = 0;
         mVASurfaceAttrib->offsets[0] = 0;
-        mVASurfaceAttrib->offsets[1] = mConfigBuffer.graphicBufferStride * mVideoFormatInfo.height;
+        mVASurfaceAttrib->offsets[1] = mConfigBuffer.graphicBufferStride * mVideoFormatInfo.surfaceHeight;
         mVASurfaceAttrib->offsets[2] = 0;
         mVASurfaceAttrib->offsets[3] = 0;
         mVASurfaceAttrib->private_data = (void *)mConfigBuffer.nativeWindow;
@@ -900,8 +900,8 @@
         vaStatus = vaCreateSurfaces(
             mVADisplay,
             format,
-            mVideoFormatInfo.width,
-            mVideoFormatInfo.height,
+            mVideoFormatInfo.surfaceWidth,
+            mVideoFormatInfo.surfaceHeight,
             mExtraSurfaces,
             mNumExtraSurfaces,
             NULL,
@@ -916,8 +916,8 @@
         vaStatus = vaCreateContext(
                 mVADisplay,
                 mVAConfig,
-                mVideoFormatInfo.width,
-                mVideoFormatInfo.height,
+                mVideoFormatInfo.surfaceWidth,
+                mVideoFormatInfo.surfaceHeight,
                 0,
                 mSurfaces,
                 mNumSurfaces + mNumExtraSurfaces,
@@ -929,7 +929,6 @@
     if (mSurfaceBuffers == NULL) {
         return DECODE_MEMORY_FAIL;
     }
-
     initSurfaceBuffer(true);
 
     if ((int32_t)profile == VAProfileSoftwareDecoding) {