| commit | 22be7c72b92cd78345ac96090c3bac20e208b41f | [log] [tgz] |
|---|---|---|
| author | Shunkai Yao <yaoshunkai@google.com> | Mon Jan 29 20:07:06 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jan 29 20:07:06 2024 +0000 |
| tree | b97050e2931399edebc6a1dc6b7eb023c24fcd58 | |
| parent | 02ebb5bf6d4a6ecc06ffb084b47180ae066b3b8f [diff] | |
| parent | 7a972243829e7face5f72ae4f54e189fba9620d9 [diff] |
Merge "Check work buffer size before effect process" into main am: 74b739d798 am: 7a97224382 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2927151 Change-Id: Ic414f8b9badcda05577a02a15251f2ed6c810a67 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/media/libeffects/downmix/aidl/EffectDownmix.cpp b/media/libeffects/downmix/aidl/EffectDownmix.cpp index c82c23b..46156ce 100644 --- a/media/libeffects/downmix/aidl/EffectDownmix.cpp +++ b/media/libeffects/downmix/aidl/EffectDownmix.cpp
@@ -195,6 +195,8 @@ const auto availableToWrite = outputMQ->availableToWrite() * mImplContext->getInputFrameSize() / mImplContext->getOutputFrameSize(); + assert(mImplContext->getWorkBufferSize() >= + std::max(availableToRead(), availableToWrite)); auto processSamples = std::min(availableToRead, availableToWrite); if (processSamples) { inputMQ->read(buffer, processSamples);