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

Commit fc03254c authored by Shunkai Yao's avatar Shunkai Yao Committed by Gerrit Code Review
Browse files

Merge changes Ia7b57ed5,I7e37a289,I1149f37f 

* changes:
  Return correct value for virtualizer speaker angle getter
  Write unity gain back with successful EFFECT_CMD_SET_VOLUME handling
  Add isProxy in effect AIDL conversion helper constructor
parents 24cc4b73 4129c07e

media/libaudiohal/impl/EffectConversionHelperAidl.cpp

+14 −7
Original line number Diff line number Diff line
@@ -72,14 +72,13 @@ const std::map<uint32_t /* effect_command_e */, EffectConversionHelperAidl::Comm 


EffectConversionHelperAidl::EffectConversionHelperAidl(

        std::shared_ptr<::aidl::android::hardware::audio::effect::IEffect> effect,

        int32_t sessionId, int32_t ioId, const Descriptor& desc)

        int32_t sessionId, int32_t ioId, const Descriptor& desc, bool isProxy)

    : mSessionId(sessionId),

      mIoId(ioId),

      mDesc(desc),

      mEffect(std::move(effect)),

      mIsInputStream(mDesc.common.flags.type == Flags::Type::PRE_PROC),

      mIsProxyEffect(mDesc.common.id.proxy.has_value() &&

                     mDesc.common.id.proxy.value() == mDesc.common.id.uuid) {

      mIsProxyEffect(isProxy) {

    mCommon.session = sessionId;

    mCommon.ioHandle = ioId;

    mCommon.input = mCommon.output = kDefaultAudioConfig;
@@ -319,17 +318,25 @@ status_t EffectConversionHelperAidl::handleSetDevice(uint32_t cmdSize, const voi 
            mEffect->setParameter(Parameter::make<Parameter::deviceDescription>(aidlDevices))));

    return *static_cast<int32_t*>(pReplyData) = OK;

}



status_t EffectConversionHelperAidl::handleSetVolume(uint32_t cmdSize, const void* pCmdData,

                                                     uint32_t* replySize __unused,

                                                     void* pReplyData __unused) {

                                                     uint32_t* replySize, void* pReplyData) {

    if (cmdSize != 2 * sizeof(uint32_t) || !pCmdData) {

        ALOGE("%s parameter invalid %u %p", __func__, cmdSize, pCmdData);

        return BAD_VALUE;

    }

    Parameter::VolumeStereo volume = {.left = (float)(*(uint32_t*)pCmdData) / (1 << 24),

                                      .right = (float)(*(uint32_t*)pCmdData + 1) / (1 << 24)};



    constexpr uint32_t unityGain = 1 << 24;

    Parameter::VolumeStereo volume = {.left = (float)(*(uint32_t*)pCmdData) / unityGain,

                                      .right = (float)(*(uint32_t*)pCmdData + 1) / unityGain};

    RETURN_STATUS_IF_ERROR(statusTFromBinderStatus(

            mEffect->setParameter(Parameter::make<Parameter::volumeStereo>(volume))));



    // write unity gain back if volume was successfully set

    if (replySize && *replySize == 2 * sizeof(uint32_t) && pReplyData) {

        constexpr uint32_t vol_ret[2] = {unityGain, unityGain};

        memcpy(pReplyData, vol_ret, sizeof(vol_ret));

    }

    return OK;

}

media/libaudiohal/impl/EffectConversionHelperAidl.h

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ class EffectConversionHelperAidl { 
    EffectConversionHelperAidl(

            std::shared_ptr<::aidl::android::hardware::audio::effect::IEffect> effect,

            int32_t sessionId, int32_t ioId,

            const ::aidl::android::hardware::audio::effect::Descriptor& desc);

            const ::aidl::android::hardware::audio::effect::Descriptor& desc, bool isProxy);



    status_t handleSetParameter(uint32_t cmdSize, const void* pCmdData, uint32_t* replySize,

                                void* pReplyData);

