diff options
author | 2021-06-18 17:27:23 +0000 | |
---|---|---|
committer | 2021-06-18 17:27:23 +0000 | |
commit | 19e047fb7c39fe52ab4bfbb02c09056b1b14d6f0 (patch) | |
tree | f5db4963468dc335b300cc870b462697ca7e3ee2 /libs/gui/SurfaceComposerClient.cpp | |
parent | 4678b7eb290a6e10265845044278b04a5ca0a6e3 (diff) | |
parent | a9e4e2fb7aea58d18c230e9fb8d40da72537997e (diff) |
Merge changes from topic "sf_maxAcquiredBufferCount" into sc-dev am: a9e4e2fb7a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/14633449
Change-Id: I6d4b537877a1c2aabaddce45e1efb32ab0b0b362
Diffstat (limited to 'libs/gui/SurfaceComposerClient.cpp')
-rw-r--r-- | libs/gui/SurfaceComposerClient.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libs/gui/SurfaceComposerClient.cpp b/libs/gui/SurfaceComposerClient.cpp index 660c5bd97d..c69435d328 100644 --- a/libs/gui/SurfaceComposerClient.cpp +++ b/libs/gui/SurfaceComposerClient.cpp @@ -328,7 +328,8 @@ void TransactionCompletedListener::onTransactionCompleted(ListenerStats listener surfaceStats.previousReleaseFence ? surfaceStats.previousReleaseFence : Fence::NO_FENCE, - surfaceStats.transformHint); + surfaceStats.transformHint, + surfaceStats.currentMaxAcquiredBufferCount); } } } @@ -364,9 +365,9 @@ void TransactionCompletedListener::onTransactionCompleted(ListenerStats listener } } -void TransactionCompletedListener::onReleaseBuffer(uint64_t graphicBufferId, - sp<Fence> releaseFence, - uint32_t transformHint) { +void TransactionCompletedListener::onReleaseBuffer(uint64_t graphicBufferId, sp<Fence> releaseFence, + uint32_t transformHint, + uint32_t currentMaxAcquiredBufferCount) { ReleaseBufferCallback callback; { std::scoped_lock<std::mutex> lock(mMutex); @@ -376,7 +377,7 @@ void TransactionCompletedListener::onReleaseBuffer(uint64_t graphicBufferId, ALOGE("Could not call release buffer callback, buffer not found %" PRIu64, graphicBufferId); return; } - callback(graphicBufferId, releaseFence, transformHint); + callback(graphicBufferId, releaseFence, transformHint, currentMaxAcquiredBufferCount); } ReleaseBufferCallback TransactionCompletedListener::popReleaseBufferCallbackLocked( |