commit 6b64d66c87cfc04aaa40a9ceff34a90ef981560f
author android-build-team Robot <android-build-team-robot@google.com> Mon Jul 03 07:36:55 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Mon Jul 03 07:36:55 2017 +0000
tree aecac7daf1c8b01c87b074cf46efd640c166c74c
parent e5e71bd44023abf1ce6e421c6fb4745ccdc99351
parent 212353b45667200c50a4fb7af3cd987411c9f80c

Merge cherrypicks of [2489285, 2489286, 2489323, 2489399, 2489257, 2489326] into oc-release

Change-Id: Ibabadcf24c9f2730ed23c37487f82d5359c88df9

videocodec/securevideo/moorefield/OMXVideoDecoderAVCSecure.cpp

diff --git a/videocodec/securevideo/moorefield/OMXVideoDecoderAVCSecure.cpp b/videocodec/securevideo/moorefield/OMXVideoDecoderAVCSecure.cpp
index 7ec2d48..1518578 100755
--- a/videocodec/securevideo/moorefield/OMXVideoDecoderAVCSecure.cpp
+++ b/videocodec/securevideo/moorefield/OMXVideoDecoderAVCSecure.cpp
@@ -659,6 +659,9 @@
         ALOGE("%s: Faild to munmap %p",__FUNCTION__, dataBuffer);
         return;
     }
+
+    native_handle_close(native_handle);
+    native_handle_delete(native_handle);
     ALOGV("Free databuffer %p with data = %p", dataBuffer, dataBuffer->data);
     --mNumInportBuffers;
 }