commit 7c6bd7b17835cfa615d1f74aa7fe7c45c7190e4d
author Chong Zhang <chz@google.com> Wed Sep 14 01:13:02 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 14 01:13:02 2016 +0000
tree 1ce786d9334162d62c38ed044f7fcaef11746dae
parent b5a851ae941bc3c83e2cbb99c5edc948ba42f596
parent 718ae52c24b243d19d91dd97c2f6ea37d3524df0

Merge "stagefright: always add pts info if max pts gap is set" into nyc-mr1-dev

media/libstagefright/omx/GraphicBufferSource.cpp

diff --git a/media/libstagefright/omx/GraphicBufferSource.cpp b/media/libstagefright/omx/GraphicBufferSource.cpp
index e025653..26b41d0 100644
--- a/media/libstagefright/omx/GraphicBufferSource.cpp
+++ b/media/libstagefright/omx/GraphicBufferSource.cpp
@@ -827,11 +827,11 @@
                 int64_t timestampGapUs = originalTimeUs - mPrevOriginalTimeUs;
                 timeUs = (timestampGapUs < mMaxTimestampGapUs ?
                     timestampGapUs : mMaxTimestampGapUs) + mPrevModifiedTimeUs;
-                mOriginalTimeUs.add(timeUs, originalTimeUs);
-                ALOGV("IN  timestamp: %lld -> %lld",
-                    static_cast<long long>(originalTimeUs),
-                    static_cast<long long>(timeUs));
             }
+            mOriginalTimeUs.add(timeUs, originalTimeUs);
+            ALOGV("IN  timestamp: %lld -> %lld",
+                static_cast<long long>(originalTimeUs),
+                static_cast<long long>(timeUs));
         }
 
         mPrevOriginalTimeUs = originalTimeUs;