Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 318a759e: Merge "Make sure that timestamp does not go backward in MP4 file writer" into gingerbread

Browse Source 
Merge commit '318a759e3c24dd741f8959e2a433150ae88fb8d6' into gingerbread-plus-aosp

* commit '318a759e3c24dd741f8959e2a433150ae88fb8d6':
  Make sure that timestamp does not go backward in MP4 file writer
This commit is contained in:
James Dong
2010-08-26 09:53:30 -07:00
committed by Android Git Automerger
parent eb182d789d 318a759e3c
commit 9509a0ce7e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media/libstagefright/MPEG4Writer.cpp
View File

@@ -1569,9 +1569,9 @@ status_t MPEG4Writer::Track::threadEntry() {
// The idea here is to avoid having two or more samples with the // The idea here is to avoid having two or more samples with the
// same timestamp in the output file. // same timestamp in the output file.
if (mTimeScale >= 1000000LL) { if (mTimeScale >= 1000000LL) {
timestampUs += 1; timestampUs = lastTimestampUs + 1;
} else { } else {
timestampUs += (1000000LL + (mTimeScale >> 1)) / mTimeScale; timestampUs = lastTimestampUs + (1000000LL + (mTimeScale >> 1)) / mTimeScale;
} }
#endif #endif
} }