commit 0e7fbcb161e2e806ffb2f321cd14e92924463ec2
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Jan 17 03:52:39 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jan 17 03:52:39 2019 +0000
tree 3ee0c26680268f39ae6095cd54b653cf843b7b56
parent 3724095f1f64585fd7318631b86f3e31c1903a3c
parent 88471f15c3026c6a139e43e8dc73ae397470dc2c

Merge "MediaClock: relax condition for time discontinuity"

media/libstagefright/MediaClock.cpp

diff --git a/media/libstagefright/MediaClock.cpp b/media/libstagefright/MediaClock.cpp
index 8bff9f7..4f9bc6d 100644
--- a/media/libstagefright/MediaClock.cpp
+++ b/media/libstagefright/MediaClock.cpp
@@ -110,7 +110,7 @@
     if (mAnchorTimeRealUs != -1) {
         int64_t oldNowMediaUs =
             mAnchorTimeMediaUs + (nowUs - mAnchorTimeRealUs) * (double)mPlaybackRate;
-        if (nowMediaUs < oldNowMediaUs
+        if (nowMediaUs < oldNowMediaUs + kAnchorFluctuationAllowedUs
                 && nowMediaUs > oldNowMediaUs - kAnchorFluctuationAllowedUs) {
             return;
         }