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

Commit 4db4d8b6 authored by Shunkai Yao's avatar Shunkai Yao Committed by Automerger Merge Worker
Browse files

Merge "[AIDL CTS] Fix DynamicsProcessingTest cts issue with AIDL" am:... 

Merge "[AIDL CTS] Fix DynamicsProcessingTest cts issue with AIDL" am: 25e2f1de am: 04c91011 am: 64bd2925

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



Change-Id: I44369b2416fd02c1f54558c74fb9a43ecf0cdb3b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 934297de 64bd2925

media/libaudiohal/impl/EffectConversionHelperAidl.cpp

+26 −5
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ namespace effect { 
using ::aidl::android::aidl_utils::statusTFromBinderStatus;

using ::aidl::android::hardware::audio::effect::CommandId;

using ::aidl::android::hardware::audio::effect::Descriptor;

using ::aidl::android::hardware::audio::effect::Flags;

using ::aidl::android::hardware::audio::effect::Parameter;

using ::aidl::android::media::audio::common::AudioDeviceDescription;

using ::aidl::android::media::audio::common::AudioMode;
@@ -67,7 +68,11 @@ 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)

    : mSessionId(sessionId), mIoId(ioId), mDesc(desc), mEffect(std::move(effect)) {

    : mSessionId(sessionId),

      mIoId(ioId),

      mDesc(desc),

      mEffect(std::move(effect)),

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

    mCommon.session = sessionId;

    mCommon.ioHandle = ioId;

    mCommon.input = mCommon.output = kDefaultAudioConfig;
@@ -139,16 +144,32 @@ status_t EffectConversionHelperAidl::handleGetParameter(uint32_t cmdSize, const 
    return ret;

}



status_t EffectConversionHelperAidl::handleSetConfig(uint32_t cmdSize,

                                                     const void* pCmdData __unused,

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

                                                     uint32_t* replySize, void* pReplyData) {

    if (!replySize || *replySize != sizeof(int) || !pReplyData ||

        cmdSize != sizeof(effect_config_t)) {

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

              pReplyData);

        return BAD_VALUE;

    }



    // TODO: need to implement setConfig with setParameter(common)

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

    effect_config_t* config = (effect_config_t*)pCmdData;

    Parameter::Common aidlCommon = {

            .session = mSessionId,

            .ioHandle = mIoId,

            .input = {.base = VALUE_OR_RETURN_STATUS(

                              ::aidl::android::legacy2aidl_buffer_config_t_AudioConfigBase(

                                      config->inputCfg, mIsInputStream))},

            .output = {.base = VALUE_OR_RETURN_STATUS(

                               ::aidl::android::legacy2aidl_buffer_config_t_AudioConfigBase(

                                       config->outputCfg, mIsInputStream))}};



    Parameter aidlParam = UNION_MAKE(Parameter, common, aidlCommon);



    status_t ret = statusTFromBinderStatus(mEffect->setParameter(aidlParam));

    EffectParamWriter writer(*(effect_param_t*)pReplyData);

    writer.setStatus(ret);

    return ret;

}



status_t EffectConversionHelperAidl::handleGetConfig(uint32_t cmdSize __unused,

media/libaudiohal/impl/EffectConversionHelperAidl.h

+2 −0
Original line number Diff line number Diff line
@@ -40,6 +40,8 @@ class EffectConversionHelperAidl { 
    const int32_t mIoId;

    const ::aidl::android::hardware::audio::effect::Descriptor mDesc;

    const std::shared_ptr<::aidl::android::hardware::audio::effect::IEffect> mEffect;

    // whether the effect is instantiated on an input stream

    const bool mIsInputStream;

    ::aidl::android::hardware::audio::effect::IEffect::OpenEffectReturn mOpenReturn;

    ::aidl::android::hardware::audio::effect::Parameter::Common mCommon;

media/libaudiohal/impl/effectsAidlConversion/AidlConversionDynamicsProcessing.cpp

+91 −148

File changed.

Preview size limit exceeded, changes collapsed.

media/libeffects/dynamicsproc/aidl/DynamicsProcessingContext.cpp

+1 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ void DynamicsProcessingContext::reset() { 
RetCode DynamicsProcessingContext::setCommon(const Parameter::Common& common) {

    mCommon = common;

    init();

    LOG(INFO) << __func__ << common.toString();

    return RetCode::SUCCESS;

}