media/libaudiohal/impl/EffectHalAidl.cpp

+23 −23
Original line number Diff line number Diff line
@@ -89,64 +89,64 @@ status_t EffectHalAidl::createAidlConversion( 
    ALOGI("%s create UUID %s", __func__, typeUuid.toString().c_str());

    if (typeUuid ==

        ::aidl::android::hardware::audio::effect::getEffectTypeUuidAcousticEchoCanceler()) {

        mConversion =

                std::make_unique<android::effect::AidlConversionAec>(effect, sessionId, ioId, desc);

        mConversion = std::make_unique<android::effect::AidlConversionAec>(effect, sessionId, ioId,

                                                                           desc, mIsProxyEffect);

    } else if (typeUuid == ::aidl::android::hardware::audio::effect::

                                   getEffectTypeUuidAutomaticGainControlV1()) {

        mConversion = std::make_unique<android::effect::AidlConversionAgc1>(effect, sessionId, ioId,

                                                                            desc);

                                                                            desc, mIsProxyEffect);

    } else if (typeUuid == ::aidl::android::hardware::audio::effect::

                                   getEffectTypeUuidAutomaticGainControlV2()) {

        mConversion = std::make_unique<android::effect::AidlConversionAgc2>(effect, sessionId, ioId,

                                                                            desc);

                                                                            desc, mIsProxyEffect);

    } else if (typeUuid == ::aidl::android::hardware::audio::effect::getEffectTypeUuidBassBoost()) {

        mConversion = std::make_unique<android::effect::AidlConversionBassBoost>(effect, sessionId,

                                                                                 ioId, desc);

        mConversion = std::make_unique<android::effect::AidlConversionBassBoost>(

                effect, sessionId, ioId, desc, mIsProxyEffect);

    } else if (typeUuid == ::aidl::android::hardware::audio::effect::getEffectTypeUuidDownmix()) {

        mConversion = std::make_unique<android::effect::AidlConversionDownmix>(effect, sessionId,

                                                                               ioId, desc);

        mConversion = std::make_unique<android::effect::AidlConversionDownmix>(

                effect, sessionId, ioId, desc, mIsProxyEffect);

    } else if (typeUuid ==

               ::aidl::android::hardware::audio::effect::getEffectTypeUuidDynamicsProcessing()) {

        mConversion =

                std::make_unique<android::effect::AidlConversionDp>(effect, sessionId, ioId, desc);

        mConversion = std::make_unique<android::effect::AidlConversionDp>(effect, sessionId, ioId,

                                                                          desc, mIsProxyEffect);

    } else if (typeUuid == ::aidl::android::hardware::audio::effect::getEffectTypeUuidEnvReverb()) {

        mConversion = std::make_unique<android::effect::AidlConversionEnvReverb>(effect, sessionId,

                                                                                 ioId, desc);

        mConversion = std::make_unique<android::effect::AidlConversionEnvReverb>(

                effect, sessionId, ioId, desc, mIsProxyEffect);

    } else if (typeUuid == ::aidl::android::hardware::audio::effect::getEffectTypeUuidEqualizer()) {

        mConversion =

                std::make_unique<android::effect::AidlConversionEq>(effect, sessionId, ioId, desc);

        mConversion = std::make_unique<android::effect::AidlConversionEq>(effect, sessionId, ioId,

                                                                          desc, mIsProxyEffect);

    } else if (typeUuid ==

               ::aidl::android::hardware::audio::effect::getEffectTypeUuidHapticGenerator()) {

        mConversion = std::make_unique<android::effect::AidlConversionHapticGenerator>(

                effect, sessionId, ioId, desc);

                effect, sessionId, ioId, desc, mIsProxyEffect);

    } else if (typeUuid ==

               ::aidl::android::hardware::audio::effect::getEffectTypeUuidLoudnessEnhancer()) {

        mConversion = std::make_unique<android::effect::AidlConversionLoudnessEnhancer>(

                effect, sessionId, ioId, desc);

                effect, sessionId, ioId, desc, mIsProxyEffect);

    } else if (typeUuid ==

               ::aidl::android::hardware::audio::effect::getEffectTypeUuidNoiseSuppression()) {

        mConversion = std::make_unique<android::effect::AidlConversionNoiseSuppression>(

                effect, sessionId, ioId, desc);

                effect, sessionId, ioId, desc, mIsProxyEffect);

    } else if (typeUuid ==

               ::aidl::android::hardware::audio::effect::getEffectTypeUuidPresetReverb()) {

        mConversion = std::make_unique<android::effect::AidlConversionPresetReverb>(

                effect, sessionId, ioId, desc);

                effect, sessionId, ioId, desc, mIsProxyEffect);

    } else if (typeUuid ==

               ::aidl::android::hardware::audio::effect::getEffectTypeUuidSpatializer()) {

        mConversion = std::make_unique<android::effect::AidlConversionSpatializer>(

                effect, sessionId, ioId, desc);

                effect, sessionId, ioId, desc, mIsProxyEffect);

    } else if (typeUuid ==

               ::aidl::android::hardware::audio::effect::getEffectTypeUuidVirtualizer()) {

        mConversion = std::make_unique<android::effect::AidlConversionVirtualizer>(

                effect, sessionId, ioId, desc);

                effect, sessionId, ioId, desc, mIsProxyEffect);

    } else if (typeUuid ==

               ::aidl::android::hardware::audio::effect::getEffectTypeUuidVisualizer()) {

        mConversion = std::make_unique<android::effect::AidlConversionVisualizer>(effect, sessionId,

                                                                                  ioId, desc);

        mConversion = std::make_unique<android::effect::AidlConversionVisualizer>(

                effect, sessionId, ioId, desc, mIsProxyEffect);

    } else {

        // For unknown UUID, use vendor extension implementation

        mConversion = std::make_unique<android::effect::AidlConversionVendorExtension>(

                effect, sessionId, ioId, desc);

                effect, sessionId, ioId, desc, mIsProxyEffect);

    }

    return OK;

}

