Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50f4ee24 authored by Shunkai Yao's avatar Shunkai Yao Committed by Automerger Merge Worker
Browse files

Merge "EffectHalAidl: set the datamq event flag at intialization time" into...

Merge "EffectHalAidl: set the datamq event flag at intialization time" into main am: d8e56f0a am: 90da8272

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3270336



Change-Id: Ib6d48701607604efe49735e0158cc4a00b5efdde
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1731e2be 90da8272
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -80,7 +80,9 @@ EffectHalAidl::EffectHalAidl(const std::shared_ptr<IFactory>& factory,
          int version = 0;
          // use factory HAL version because effect can be an EffectProxy instance
          return factory->getInterfaceVersion(&version).isOk() ? version : 0;
      }()) {
      }()),
      mEventFlagDataMqNotEmpty(mHalVersion >= kReopenSupportedVersion ? kEventFlagDataMqNotEmpty
                                                                      : kEventFlagNotEmpty) {
    assert(mFactory != nullptr);
    assert(mEffect != nullptr);
    createAidlConversion(effect, sessionId, ioId, desc);
@@ -249,9 +251,7 @@ size_t EffectHalAidl::writeToHalInputFmqAndSignal(
        return 0;
    }

    // for V2 audio effect HAL, expect different EventFlag to avoid bit conflict with FMQ_NOT_EMPTY
    efGroup->wake(mHalVersion >= kReopenSupportedVersion ? kEventFlagDataMqNotEmpty
                                                         : kEventFlagNotEmpty);
    efGroup->wake(mEventFlagDataMqNotEmpty);
    return samplesToWrite;
}

+4 −1
Original line number Diff line number Diff line
@@ -73,7 +73,10 @@ class EffectHalAidl : public EffectHalInterface {
    const int32_t mSessionId;
    const int32_t mIoId;
    const bool mIsProxyEffect;
    const int mHalVersion;
    const int32_t mHalVersion;
    // Audio effect HAL v2+ changes flag to kEventFlagDataMqNotEmpty to avoid conflict from using
    // kEventFlagNotEmpty
    const uint32_t mEventFlagDataMqNotEmpty;
    bool mIsHapticGenerator = false;
    std::string mEffectName;