diff options
author | James Dong <jdong@google.com> | 2010-07-02 11:39:06 -0700 |
---|---|---|
committer | James Dong <jdong@google.com> | 2010-07-14 17:29:17 -0700 |
commit | 52d13f01a60f04d5a8a181ceb5400e32aee5637d (patch) | |
tree | ce4e0c9f23c36ddeb447ac8156cfb91034bc807a /include | |
parent | ed86eaa7301d5509bce38dffce3f8ef11e4e4cd0 (diff) | |
download | frameworks_base-52d13f01a60f04d5a8a181ceb5400e32aee5637d.zip frameworks_base-52d13f01a60f04d5a8a181ceb5400e32aee5637d.tar.gz frameworks_base-52d13f01a60f04d5a8a181ceb5400e32aee5637d.tar.bz2 |
Support user-supplied timescales for authoring
- also, change all the real time unit to microseconds in MPEG4Writer
Change-Id: I260f512f2eb670ade7b8858a56335a5d639de756
Diffstat (limited to 'include')
-rw-r--r-- | include/media/stagefright/MPEG4Writer.h | 2 | ||||
-rw-r--r-- | include/media/stagefright/MetaData.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/include/media/stagefright/MPEG4Writer.h b/include/media/stagefright/MPEG4Writer.h index 962b38b..232583a 100644 --- a/include/media/stagefright/MPEG4Writer.h +++ b/include/media/stagefright/MPEG4Writer.h @@ -52,6 +52,7 @@ public: void endBox(); uint32_t interleaveDuration() const { return mInterleaveDurationUs; } status_t setInterleaveDuration(uint32_t duration); + int32_t getTimeScale() const { return mTimeScale; } protected: virtual ~MPEG4Writer(); @@ -72,6 +73,7 @@ private: bool mStreamableFile; off_t mEstimatedMoovBoxSize; uint32_t mInterleaveDurationUs; + int32_t mTimeScale; int64_t mStartTimestampUs; Mutex mLock; diff --git a/include/media/stagefright/MetaData.h b/include/media/stagefright/MetaData.h index 73f5547..cdbf483 100644 --- a/include/media/stagefright/MetaData.h +++ b/include/media/stagefright/MetaData.h @@ -68,6 +68,7 @@ enum { kKeyDiscNumber = 'dnum', // cstring kKeyDate = 'date', // cstring kKeyWriter = 'writ', // cstring + kKeyTimeScale = 'tmsl', // int32_t // video profile and level kKeyVideoProfile = 'vprf', // int32_t |