diff options
| author | Chong Zhang <chz@google.com> | 2014-03-13 19:33:54 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-13 19:33:54 +0000 |
| commit | a671f943b72155460f0c94cdd92d829cb059b571 (patch) | |
| tree | 04d465f9e42df72de4d54fe1e55da60efc026adb /include | |
| parent | 1e001f92e748de00a3e20effa464d59d75a746b3 (diff) | |
| parent | c69bc40a347c411751cb082b3eb4a82d976a68ec (diff) | |
| download | frameworks_av-a671f943b72155460f0c94cdd92d829cb059b571.zip frameworks_av-a671f943b72155460f0c94cdd92d829cb059b571.tar.gz frameworks_av-a671f943b72155460f0c94cdd92d829cb059b571.tar.bz2 | |
am c69bc40a: Merge "Cap pts gap between adjacent frames to specified value" into klp-dev
* commit 'c69bc40a347c411751cb082b3eb4a82d976a68ec':
Cap pts gap between adjacent frames to specified value
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/IOMX.h | 1 | ||||
| -rw-r--r-- | include/media/stagefright/ACodec.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/include/media/IOMX.h b/include/media/IOMX.h index 9c8451c..6643736 100644 --- a/include/media/IOMX.h +++ b/include/media/IOMX.h @@ -142,6 +142,7 @@ public: enum InternalOptionType { INTERNAL_OPTION_SUSPEND, // data is a bool INTERNAL_OPTION_REPEAT_PREVIOUS_FRAME_DELAY, // data is an int64_t + INTERNAL_OPTION_MAX_TIMESTAMP_GAP, // data is int64_t }; virtual status_t setInternalOption( node_id node, diff --git a/include/media/stagefright/ACodec.h b/include/media/stagefright/ACodec.h index f90fc4a..7ba5acc 100644 --- a/include/media/stagefright/ACodec.h +++ b/include/media/stagefright/ACodec.h @@ -205,6 +205,7 @@ private: int32_t mMetaDataBuffersToSubmit; int64_t mRepeatFrameDelayUs; + int64_t mMaxPtsGapUs; status_t setCyclicIntraMacroblockRefresh(const sp<AMessage> &msg, int32_t mode); status_t allocateBuffersOnPort(OMX_U32 portIndex); |