diff options
author | Chong Zhang <chz@google.com> | 2014-03-11 22:09:39 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-03-11 22:09:40 +0000 |
commit | c69bc40a347c411751cb082b3eb4a82d976a68ec (patch) | |
tree | ff5c9a55bcbaea04e90ba2e2c999b436287f5155 /include | |
parent | 1c608ab33acab82d4a87f1abedcc99a623d1b53a (diff) | |
parent | 8bd4d16aa5636e98522c07ae31236420788aa749 (diff) | |
download | frameworks_av-c69bc40a347c411751cb082b3eb4a82d976a68ec.zip frameworks_av-c69bc40a347c411751cb082b3eb4a82d976a68ec.tar.gz frameworks_av-c69bc40a347c411751cb082b3eb4a82d976a68ec.tar.bz2 |
Merge "Cap pts gap between adjacent frames to specified value" into klp-dev
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 510c482..bf3a998 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); |