commit dc123cbae198204e8c6c3d4f4f09a95cbc0e9ec5
author Wei Jia <wjia@google.com> Thu Nov 26 01:17:13 2015 +0000
committer android-build-merger <android-build-merger@google.com> Thu Nov 26 01:17:13 2015 +0000
tree 6b13b112383dc58f8f31d754e847e187086c0bb5
parent 6411cb684e5994834c441d94708d245d81b474a5
parent caf17eb5d71fb588fd1cc0c040f4d18538170e3d

Merge "NuPlayerRenderer: always display the first video frame without delay." am: 80b991393d am: bd060b5932
am: caf17eb5d7

* commit 'caf17eb5d71fb588fd1cc0c040f4d18538170e3d':
  NuPlayerRenderer: always display the first video frame without delay.

media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp

diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
index de0266c..bf91134 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
@@ -1088,6 +1088,9 @@
                 mMediaClock->updateAnchor(mediaTimeUs, nowUs, mediaTimeUs);
                 mAnchorTimeMediaUs = mediaTimeUs;
                 realTimeUs = nowUs;
+            } else if (!mVideoSampleReceived) {
+                // Always render the first video frame.
+                realTimeUs = nowUs;
             } else {
                 realTimeUs = getRealTimeUs(mediaTimeUs, nowUs);
             }
@@ -1148,7 +1151,7 @@
         return;
     }
 
-    int64_t nowUs = -1;
+    int64_t nowUs = ALooper::GetNowUs();
     int64_t realTimeUs;
     int64_t mediaTimeUs = -1;
     if (mFlags & FLAG_REAL_TIME) {
@@ -1156,16 +1159,12 @@
     } else {
         CHECK(entry->mBuffer->meta()->findInt64("timeUs", &mediaTimeUs));
 
-        nowUs = ALooper::GetNowUs();
         realTimeUs = getRealTimeUs(mediaTimeUs, nowUs);
     }
 
     bool tooLate = false;
 
     if (!mPaused) {
-        if (nowUs == -1) {
-            nowUs = ALooper::GetNowUs();
-        }
         setVideoLateByUs(nowUs - realTimeUs);
         tooLate = (mVideoLateByUs > 40000);
 
@@ -1197,6 +1196,12 @@
         }
     }
 
+    // Always render the first video frame while keeping stats on A/V sync.
+    if (!mVideoSampleReceived) {
+        realTimeUs = nowUs;
+        tooLate = false;
+    }
+
     entry->mNotifyConsumed->setInt64("timestampNs", realTimeUs * 1000ll);
     entry->mNotifyConsumed->setInt32("render", !tooLate);
     entry->mNotifyConsumed->post();