diff options
| author | James Dong <jdong@google.com> | 2011-06-13 18:47:03 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-13 18:47:03 -0700 |
| commit | b250340f83edde0f2b3a10b380c519c209fc91e9 (patch) | |
| tree | 1f1e50ad06680edaa487b1563b5c082b274eecd0 /include | |
| parent | 4b85d1750153085fe5d076b67802dfb1ea2bbb13 (diff) | |
| parent | 965e4239ca1cf6c824c1f8ce23116f9ba8cf6ebd (diff) | |
| download | frameworks_av-b250340f83edde0f2b3a10b380c519c209fc91e9.zip frameworks_av-b250340f83edde0f2b3a10b380c519c209fc91e9.tar.gz frameworks_av-b250340f83edde0f2b3a10b380c519c209fc91e9.tar.bz2 | |
Merge "Add B frame support for MPEG4Writer"
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/MetaData.h | 1 | ||||
| -rw-r--r-- | include/media/stagefright/OMXCodec.h | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/include/media/stagefright/MetaData.h b/include/media/stagefright/MetaData.h index 4044c5d..deade5e 100644 --- a/include/media/stagefright/MetaData.h +++ b/include/media/stagefright/MetaData.h @@ -55,6 +55,7 @@ enum { kKeyIsSyncFrame = 'sync', // int32_t (bool) kKeyIsCodecConfig = 'conf', // int32_t (bool) kKeyTime = 'time', // int64_t (usecs) + kKeyDecodingTime = 'decT', // int64_t (decoding timestamp in usecs) kKeyNTPTime = 'ntpT', // uint64_t (ntp-timestamp) kKeyTargetTime = 'tarT', // int64_t (usecs) kKeyDriftTime = 'dftT', // int64_t (usecs) diff --git a/include/media/stagefright/OMXCodec.h b/include/media/stagefright/OMXCodec.h index 70daafa..589cefd 100644 --- a/include/media/stagefright/OMXCodec.h +++ b/include/media/stagefright/OMXCodec.h @@ -202,6 +202,10 @@ private: bool mOnlySubmitOneBufferAtOneTime; bool mEnableGrallocUsageProtected; + // Used to record the decoding time for an output picture from + // a video encoder. + List<int64_t> mDecodingTimeList; + OMXCodec(const sp<IOMX> &omx, IOMX::node_id node, uint32_t quirks, bool isEncoder, const char *mime, const char *componentName, const sp<MediaSource> &source, @@ -317,6 +321,8 @@ private: status_t applyRotation(); + int64_t retrieveDecodingTimeUs(bool isCodecSpecific); + OMXCodec(const OMXCodec &); OMXCodec &operator=(const OMXCodec &); }; |