commit 13993233c3116e300804256815f852325e0e65ef
author Shunkai Yao <yaoshunkai@google.com> Thu Sep 14 22:49:41 2023 +0000
committer Shunkai Yao <yaoshunkai@google.com> Thu Sep 14 22:49:41 2023 +0000
tree f2d713030e27910b44a1e340866ab198f40c4c8a
parent 0a047987fb9bb84a0d48f5446224e37d3cbd29f2

AIDL effect: Replace offload check with HardwareAccelerator mode

Bug: 297295866
Test: Enable AIDL and test on Pixel YTM
Change-Id: Ifdeb7d414939e6496d44f7c1fbdf830f2726a88c

media/libaudiohal/impl/EffectConversionHelperAidl.cpp

diff --git a/media/libaudiohal/impl/EffectConversionHelperAidl.cpp b/media/libaudiohal/impl/EffectConversionHelperAidl.cpp
index 80cb80d..751c239 100644
--- a/media/libaudiohal/impl/EffectConversionHelperAidl.cpp
+++ b/media/libaudiohal/impl/EffectConversionHelperAidl.cpp
@@ -165,14 +165,14 @@
 
     effect_config_t* config = (effect_config_t*)pCmdData;
     Parameter::Common common = {
+            .session = mCommon.session,
+            .ioHandle = mCommon.ioHandle,
             .input =
                     VALUE_OR_RETURN_STATUS(::aidl::android::legacy2aidl_buffer_config_t_AudioConfig(
                             config->inputCfg, mIsInputStream)),
             .output =
                     VALUE_OR_RETURN_STATUS(::aidl::android::legacy2aidl_buffer_config_t_AudioConfig(
-                            config->outputCfg, mIsInputStream)),
-            .session = mCommon.session,
-            .ioHandle = mCommon.ioHandle};
+                            config->outputCfg, mIsInputStream))};
 
     State state;
     RETURN_STATUS_IF_ERROR(statusTFromBinderStatus(mEffect->getState(&state)));
@@ -456,7 +456,7 @@
                   efGroup);
             status = (status == OK) ? BAD_VALUE : status;
         }
-    } else if (isBypassingOrOffload()) {
+    } else if (isBypassingOrTunnel()) {
         // for effect with bypass (no processing) or offloadIndication flag, it's okay to not have
         // statusQ
         return OK;
@@ -466,8 +466,8 @@
     return status;
 }
 
-bool EffectConversionHelperAidl::isBypassingOrOffload() const {
-    return isBypassing() || isOffload();
+bool EffectConversionHelperAidl::isBypassingOrTunnel() const {
+    return isBypassing() || isTunnel();
 }
 
 bool EffectConversionHelperAidl::isBypassing() const {
@@ -476,10 +476,10 @@
             (mIsProxyEffect && std::static_pointer_cast<EffectProxy>(mEffect)->isBypassing()));
 }
 
-bool EffectConversionHelperAidl::isOffload() const {
+bool EffectConversionHelperAidl::isTunnel() const {
     return mEffect &&
-           (mDesc.common.flags.offloadIndication ||
-            (mIsProxyEffect && std::static_pointer_cast<EffectProxy>(mEffect)->isOffload()));
+           (mDesc.common.flags.hwAcceleratorMode == Flags::HardwareAccelerator::TUNNEL ||
+            (mIsProxyEffect && std::static_pointer_cast<EffectProxy>(mEffect)->isTunnel()));
 }
 
 Descriptor EffectConversionHelperAidl::getDescriptor() const {