diff options
| author | Chong Zhang <chz@google.com> | 2014-01-31 22:10:21 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-01-31 22:10:21 +0000 |
| commit | 0520e05f9083cf13fa7062629bc6606f4b39f08a (patch) | |
| tree | 476ae7a71f78862575a2577b3d72810ce0fcab9f /include | |
| parent | cc09c59e487bbd5f76cb0212ceb3bafd88d1fa15 (diff) | |
| parent | 94ee4b708acfa941581160b267afb79192b1d816 (diff) | |
| download | frameworks_av-0520e05f9083cf13fa7062629bc6606f4b39f08a.zip frameworks_av-0520e05f9083cf13fa7062629bc6606f4b39f08a.tar.gz frameworks_av-0520e05f9083cf13fa7062629bc6606f4b39f08a.tar.bz2 | |
Merge "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 f1636e6..bc391fc 100644 --- a/include/media/stagefright/ACodec.h +++ b/include/media/stagefright/ACodec.h @@ -202,6 +202,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); |