Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9509a0ce authored by James Dong's avatar James Dong Committed by Android Git Automerger
Browse files

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

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

Merge commit '318a759e' into gingerbread-plus-aosp

* commit '318a759e':
  Make sure that timestamp does not go backward in MP4 file writer
parents eb182d78 318a759e

media/libstagefright/MPEG4Writer.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1569,9 +1569,9 @@ status_t MPEG4Writer::Track::threadEntry() { 
                // The idea here is to avoid having two or more samples with the

                // same timestamp in the output file.

                if (mTimeScale >= 1000000LL) {

                    timestampUs += 1;

                    timestampUs = lastTimestampUs + 1;

                } else {

                    timestampUs += (1000000LL + (mTimeScale >> 1)) / mTimeScale;

                    timestampUs = lastTimestampUs + (1000000LL + (mTimeScale >> 1)) / mTimeScale;

                }

#endif

            }