diff options
| author | Andreas Huber <andih@google.com> | 2013-04-12 10:38:17 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-12 10:38:17 -0700 |
| commit | 3f0651d12b5c4b01ab0347412ae0e2e5fe2aadaa (patch) | |
| tree | 16b559da08eafdc1fca406904aba5d6bf11cb505 /include | |
| parent | 4713d3dc48cec162f4aeb3513719a8dd153e8c85 (diff) | |
| parent | 4b40f7ef5a9d29006dcb3351086fc13f1a8e0fa2 (diff) | |
| download | frameworks_av-3f0651d12b5c4b01ab0347412ae0e2e5fe2aadaa.zip frameworks_av-3f0651d12b5c4b01ab0347412ae0e2e5fe2aadaa.tar.gz frameworks_av-3f0651d12b5c4b01ab0347412ae0e2e5fe2aadaa.tar.bz2 | |
am 4b40f7ef: am 5157b1e8: Merge "ACodec now signals an error if the mediaserver died while it is in" into jb-mr2-dev
* commit '4b40f7ef5a9d29006dcb3351086fc13f1a8e0fa2':
ACodec now signals an error if the mediaserver died while it is in
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/ACodec.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/media/stagefright/ACodec.h b/include/media/stagefright/ACodec.h index 96baf34..5cfe5bc 100644 --- a/include/media/stagefright/ACodec.h +++ b/include/media/stagefright/ACodec.h @@ -46,6 +46,7 @@ struct ACodec : public AHierarchicalStateMachine { kWhatInputSurfaceCreated = 'isfc', kWhatSignaledInputEOS = 'seos', kWhatBuffersAllocated = 'allc', + kWhatOMXDied = 'OMXd', }; ACodec(); @@ -97,6 +98,7 @@ private: struct ExecutingToIdleState; struct IdleToLoadedState; struct FlushingState; + struct DeathNotifier; enum { kWhatSetup = 'setu', |