commit 0f5597c0e53478b3ae75786eefbb1950698514a1
author Hyunchang Choi <hyunchang.choi@intel.com> Thu Mar 31 00:40:34 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Mar 31 00:40:34 2016 +0000
tree 101b8582892412c4e3ff60f654296e1d3b390407
parent 60f918a7a232576e3f77512ba729e4f9ccf49f25
parent 4d884c325166abf0abd76530b0380c052c88b21b

media hardening: OMX::allocateBuffer must return protected buffers as native_handles am: 3e858c3
am: 4d884c3

* commit '4d884c325166abf0abd76530b0380c052c88b21b':
  media hardening: OMX::allocateBuffer must return protected buffers as native_handles

Change-Id: I1b9e4c04927051bb74afd1ef4011c985dd033b2a

base/src/componentbase.cpp

diff --git a/base/src/componentbase.cpp b/base/src/componentbase.cpp
old mode 100644
new mode 100755
index e0f84c3..47d9cb0
--- a/base/src/componentbase.cpp
+++ b/base/src/componentbase.cpp
@@ -874,6 +874,11 @@
         return OMX_ErrorNone;
     }
 
+     if (!strcmp(cParameterName, "OMX.google.android.index.allocateNativeHandle")) {
+        *pIndexType = static_cast<OMX_INDEXTYPE>(OMX_IndexExtAllocateNativeHandle);
+        return OMX_ErrorNone;
+    }
+
     return OMX_ErrorUnsupportedIndex;
 }
 

core/inc/khronos/openmax/include/OMX_IntelIndexExt.h

diff --git a/core/inc/khronos/openmax/include/OMX_IntelIndexExt.h b/core/inc/khronos/openmax/include/OMX_IntelIndexExt.h
old mode 100644
new mode 100755
index c96ccb0..9e359ac
--- a/core/inc/khronos/openmax/include/OMX_IntelIndexExt.h
+++ b/core/inc/khronos/openmax/include/OMX_IntelIndexExt.h
@@ -74,6 +74,7 @@
 #ifdef TARGET_HAS_ISV
     OMX_IndexExtVppBufferNum,                       /**<reference: vpp buffer number*/
 #endif
+    OMX_IndexExtAllocateNativeHandle,               /**<reference: AllocateNativeHandle */
     OMX_IntelIndexExtMax = 0x7FFFFFFF
 } OMX_INTELINDEXEXTTYPE;