diff options
| author | James Dong <jdong@google.com> | 2010-07-15 11:16:08 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-07-15 11:16:08 -0700 |
| commit | d6a85a21418338a7797bff731fa7a551f62a9e86 (patch) | |
| tree | 31cb24d80ec578524f77f82cd54f19fc2964e60a /include | |
| parent | 562124e84d8ae63b614b14ba257680571091ef1f (diff) | |
| parent | 52d13f01a60f04d5a8a181ceb5400e32aee5637d (diff) | |
| download | frameworks_base-d6a85a21418338a7797bff731fa7a551f62a9e86.zip frameworks_base-d6a85a21418338a7797bff731fa7a551f62a9e86.tar.gz frameworks_base-d6a85a21418338a7797bff731fa7a551f62a9e86.tar.bz2 | |
Merge "Support user-supplied timescales for authoring" into gingerbread
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 |