Loading media/libaudiohal/impl/EffectHalAidl.cpp +4 −4 Original line number Diff line number Diff line Loading @@ -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); Loading Loading @@ -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; } Loading media/libaudiohal/impl/EffectHalAidl.h +4 −1 Original line number Diff line number Diff line Loading @@ -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; Loading Loading
media/libaudiohal/impl/EffectHalAidl.cpp +4 −4 Original line number Diff line number Diff line Loading @@ -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); Loading Loading @@ -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; } Loading
media/libaudiohal/impl/EffectHalAidl.h +4 −1 Original line number Diff line number Diff line Loading @@ -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; Loading