diff options
| author | James Dong <jdong@google.com> | 2010-10-21 20:27:34 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-21 20:27:34 -0700 |
| commit | 7f6ff8eb6eed438590e24f0b536c65110976bcfb (patch) | |
| tree | 8e3a5bf118cec5b219dd45fe1157b70250e9663d /media/libstagefright/MPEG4Writer.cpp | |
| parent | 46818115e1b5e7b41ab1ccbd6a863f164f0d3425 (diff) | |
| parent | ddcd04f2b3fef095e9f4020d5f87b7259e6921e9 (diff) | |
| download | frameworks_av-7f6ff8eb6eed438590e24f0b536c65110976bcfb.zip frameworks_av-7f6ff8eb6eed438590e24f0b536c65110976bcfb.tar.gz frameworks_av-7f6ff8eb6eed438590e24f0b536c65110976bcfb.tar.bz2 | |
am 6123e0f7: am 1bd8a8c8: Merge "Turn the media time adjustment in file writer back on" into gingerbread
Merge commit '6123e0f7c91ffc7534da99b4668879dacf662227'
* commit '6123e0f7c91ffc7534da99b4668879dacf662227':
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 515c22f..9e79aa9 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)) { |