media/libaudiohal/impl/effectsAidlConversion/AidlConversionAec.h

+3 −2
Original line number Diff line number Diff line
@@ -26,8 +26,9 @@ class AidlConversionAec : public EffectConversionHelperAidl { 
  public:

    AidlConversionAec(std::shared_ptr<::aidl::android::hardware::audio::effect::IEffect> effect,

                      int32_t sessionId, int32_t ioId,

                      const ::aidl::android::hardware::audio::effect::Descriptor& desc)

        : EffectConversionHelperAidl(effect, sessionId, ioId, desc) {}

                      const ::aidl::android::hardware::audio::effect::Descriptor& desc,

                      bool isProxyEffect)

        : EffectConversionHelperAidl(effect, sessionId, ioId, desc, isProxyEffect) {}

    ~AidlConversionAec() {}



  private:

media/libaudiohal/impl/effectsAidlConversion/AidlConversionAgc1.h

+3 −2
Original line number Diff line number Diff line
@@ -26,8 +26,9 @@ class AidlConversionAgc1 : public EffectConversionHelperAidl { 
  public:

    AidlConversionAgc1(std::shared_ptr<::aidl::android::hardware::audio::effect::IEffect> effect,

                       int32_t sessionId, int32_t ioId,

                       const ::aidl::android::hardware::audio::effect::Descriptor& desc)

        : EffectConversionHelperAidl(effect, sessionId, ioId, desc) {}

                       const ::aidl::android::hardware::audio::effect::Descriptor& desc,

                       bool isProxyEffect)

        : EffectConversionHelperAidl(effect, sessionId, ioId, desc, isProxyEffect) {}

    ~AidlConversionAgc1() {}



  private: