drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 5587bb7e: Merge "Interleave the audio and video by default - default interleave duration is set to 1 second" into gingerbread

Browse Source 
Merge commit '5587bb7e375c17c1320918e6f473625af1f5e5ac' into gingerbread-plus-aosp

* commit '5587bb7e375c17c1320918e6f473625af1f5e5ac':
  Interleave the audio and video by default
This commit is contained in:
James Dong
2010-07-28 12:00:58 -07:00
committed by Android Git Automerger
parent d3f6c1fa45 5587bb7e37
commit cb51115cca
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
media/libmediaplayerservice/StagefrightRecorder.cpp
View File

@ -981,8 +981,10 @@ status_t StagefrightRecorder::startMPEG4Recording() {
totalBitRate += mVideoBitRate;
}
reinterpret_cast<MPEG4Writer *>(writer.get())->
setInterleaveDuration(mInterleaveDurationUs);
if (mInterleaveDurationUs > 0) {
reinterpret_cast<MPEG4Writer *>(writer.get())->
setInterleaveDuration(mInterleaveDurationUs);
}
if (mMaxFileDurationUs != 0) {
writer->setMaxFileDuration(mMaxFileDurationUs);

4
media/libstagefright/MPEG4Writer.cpp
View File

@ -145,7 +145,7 @@ MPEG4Writer::MPEG4Writer(const char *filename)
mOffset(0),
mMdatOffset(0),
mEstimatedMoovBoxSize(0),
mInterleaveDurationUs(500000) {
mInterleaveDurationUs(1000000) {
CHECK(mFile != NULL);
}
@ -157,7 +157,7 @@ MPEG4Writer::MPEG4Writer(int fd)
mOffset(0),
mMdatOffset(0),
mEstimatedMoovBoxSize(0),
mInterleaveDurationUs(500000) {
mInterleaveDurationUs(1000000) {
CHECK(mFile != NULL);
}