diff options
| author | Mathias Agopian <mathias@google.com> | 2009-10-29 01:46:16 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-29 01:46:16 -0700 |
| commit | 64d3f44c7bf5a6e80be419df5850ef60fec216b5 (patch) | |
| tree | c3085258ac4641e0551082014aab99d458788019 /include | |
| parent | 0200ec3eb4c9c11cc8f9e3db5a1a51f5db840524 (diff) | |
| parent | 893cb4da1034870a8814394a1c3bdac10ca6cadf (diff) | |
| download | frameworks_base-64d3f44c7bf5a6e80be419df5850ef60fec216b5.zip frameworks_base-64d3f44c7bf5a6e80be419df5850ef60fec216b5.tar.gz frameworks_base-64d3f44c7bf5a6e80be419df5850ef60fec216b5.tar.bz2 | |
am 893cb4da: am 73e17015: Merge change I8d2de438 into eclair
Merge commit '893cb4da1034870a8814394a1c3bdac10ca6cadf' into eclair-mr2-plus-aosp
* commit '893cb4da1034870a8814394a1c3bdac10ca6cadf':
fix [2143798] Need to figure out how to do video
Diffstat (limited to 'include')
| -rw-r--r-- | include/ui/GraphicBuffer.h | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/include/ui/GraphicBuffer.h b/include/ui/GraphicBuffer.h index 8897f03..2172536 100644 --- a/include/ui/GraphicBuffer.h +++ b/include/ui/GraphicBuffer.h @@ -66,7 +66,11 @@ public: GraphicBuffer(); // creates w * h buffer - GraphicBuffer(uint32_t w, uint32_t h, PixelFormat format, uint32_t ssage); + GraphicBuffer(uint32_t w, uint32_t h, PixelFormat format, uint32_t usage); + + // create a buffer from an existing handle + GraphicBuffer(uint32_t w, uint32_t h, PixelFormat format, uint32_t usage, + uint32_t stride, native_handle_t* handle, bool keepOwnership); // return status status_t initCheck() const; @@ -94,9 +98,15 @@ protected: GraphicBuffer(const Parcel& reply); virtual ~GraphicBuffer(); + enum { + ownNone = 0, + ownHandle = 1, + ownData = 2, + }; + inline const GraphicBufferMapper& getBufferMapper() const { return mBufferMapper; } inline GraphicBufferMapper& getBufferMapper() { return mBufferMapper; } - bool mOwner; + uint8_t mOwner; private: friend class Surface; |