commit 44a5a202101614302f607228d4357496b350bab4
author Chong Zhang <chz@google.com> Wed Aug 13 21:02:11 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 12 23:14:35 2014 +0000
tree 11a82e68806206558b328320f3d785aea56fa8dd
parent 47bf8d8f0242bbe9cfa777c96e41e5fcd5294ee4
parent de01afbbc55ac9c5c23ec66154603f34217aed2c

Merge "cache up to 200K bytes (instead of 10 buffers) in DecoderPassThrough" into lmp-dev

media/libmediaplayerservice/nuplayer/NuPlayerDecoderPassThrough.cpp

diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerDecoderPassThrough.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerDecoderPassThrough.cpp
index eec6960..c9be0dd 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayerDecoderPassThrough.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayerDecoderPassThrough.cpp
@@ -31,6 +31,7 @@
 namespace android {
 
 static const int kMaxPendingBuffers = 10;
+static const int kMaxCachedBytes = 200000;
 
 NuPlayer::DecoderPassThrough::DecoderPassThrough(
         const sp<AMessage> &notify)
@@ -39,6 +40,7 @@
       mBufferGeneration(0),
       mReachedEOS(true),
       mPendingBuffers(0),
+      mCachedBytes(0),
       mComponentName("pass through decoder") {
     mDecoderLooper = new ALooper;
     mDecoderLooper->setName("NuPlayerDecoderPassThrough");
@@ -78,6 +80,7 @@
 void NuPlayer::DecoderPassThrough::onConfigure(const sp<AMessage> &format) {
     ALOGV("[%s] onConfigure", mComponentName.c_str());
     mPendingBuffers = 0;
+    mCachedBytes = 0;
     mReachedEOS = false;
     ++mBufferGeneration;
 
@@ -96,7 +99,7 @@
 }
 
 void NuPlayer::DecoderPassThrough::requestABuffer() {
-    if (mPendingBuffers >= kMaxPendingBuffers || mReachedEOS) {
+    if (mCachedBytes >= kMaxCachedBytes || mReachedEOS) {
         ALOGV("[%s] mReachedEOS=%d, max pending buffers(%d:%d)",
                 mComponentName.c_str(), (mReachedEOS ? 1 : 0),
                 mPendingBuffers, kMaxPendingBuffers);
@@ -136,8 +139,11 @@
         return;
     }
 
+    mCachedBytes += buffer->size();
+
     sp<AMessage> reply = new AMessage(kWhatBufferConsumed, id());
     reply->setInt32("generation", mBufferGeneration);
+    reply->setInt32("size", buffer->size());
 
     sp<AMessage> notify = mNotify->dup();
     notify->setInt32("what", kWhatDrainThisBuffer);
@@ -146,8 +152,9 @@
     notify->post();
 }
 
-void NuPlayer::DecoderPassThrough::onBufferConsumed() {
+void NuPlayer::DecoderPassThrough::onBufferConsumed(int32_t size) {
     mPendingBuffers--;
+    mCachedBytes -= size;
     sp<AMessage> message = new AMessage(kWhatRequestABuffer, id());
     message->setInt32("generation", mBufferGeneration);
     message->post();
@@ -160,6 +167,7 @@
     notify->setInt32("what", kWhatFlushCompleted);
     notify->post();
     mPendingBuffers = 0;
+    mCachedBytes = 0;
     mReachedEOS = false;
 }
 
@@ -205,7 +213,9 @@
         case kWhatBufferConsumed:
         {
             if (!isStaleReply(msg)) {
-                onBufferConsumed();
+                int32_t size;
+                CHECK(msg->findInt32("size", &size));
+                onBufferConsumed(size);
             }
             break;
         }

media/libmediaplayerservice/nuplayer/NuPlayerDecoderPassThrough.h

diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerDecoderPassThrough.h b/media/libmediaplayerservice/nuplayer/NuPlayerDecoderPassThrough.h
index e9e5658..8590856 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayerDecoderPassThrough.h
+++ b/media/libmediaplayerservice/nuplayer/NuPlayerDecoderPassThrough.h
@@ -61,12 +61,13 @@
     void onConfigure(const sp<AMessage> &format);
     void onFlush();
     void onInputBufferFilled(const sp<AMessage> &msg);
-    void onBufferConsumed();
+    void onBufferConsumed(int32_t size);
     void onShutdown();
 
     int32_t mBufferGeneration;
     bool mReachedEOS;
     int32_t mPendingBuffers;
+    int32_t mCachedBytes;
     AString mComponentName;
 
     DISALLOW_EVIL_CONSTRUCTORS(DecoderPassThrough);