am 9e0922ba: am 6e76fda3: am f9782266: Merge "AwesomePlayer: improve scheduling of video event to hit PTS"

* commit '9e0922ba7dda72fc94d2af2872cfc630ad599c91':
  AwesomePlayer: improve scheduling of video event to hit PTS

1 files changed, 7 insertions, 3 deletions

diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp
index 6e5003f..e4e1d42 100644
--- a/media/libstagefright/AwesomePlayer.cpp
+++ b/media/libstagefright/AwesomePlayer.cpp
@@ -1951,8 +1951,9 @@ void AwesomePlayer::onVideoEvent() {
         }
 
         if (latenessUs < -10000) {
-            // We're more than 10ms early.
-            postVideoEvent_l(10000);
+            // We're more than 10ms early.  Try to schedule at least 12ms
+            // early (to hit this same check), or just on time.
+            postVideoEvent_l(latenessUs < -22000 ? 10000 : -latenessUs);
             return;
         }
     }
@@ -2016,7 +2017,10 @@ void AwesomePlayer::onVideoEvent() {
         int64_t nextTimeUs;
         CHECK(mVideoBuffer->meta_data()->findInt64(kKeyTime, &nextTimeUs));
         int64_t delayUs = nextTimeUs - ts->getRealTimeUs() + mTimeSourceDeltaUs;
-        postVideoEvent_l(delayUs > 10000 ? 10000 : delayUs < 0 ? 0 : delayUs);
+        ATRACE_INT("Frame delta (ms)", (nextTimeUs - timeUs) / 1E3);
+        ALOGV("next frame in %" PRId64, delayUs);
+        // try to schedule at least 12ms before due time, or just on time
+        postVideoEvent_l(delayUs > 22000 ? 10000 : delayUs < 0 ? 0 : delayUs);
         return;
     }