diff options
| author | Andreas Huber <andih@google.com> | 2010-12-07 10:12:47 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-12-07 10:12:47 -0800 |
| commit | b0fa4f2c6f20a873370d9d50d9f77a4ea705270d (patch) | |
| tree | 0c8ebe0201b2ba0dbda5d4089be04cffd17cbdcf /include | |
| parent | 3b64772d18a0399cd03f1a03981b918391337921 (diff) | |
| parent | ae9d5072534de65d9ea41def2e1b4258a1731ca4 (diff) | |
| download | frameworks_base-b0fa4f2c6f20a873370d9d50d9f77a4ea705270d.zip frameworks_base-b0fa4f2c6f20a873370d9d50d9f77a4ea705270d.tar.gz frameworks_base-b0fa4f2c6f20a873370d9d50d9f77a4ea705270d.tar.bz2 | |
Merge "API Support for both synchronous and queued commands, optionally associated metadata."
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/IStreamSource.h | 8 | ||||
| -rw-r--r-- | include/media/stagefright/foundation/AMessage.h | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/include/media/IStreamSource.h b/include/media/IStreamSource.h index 6291124..4b698e6 100644 --- a/include/media/IStreamSource.h +++ b/include/media/IStreamSource.h @@ -22,6 +22,7 @@ namespace android { +struct AMessage; struct IMemory; struct IStreamListener; @@ -38,13 +39,14 @@ struct IStreamListener : public IInterface { DECLARE_META_INTERFACE(StreamListener); enum Command { - FLUSH, + EOS, DISCONTINUITY, - EOS }; virtual void queueBuffer(size_t index, size_t size) = 0; - virtual void queueCommand(Command cmd) = 0; + + virtual void issueCommand( + Command cmd, bool synchronous, const sp<AMessage> &msg = NULL) = 0; }; //////////////////////////////////////////////////////////////////////////////// diff --git a/include/media/stagefright/foundation/AMessage.h b/include/media/stagefright/foundation/AMessage.h index c674cba..2fbdddc 100644 --- a/include/media/stagefright/foundation/AMessage.h +++ b/include/media/stagefright/foundation/AMessage.h @@ -26,10 +26,14 @@ namespace android { struct AString; +struct Parcel; struct AMessage : public RefBase { AMessage(uint32_t what = 0, ALooper::handler_id target = 0); + static sp<AMessage> FromParcel(const Parcel &parcel); + void writeToParcel(Parcel *parcel) const; + void setWhat(uint32_t what); uint32_t what() const; |