diff options
| author | ztenghui <ztenghui@google.com> | 2013-04-15 11:41:14 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-15 11:41:14 -0700 |
| commit | ea29f0da58add214f79ed148ad0321cef0777e54 (patch) | |
| tree | 79cebb1b6765eef913071f897e045f0448ced16f /include | |
| parent | d72ec85d1d0b92ed82927e3925f21912a659b799 (diff) | |
| parent | a768b4f838f93823f661422d8193ebbff64b1b5a (diff) | |
| download | frameworks_av-ea29f0da58add214f79ed148ad0321cef0777e54.zip frameworks_av-ea29f0da58add214f79ed148ad0321cef0777e54.tar.gz frameworks_av-ea29f0da58add214f79ed148ad0321cef0777e54.tar.bz2 | |
am a768b4f8: am 8f1efee1: Merge "MediaMuxer prefer not to use the MPEG4Writer in real time recording mode." into jb-mr2-dev
* commit 'a768b4f838f93823f661422d8193ebbff64b1b5a':
MediaMuxer prefer not to use the MPEG4Writer in real time recording mode.
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/MPEG4Writer.h | 8 | ||||
| -rw-r--r-- | include/media/stagefright/MetaData.h | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/include/media/stagefright/MPEG4Writer.h b/include/media/stagefright/MPEG4Writer.h index 88df6b0..3ef6b9a 100644 --- a/include/media/stagefright/MPEG4Writer.h +++ b/include/media/stagefright/MPEG4Writer.h @@ -74,6 +74,7 @@ private: int mFd; status_t mInitCheck; + bool mIsRealTimeRecording; bool mUse4ByteNalLength; bool mUse32BitOffset; bool mIsFileSizeLimitExplicitlyRequested; @@ -168,6 +169,13 @@ private: // Only makes sense for H.264/AVC bool useNalLengthFour(); + // Return whether the writer is used for real time recording. + // In real time recording mode, new samples will be allowed to buffered into + // chunks in higher priority thread, even though the file writer has not + // drained the chunks yet. + // By default, real time recording is on. + bool isRealTimeRecording() const; + void lock(); void unlock(); diff --git a/include/media/stagefright/MetaData.h b/include/media/stagefright/MetaData.h index 9ab3edc..de3fc36 100644 --- a/include/media/stagefright/MetaData.h +++ b/include/media/stagefright/MetaData.h @@ -112,7 +112,7 @@ enum { // kKeyTrackTimeStatus is used to track progress in elapsed time kKeyTrackTimeStatus = 'tktm', // int64_t - kKeyNotRealTime = 'ntrt', // bool (int32_t) + kKeyRealTimeRecording = 'rtrc', // bool (int32_t) kKeyNumBuffers = 'nbbf', // int32_t // Ogg files can be tagged to be automatically looping... |