commit 68e939ffa64c34bef2272cfe6346f43ee84d1611
author Tianmi Chen <tianmi.chen@intel.com> Thu Jul 16 20:52:29 2015 +0800
committer Patrick Tjin <pattjin@google.com> Thu Jul 16 15:09:47 2015 -0700
tree 9df4f48e123061726509fb46282e9fa3e820764c
parent 8e103bbca35f013a21b7a4c0c771dfeb65464554

surface ID initialization

When decoder ran into some corner case that the actual
buffer count is less than given buffer count, some buffers
are destoryed illegally.

Bug: 22299730
Change-Id: I13a383dfb7c2c03c950618317cb7afed64369b70
Signed-off-by: Tianmi Chen <tianmi.chen@intel.com>

videodecoder/VideoDecoderBase.cpp

diff --git a/videodecoder/VideoDecoderBase.cpp b/videodecoder/VideoDecoderBase.cpp
index 581b8ac..399bc6c 100644
--- a/videodecoder/VideoDecoderBase.cpp
+++ b/videodecoder/VideoDecoderBase.cpp
@@ -880,6 +880,9 @@
     mNumExtraSurfaces = numExtraSurface;
     mSurfaces = new VASurfaceID [mNumSurfaces + mNumExtraSurfaces];
     mExtraSurfaces = mSurfaces + mNumSurfaces;
+    for (int i = 0; i < mNumSurfaces + mNumExtraSurfaces; ++i) {
+        mSurfaces[i] = VA_INVALID_SURFACE;
+    }
     if (mSurfaces == NULL) {
         return DECODE_MEMORY_FAIL;
     }
@@ -1086,9 +1089,8 @@
         mSurfaceUserPtr = NULL;
     }
 
-    if (mSurfaces)
-    {
-        vaDestroySurfaces(mVADisplay, mSurfaces, mNumSurfaces + mNumExtraSurfaces);
+    if (mSurfaces) {
+        vaDestroySurfaces(mVADisplay, mSurfaces, mStoreMetaData ? mMetaDataBuffersNum : (mNumSurfaces + mNumExtraSurfaces));
         delete [] mSurfaces;
         mSurfaces = NULL;
     }