diff options
| author | 2021-06-18 17:45:42 +0000 | |
|---|---|---|
| committer | 2021-06-18 17:45:42 +0000 | |
| commit | e31243e10cd00740edca5d771f5a06b7e14a6287 (patch) | |
| tree | 89785b483c4b7dd8c8891e0784f810cd73fd65eb /libs/gui/SurfaceComposerClient.cpp | |
| parent | 45ddb87d7e547af7bdf39c6cfe959e847b61e365 (diff) | |
| parent | 19e047fb7c39fe52ab4bfbb02c09056b1b14d6f0 (diff) | |
Merge changes from topic "sf_maxAcquiredBufferCount" into sc-dev am: a9e4e2fb7a am: 19e047fb7c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/14633449
Change-Id: Iae9b092dba5eedc8a83c6063e9d198bfa3804808
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 a4ff4c8b6e..cf9afa1414 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( |