diff options
| author | Andy Hung <hunga@google.com> | 2014-05-02 11:05:04 -0700 |
|---|---|---|
| committer | Glenn Kasten <gkasten@android.com> | 2014-06-12 13:26:03 -0700 |
| commit | 8b1be2ca7cee71a4920d5d31fdcbad2b1d4ca49d (patch) | |
| tree | 6a22d7fcaacca08ef7b79c20bd0e6b3e72d9e7f0 /include | |
| parent | c323737dd46d724b4c1ec230b283f26ae2a22b4f (diff) | |
| download | frameworks_av-8b1be2ca7cee71a4920d5d31fdcbad2b1d4ca49d.zip frameworks_av-8b1be2ca7cee71a4920d5d31fdcbad2b1d4ca49d.tar.gz frameworks_av-8b1be2ca7cee71a4920d5d31fdcbad2b1d4ca49d.tar.bz2 | |
Update OMX messages for 64 bit
Change node_id and buffer_id to uint32_t.
Ensure IOMX messages are fixed size.
Remove 64 bit compile warnings in associated files.
Change-Id: Icdbef00aca575e5dc502ebb52e3ce7d0d7883203
Signed-off-by: Andy Hung <hunga@google.com>
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 6643736..b74a2c7 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 76aa503..1f17efe 100644 --- a/include/media/stagefright/MediaCodec.h +++ b/include/media/stagefright/MediaCodec.h @@ -182,7 +182,7 @@ private: }; struct BufferInfo { - void *mBufferID; + uint32_t mBufferID; sp<ABuffer> mData; sp<ABuffer> mEncryptedData; sp<AMessage> mNotify; |