commit bc5fe9ab1c55bf114fdc217df2c9bf4adfa41a2f
author Praveen Chavan <pchavan@codeaurora.org> Fri Apr 27 16:18:11 2018 -0700
committer Lajos Molnar <lajos@google.com> Mon May 21 23:01:58 2018 -0700
tree a72ca3f86392fee1de7f79b90a48060ca2a7c80a
parent 7bb4333ff2298d0cc1a2125e18a21c174bced01d

NuPlayer: Do not account eos frames in dropped-frame-counter

eos-only frames at the end are not rendered. However, these must
not be counted as dropped since they are empty eos outputs

Bug: 79493409
Change-Id: Idabaf5cbaaa990860a148bbc6ecafc85f053d5ef

media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp

diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
index 2a08f62..69cd82e 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
@@ -745,6 +745,7 @@
     sp<AMessage> reply = new AMessage(kWhatRenderBuffer, this);
     reply->setSize("buffer-ix", index);
     reply->setInt32("generation", mBufferGeneration);
+    reply->setSize("size", size);
 
     if (eos) {
         ALOGI("[%s] saw output EOS", mIsAudio ? "audio" : "video");
@@ -1127,6 +1128,7 @@
     int32_t render;
     size_t bufferIx;
     int32_t eos;
+    size_t size;
     CHECK(msg->findSize("buffer-ix", &bufferIx));
 
     if (!mIsAudio) {
@@ -1146,7 +1148,10 @@
         CHECK(msg->findInt64("timestampNs", &timestampNs));
         err = mCodec->renderOutputBufferAndRelease(bufferIx, timestampNs);
     } else {
-        mNumOutputFramesDropped += !mIsAudio;
+        if (!msg->findInt32("eos", &eos) || !eos ||
+                !msg->findSize("size", &size) || size) {
+            mNumOutputFramesDropped += !mIsAudio;
+        }
         err = mCodec->releaseOutputBuffer(bufferIx);
     }
     if (err != OK) {