commit 64f62df6acbab53b47fadf4c9e3b77206a600a03
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Dec 15 02:00:12 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Dec 15 02:00:12 2017 +0000
tree 76453a587711d4720f4a742f6b5093127cfc3f9a
parent e5b50aeedba87b11b278105cc42343691a5b9e2f
parent 5ed2faf66791b345bb94406b4aeddd6271c25e01

Merge "NuPlayer2Decoder: Count all nuplayer frames"

media/libmedia/nuplayer2/NuPlayer2Decoder.cpp

diff --git a/media/libmedia/nuplayer2/NuPlayer2Decoder.cpp b/media/libmedia/nuplayer2/NuPlayer2Decoder.cpp
index 18207b0..d78a8e8 100644
--- a/media/libmedia/nuplayer2/NuPlayer2Decoder.cpp
+++ b/media/libmedia/nuplayer2/NuPlayer2Decoder.cpp
@@ -766,6 +766,8 @@
         reply->setInt32("eos", true);
     }
 
+    mNumFramesTotal += !mIsAudio;
+
     if (mSkipRenderingUntilMediaTimeUs >= 0) {
         if (timeUs < mSkipRenderingUntilMediaTimeUs) {
             ALOGV("[%s] dropping buffer at time %lld as requested.",
@@ -784,8 +786,6 @@
         mSkipRenderingUntilMediaTimeUs = -1;
     }
 
-    mNumFramesTotal += !mIsAudio;
-
     // wait until 1st frame comes out to signal resume complete
     notifyResumeCompleteIfNecessary();