diff options
| author | Andy McFadden <fadden@android.com> | 2013-03-06 17:42:23 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-03-06 17:42:23 +0000 |
| commit | 0ab4d86643dfb668a583c13b8bd61b589dbe8602 (patch) | |
| tree | 0afef39776758d266b256cb209dad51a6485edb1 /include/media | |
| parent | 2217a40453b4b13232be77121bde76d6f31be012 (diff) | |
| parent | 6507d14c6d10f93d390de62b9eed267f9b544985 (diff) | |
| download | frameworks_av-0ab4d86643dfb668a583c13b8bd61b589dbe8602.zip frameworks_av-0ab4d86643dfb668a583c13b8bd61b589dbe8602.tar.gz frameworks_av-0ab4d86643dfb668a583c13b8bd61b589dbe8602.tar.bz2 | |
Merge "Correct MediaCodec + Surface behavior" into jb-mr2-dev
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/stagefright/ACodec.h | 3 | ||||
| -rw-r--r-- | include/media/stagefright/MediaCodec.h | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/include/media/stagefright/ACodec.h b/include/media/stagefright/ACodec.h index 097ec5f..96baf34 100644 --- a/include/media/stagefright/ACodec.h +++ b/include/media/stagefright/ACodec.h @@ -281,6 +281,9 @@ private: status_t requestIDRFrame(); status_t setParameters(const sp<AMessage> ¶ms); + // Send EOS on input stream. + void onSignalEndOfInputStream(); + DISALLOW_EVIL_CONSTRUCTORS(ACodec); }; diff --git a/include/media/stagefright/MediaCodec.h b/include/media/stagefright/MediaCodec.h index ef695a7..35f46dc 100644 --- a/include/media/stagefright/MediaCodec.h +++ b/include/media/stagefright/MediaCodec.h @@ -212,6 +212,8 @@ private: sp<AMessage> mActivityNotify; + bool mHaveInputSurface; + MediaCodec(const sp<ALooper> &looper); static status_t PostAndAwaitResponse( |