diff options
| author | Chong Zhang <chz@google.com> | 2014-02-22 04:42:25 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-02-22 04:42:25 +0000 |
| commit | dc6ac201032d0f6ad0c8149ae2f009ec38693025 (patch) | |
| tree | 66b04298c58f76a0c9723dcd6c6dbb2ebfa6ee63 /include | |
| parent | 323da1015a758243c2c43017b026a01c6cf0c6f2 (diff) | |
| parent | 2c9c8cba8562cc3a27532e4cd348912cc78d8d98 (diff) | |
| download | frameworks_av-dc6ac201032d0f6ad0c8149ae2f009ec38693025.zip frameworks_av-dc6ac201032d0f6ad0c8149ae2f009ec38693025.tar.gz frameworks_av-dc6ac201032d0f6ad0c8149ae2f009ec38693025.tar.bz2 | |
Merge "support for time lapse/slow motion when using SURFACE source"
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/IOMX.h | 1 | ||||
| -rw-r--r-- | include/media/stagefright/ACodec.h | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/media/IOMX.h b/include/media/IOMX.h index 3db2c38..f6f9e7a 100644 --- a/include/media/IOMX.h +++ b/include/media/IOMX.h @@ -144,6 +144,7 @@ public: INTERNAL_OPTION_REPEAT_PREVIOUS_FRAME_DELAY, // data is an int64_t INTERNAL_OPTION_MAX_TIMESTAMP_GAP, // data is int64_t INTERNAL_OPTION_START_TIME, // data is an int64_t + INTERNAL_OPTION_TIME_LAPSE, // data is an int64_t[2] }; virtual status_t setInternalOption( node_id node, diff --git a/include/media/stagefright/ACodec.h b/include/media/stagefright/ACodec.h index e284109..36f2a67 100644 --- a/include/media/stagefright/ACodec.h +++ b/include/media/stagefright/ACodec.h @@ -207,6 +207,9 @@ private: int64_t mRepeatFrameDelayUs; int64_t mMaxPtsGapUs; + int64_t mTimePerFrameUs; + int64_t mTimePerCaptureUs; + bool mCreateInputBuffersSuspended; status_t setCyclicIntraMacroblockRefresh(const sp<AMessage> &msg, int32_t mode); |