diff options
author | David Smith <davidas@google.com> | 2014-09-05 22:45:14 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-05 22:45:15 +0000 |
commit | eab1bd40f9c9722239dc37a62ba81617abfc90f6 (patch) | |
tree | 154f31607c1aa511aaf2bc8e1a55603e5295d006 /include | |
parent | 00f703e001e5663760fe21defb05fe22ee5a932a (diff) | |
parent | e7f4e676bb88b17241d71731f9ea50c18cfcb039 (diff) | |
download | frameworks_av-eab1bd40f9c9722239dc37a62ba81617abfc90f6.zip frameworks_av-eab1bd40f9c9722239dc37a62ba81617abfc90f6.tar.gz frameworks_av-eab1bd40f9c9722239dc37a62ba81617abfc90f6.tar.bz2 |
Merge "stagefright: filter surface input, config cacheDir"
Diffstat (limited to 'include')
-rw-r--r-- | include/media/stagefright/MediaFilter.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/media/stagefright/MediaFilter.h b/include/media/stagefright/MediaFilter.h index 77f60af..7b3f700 100644 --- a/include/media/stagefright/MediaFilter.h +++ b/include/media/stagefright/MediaFilter.h @@ -22,6 +22,7 @@ namespace android { struct ABuffer; +struct GraphicBufferListener; struct MemoryDealer; struct SimpleFilter; @@ -129,6 +130,7 @@ private: bool mPortEOS[2]; sp<SimpleFilter> mFilter; + sp<GraphicBufferListener> mGraphicBufferListener; // helper functions void signalProcessBuffers(); @@ -153,6 +155,9 @@ private: void onShutdown(const sp<AMessage> &msg); void onFlush(); void onSetParameters(const sp<AMessage> &msg); + void onCreateInputSurface(); + void onInputFrameAvailable(); + void onSignalEndOfInputStream(); DISALLOW_EVIL_CONSTRUCTORS(MediaFilter); }; |