diff options
| author | Lajos Molnar <lajos@google.com> | 2014-07-31 06:14:41 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-30 23:34:26 +0000 |
| commit | 1d5b45f70f684996acc24fbf3e30fa5af0a0c642 (patch) | |
| tree | b2cfc70baf6037850f8dfc2b4e3f5082eae38db4 /include | |
| parent | 89869f692c35d0ca914c7de4a1f5ff63c9920634 (diff) | |
| parent | 0e8cfc36044ba97545e7c9e129b0b3e98eec5089 (diff) | |
| download | frameworks_av-1d5b45f70f684996acc24fbf3e30fa5af0a0c642.zip frameworks_av-1d5b45f70f684996acc24fbf3e30fa5af0a0c642.tar.gz frameworks_av-1d5b45f70f684996acc24fbf3e30fa5af0a0c642.tar.bz2 | |
Merge "stagefright: MediaCodec async operations." into lmp-dev
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/MediaCodec.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/media/stagefright/MediaCodec.h b/include/media/stagefright/MediaCodec.h index 26a0963..4ff0d62 100644 --- a/include/media/stagefright/MediaCodec.h +++ b/include/media/stagefright/MediaCodec.h @@ -157,6 +157,7 @@ private: STARTING, STARTED, FLUSHING, + FLUSHED, STOPPING, RELEASING, }; @@ -301,6 +302,7 @@ private: status_t amendOutputFormatWithCodecSpecificData(const sp<ABuffer> &buffer); void updateBatteryStat(); + bool isExecuting() const; DISALLOW_EVIL_CONSTRUCTORS(MediaCodec); }; |