| commit | 249f2a0642c2ff3344b72d2d1cd5641925511b16 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Wed Dec 04 09:47:06 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Dec 04 09:47:06 2024 +0000 |
| tree | 660e17341664a01c0522df9d8ac98a739be08cad | |
| parent | 1c53bdcf675ffe87aa7d2213923d5389efc7a52a [diff] | |
| parent | be7d4dceb683c2db7f4a9ac2b27d7fb16eddbd25 [diff] |
Merge "EffectHalAidl: continue effect processing in DRAINING state" into main am: be7d4dceb6 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3390760 Change-Id: If27b7456620db1ed53d750058dcc0a73738793b9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/media/libaudiohal/impl/EffectHalAidl.cpp b/media/libaudiohal/impl/EffectHalAidl.cpp index 9fdde49..658fc18b 100644 --- a/media/libaudiohal/impl/EffectHalAidl.cpp +++ b/media/libaudiohal/impl/EffectHalAidl.cpp
@@ -184,7 +184,7 @@ status_t EffectHalAidl::process() { State state = State::INIT; if (mConversion->isBypassing() || !mEffect->getState(&state).isOk() || - state != State::PROCESSING) { + (state != State::PROCESSING && state != State::DRAINING)) { ALOGI("%s skipping process because it's %s", mEffectName.c_str(), mConversion->isBypassing() ? "bypassing"