diff options
| author | James Dong <jdong@google.com> | 2010-10-21 20:06:59 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-10-21 20:06:59 -0700 |
| commit | 1bd8a8c8acdb7c3aa875ea62ccf0b9111f1c9410 (patch) | |
| tree | 41a5e1f9e2034cf772934780d47e3c7699c67db2 | |
| parent | fdbb2168f7a9a202ee9406d65e7ef98a6745b488 (diff) | |
| parent | 89a0104c7cd20ffe19d80714f627463b4929c5fc (diff) | |
| download | frameworks_base-1bd8a8c8acdb7c3aa875ea62ccf0b9111f1c9410.zip frameworks_base-1bd8a8c8acdb7c3aa875ea62ccf0b9111f1c9410.tar.gz frameworks_base-1bd8a8c8acdb7c3aa875ea62ccf0b9111f1c9410.tar.bz2 | |
Merge "Turn the media time adjustment in file writer back on" into gingerbread
| -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)) { |