commit c8f7c350bec6534b4c5a9cc66fbb049a159311c3
author Wonsik Kim <wonsik@google.com> Tue Oct 11 17:10:36 2016 +0900
committer Wonsik Kim <wonsik@google.com> Wed Oct 12 07:39:02 2016 +0900
tree 2e86d9868b19bebe11da08da92ba535307f28177
parent 3e5de385d17aa0fec12f198d157397ed8e39a9aa

nuplayer: fix setting/finding buffer mismatch

Bug: 31922534
Test: Played the problematic files with Play Music app
Change-Id: Ife1d24835d69f298ab5099b271f7657881652b85

media/libmediaplayerservice/nuplayer/NuPlayerDecoderPassThrough.cpp

diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerDecoderPassThrough.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerDecoderPassThrough.cpp
index ffeea86..e4767ff 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayerDecoderPassThrough.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayerDecoderPassThrough.cpp
@@ -290,12 +290,8 @@
         return;
     }
 
-    sp<RefBase> obj;
-    bool hasBuffer = msg->findObject("buffer", &obj);
-    sp<MediaCodecBuffer> buffer;
-    if (hasBuffer) {
-        buffer = static_cast<MediaCodecBuffer *>(obj.get());
-    }
+    sp<ABuffer> buffer;
+    bool hasBuffer = msg->findBuffer("buffer", &buffer);
     if (buffer == NULL) {
         int32_t streamErr = ERROR_END_OF_STREAM;
         CHECK(msg->findInt32("err", &streamErr) || !hasBuffer);
@@ -324,10 +320,9 @@
     int32_t bufferSize = buffer->size();
     mCachedBytes += bufferSize;
 
+    int64_t timeUs = 0;
+    CHECK(buffer->meta()->findInt64("timeUs", &timeUs));
     if (mSkipRenderingUntilMediaTimeUs >= 0) {
-        int64_t timeUs = 0;
-        CHECK(buffer->meta()->findInt64("timeUs", &timeUs));
-
         if (timeUs < mSkipRenderingUntilMediaTimeUs) {
             ALOGV("[%s] dropping buffer at time %lld as requested.",
                      mComponentName.c_str(), (long long)timeUs);
@@ -348,7 +343,10 @@
     reply->setInt32("generation", mBufferGeneration);
     reply->setInt32("size", bufferSize);
 
-    mRenderer->queueBuffer(true /* audio */, buffer, reply);
+    sp<MediaCodecBuffer> mcBuffer = new MediaCodecBuffer(nullptr, buffer);
+    mcBuffer->meta()->setInt64("timeUs", timeUs);
+
+    mRenderer->queueBuffer(true /* audio */, mcBuffer, reply);
 
     ++mPendingBuffersToDrain;
     ALOGV("onInputBufferFilled: #ToDrain = %zu, cachedBytes = %zu",