commit 1e47cb09db479f29d80c5354a5f5ddc4973ef6a5
author Hangyu Kuang <hkuang@google.com> Fri Apr 01 15:54:34 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 01 15:54:34 2016 +0000
tree 7e5554a71f0326c4e191ee8a8ee8a818a5e49f78
parent 601b5a5f34d480d562d33526b4d87f7f704ab569
parent f85a83af8c6a98b46c394c32b90b09214a68f3e4

Merge "stagefright: Document that MPEG4Writer does not support muxing out of order frames." into nyc-dev

media/libstagefright/MPEG4Writer.cpp

diff --git a/media/libstagefright/MPEG4Writer.cpp b/media/libstagefright/MPEG4Writer.cpp
index 58bfa67..7a8f4c0 100644
--- a/media/libstagefright/MPEG4Writer.cpp
+++ b/media/libstagefright/MPEG4Writer.cpp
@@ -2550,8 +2550,8 @@
             ((timestampUs * mTimeScale + 500000LL) / 1000000LL -
                 (lastTimestampUs * mTimeScale + 500000LL) / 1000000LL);
         if (currDurationTicks < 0ll) {
-            ALOGE("timestampUs %" PRId64 " < lastTimestampUs %" PRId64 " for %s track",
-                timestampUs, lastTimestampUs, trackName);
+            ALOGE("do not support out of order frames (timestamp: %lld < last: %lld for %s track",
+                    (long long)timestampUs, (long long)lastTimestampUs, trackName);
             copy->release();
             mSource->stop();
             return UNKNOWN_ERROR;