summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/include
diff options
context:
space:
mode:
authorWei Jia <wjia@google.com>2015-09-28 11:32:23 -0700
committerWei Jia <wjia@google.com>2015-10-02 11:15:18 -0700
commit8dde7269a5356503d2b283234b6cb46d0c3f214e (patch)
tree06ec842433e8f501addbe9d264a46f2f21fd9161 /media/libstagefright/include
parenta9a899d3970f41162c8e9c720bf05f3e6226a90a (diff)
downloadframeworks_av-8dde7269a5356503d2b283234b6cb46d0c3f214e.zip
frameworks_av-8dde7269a5356503d2b283234b6cb46d0c3f214e.tar.gz
frameworks_av-8dde7269a5356503d2b283234b6cb46d0c3f214e.tar.bz2
OMX: allow only secure codec to remotely call allocateBuffer.
Bug: 24310423 Change-Id: Iebcfc58b447f925ec2134898060af2ef227266a3
Diffstat (limited to 'media/libstagefright/include')
-rw-r--r--media/libstagefright/include/OMX.h2
-rw-r--r--media/libstagefright/include/OMXNodeInstance.h5
2 files changed, 7 insertions, 0 deletions
diff --git a/media/libstagefright/include/OMX.h b/media/libstagefright/include/OMX.h
index d468dfc..e7c4f6d 100644
--- a/media/libstagefright/include/OMX.h
+++ b/media/libstagefright/include/OMX.h
@@ -140,6 +140,8 @@ public:
virtual void binderDied(const wp<IBinder> &the_late_who);
+ virtual bool isSecure(IOMX::node_id node);
+
OMX_ERRORTYPE OnEvent(
node_id node,
OMX_IN OMX_EVENTTYPE eEvent,
diff --git a/media/libstagefright/include/OMXNodeInstance.h b/media/libstagefright/include/OMXNodeInstance.h
index f68e0a9..e5fb45b 100644
--- a/media/libstagefright/include/OMXNodeInstance.h
+++ b/media/libstagefright/include/OMXNodeInstance.h
@@ -125,6 +125,10 @@ struct OMXNodeInstance {
const void *data,
size_t size);
+ bool isSecure() const {
+ return mIsSecure;
+ }
+
// handles messages and removes them from the list
void onMessages(std::list<omx_message> &messages);
void onMessage(const omx_message &msg);
@@ -142,6 +146,7 @@ private:
OMX_HANDLETYPE mHandle;
sp<IOMXObserver> mObserver;
bool mDying;
+ bool mIsSecure;
// Lock only covers mGraphicBufferSource. We can't always use mLock
// because of rare instances where we'd end up locking it recursively.