diff options
| author | James Dong <jdong@google.com> | 2010-10-21 20:18:16 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-21 20:18:16 -0700 |
| commit | ddcd04f2b3fef095e9f4020d5f87b7259e6921e9 (patch) | |
| tree | 2d0c7d4c0e48f2e0e3989406d4bd9f683ec961b3 /media/libstagefright/MPEG4Writer.cpp | |
| parent | 8f0c48b306f98ac572ecc3c0f64b8e38db6d01eb (diff) | |
| parent | 12ac08f2e1ffb74fd4efdc726066db15e6d3d50d (diff) | |
| download | frameworks_av-ddcd04f2b3fef095e9f4020d5f87b7259e6921e9.zip frameworks_av-ddcd04f2b3fef095e9f4020d5f87b7259e6921e9.tar.gz frameworks_av-ddcd04f2b3fef095e9f4020d5f87b7259e6921e9.tar.bz2 | |
am 1bd8a8c8: Merge "Turn the media time adjustment in file writer back on" into gingerbread
Merge commit '1bd8a8c8acdb7c3aa875ea62ccf0b9111f1c9410' into gingerbread-plus-aosp
* commit '1bd8a8c8acdb7c3aa875ea62ccf0b9111f1c9410':
Turn the media time adjustment in file writer back on
Diffstat (limited to 'media/libstagefright/MPEG4Writer.cpp')
| -rw-r--r-- | media/libstagefright/MPEG4Writer.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/media/libstagefright/MPEG4Writer.cpp b/media/libstagefright/MPEG4Writer.cpp index 90b104a..a15c274 100644 --- a/media/libstagefright/MPEG4Writer.cpp +++ b/media/libstagefright/MPEG4Writer.cpp @@ -41,7 +41,10 @@ namespace android { static const int64_t kMax32BitFileSize = 0x007fffffffLL; static const uint8_t kNalUnitTypeSeqParamSet = 0x07; static const uint8_t kNalUnitTypePicParamSet = 0x08; -static const int64_t kVideoMediaTimeAdjustPeriodTimeUs = 10000000LL; // 10s + +// Using longer adjustment period to suppress fluctuations in +// the audio encoding paths +static const int64_t kVideoMediaTimeAdjustPeriodTimeUs = 600000000LL; // 10 minutes class MPEG4Writer::Track { public: @@ -1175,7 +1178,7 @@ status_t MPEG4Writer::Track::start(MetaData *params) { startTimeUs = 0; } - mIsRealTimeRecording = false; + mIsRealTimeRecording = true; { int32_t isNotRealTime; if (params && params->findInt32(kKeyNotRealTime, &isNotRealTime)) { |