diff options
| author | Andy Hung <hunga@google.com> | 2014-05-15 03:18:48 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-15 03:18:49 +0000 |
| commit | 19a0c7687ca1d00d4518191648848a16d08083c7 (patch) | |
| tree | 0a519e4a6701f00d43efc7da392b2ca4f853a0fd /include | |
| parent | c389ca420d3df05dedcdcfb12b7e7543df837f0d (diff) | |
| parent | 609b815a3131d22da38b2f452faa9f89daad4039 (diff) | |
| download | frameworks_av-19a0c7687ca1d00d4518191648848a16d08083c7.zip frameworks_av-19a0c7687ca1d00d4518191648848a16d08083c7.tar.gz frameworks_av-19a0c7687ca1d00d4518191648848a16d08083c7.tar.bz2 | |
Merge "Update OMX messages for 64 bit"
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/IOMX.h | 4 | ||||
| -rw-r--r-- | include/media/stagefright/MediaCodec.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/media/IOMX.h b/include/media/IOMX.h index 176f72d..dd13fea 100644 --- a/include/media/IOMX.h +++ b/include/media/IOMX.h @@ -38,8 +38,8 @@ class IOMX : public IInterface { public: DECLARE_META_INTERFACE(OMX); - typedef void *buffer_id; - typedef void *node_id; + typedef uint32_t buffer_id; + typedef uint32_t node_id; // Given a node_id and the calling process' pid, returns true iff // the implementation of the OMX interface lives in the same diff --git a/include/media/stagefright/MediaCodec.h b/include/media/stagefright/MediaCodec.h index 39e57de..a1e32c9 100644 --- a/include/media/stagefright/MediaCodec.h +++ b/include/media/stagefright/MediaCodec.h @@ -185,7 +185,7 @@ private: }; struct BufferInfo { - void *mBufferID; + uint32_t mBufferID; sp<ABuffer> mData; sp<ABuffer> mEncryptedData; sp<AMessage> mNotify; |