commit 671c76ffd6631d2d87409b12e670b1ebe10edb94
author Sungtak Lee <taklee@google.com> Thu Oct 31 16:42:56 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Oct 31 16:42:56 2019 -0700
tree 779e020b0fa82283d811cfcfd68e3ba75828fc44
parent 9d1cde5604f6704358d5d2eb49a96b54cd29d888
parent aa700c13def7b34945bc48cd2706707178adbb5a

Merge "bufferpool@2.0 tune eviction params" into qt-qpr1-dev
am: aa700c13de

Change-Id: I74eaa34cedf3edba08e73e4c6bb9871cd97a2e4a

media/bufferpool/2.0/AccessorImpl.cpp

diff --git a/media/bufferpool/2.0/AccessorImpl.cpp b/media/bufferpool/2.0/AccessorImpl.cpp
index cacd465..0d591d7 100644
--- a/media/bufferpool/2.0/AccessorImpl.cpp
+++ b/media/bufferpool/2.0/AccessorImpl.cpp
@@ -37,7 +37,7 @@
     static constexpr int64_t kLogDurationUs = 5000000; // 5 secs
 
     static constexpr size_t kMinAllocBytesForEviction = 1024*1024*15;
-    static constexpr size_t kMinBufferCountForEviction = 40;
+    static constexpr size_t kMinBufferCountForEviction = 25;
 }
 
 // Buffer structure in bufferpool process
@@ -718,8 +718,8 @@
                   mStats.mTotalFetches, mStats.mTotalTransfers);
         }
         for (auto freeIt = mFreeBuffers.begin(); freeIt != mFreeBuffers.end();) {
-            if (!clearCache && mStats.mSizeCached < kMinAllocBytesForEviction
-                    && mBuffers.size() < kMinBufferCountForEviction) {
+            if (!clearCache && (mStats.mSizeCached < kMinAllocBytesForEviction
+                    || mBuffers.size() < kMinBufferCountForEviction)) {
                 break;
             }
             auto it = mBuffers.find(*freeIt);