diff options
| author | Andreas Huber <andih@google.com> | 2010-01-19 11:43:12 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-01-19 11:43:12 -0800 |
| commit | cb6ffa28244e491b2ae8e3b1c68ba7c93a08e560 (patch) | |
| tree | 7afba0a710069e77ef21f73d93292173e1eeaf8f /include | |
| parent | bfa05732a9b791ce49f3db2bb5c9ee30638fd6bb (diff) | |
| parent | f1fe064d735698b09e4bc7b3a10e4dc3dba9a1d9 (diff) | |
| download | frameworks_base-cb6ffa28244e491b2ae8e3b1c68ba7c93a08e560.zip frameworks_base-cb6ffa28244e491b2ae8e3b1c68ba7c93a08e560.tar.gz frameworks_base-cb6ffa28244e491b2ae8e3b1c68ba7c93a08e560.tar.bz2 | |
Merge "Avoid unnecessary buffer copying if at all possible, detect if running in the mediaserver process."
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/IOMX.h | 5 | ||||
| -rw-r--r-- | include/media/stagefright/OMXCodec.h | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/include/media/IOMX.h b/include/media/IOMX.h index 39bd5b1..d38c177 100644 --- a/include/media/IOMX.h +++ b/include/media/IOMX.h @@ -42,6 +42,11 @@ public: typedef void *buffer_id; typedef void *node_id; + // Given the calling process' pid, returns true iff + // the implementation of the OMX interface lives in the same + // process. + virtual bool livesLocally(pid_t pid) = 0; + struct ComponentInfo { String8 mName; List<String8> mRoles; diff --git a/include/media/stagefright/OMXCodec.h b/include/media/stagefright/OMXCodec.h index 351763c..2c32386 100644 --- a/include/media/stagefright/OMXCodec.h +++ b/include/media/stagefright/OMXCodec.h @@ -109,6 +109,7 @@ private: }; sp<IOMX> mOMX; + bool mOMXLivesLocally; IOMX::node_id mNode; uint32_t mQuirks; bool mIsEncoder; |