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
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 @@
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 @@
startTimeUs = 0;
}
- mIsRealTimeRecording = false;
+ mIsRealTimeRecording = true;
{
int32_t isNotRealTime;
if (params && params->findInt32(kKeyNotRealTime, &isNotRealTime)) {