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

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

Add an AIDL interface for reopen when dataMQ not valid am: e67f8727 

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



Change-Id: I8d06d1d81500d566a8e603040cf1350297add19f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0d6c0190 e67f8727

media/libaudiohal/impl/EffectConversionHelperAidl.cpp

+0 −12
Original line number Diff line number Diff line
@@ -180,18 +180,6 @@ status_t EffectConversionHelperAidl::handleSetConfig(uint32_t cmdSize, const voi 


    State state;

    RETURN_STATUS_IF_ERROR(statusTFromBinderStatus(mEffect->getState(&state)));

    // in case of buffer/ioHandle re-configure for an opened effect, close it and re-open

    if (state != State::INIT && mCommon != common) {

        ALOGI("%s at state %s, common parameter change from %s to %s, closing effect", __func__,

              android::internal::ToString(state).c_str(), mCommon.toString().c_str(),

              common.toString().c_str());

        RETURN_STATUS_IF_ERROR(statusTFromBinderStatus(mEffect->close()));

        RETURN_STATUS_IF_ERROR(statusTFromBinderStatus(mEffect->getState(&state)));

        mStatusQ.reset();

        mInputQ.reset();

        mOutputQ.reset();

    }



    if (state == State::INIT) {

        ALOGI("%s at state %s, opening effect with input %s output %s", __func__,

              android::internal::ToString(state).c_str(), common.input.toString().c_str(),

media/libaudiohal/impl/EffectProxy.cpp

+27 −2
Original line number Diff line number Diff line
@@ -106,8 +106,8 @@ ndk::ScopedAStatus EffectProxy::setOffloadParam(const effect_offload_param_t* of 
ndk::ScopedAStatus EffectProxy::open(const Parameter::Common& common,

                                     const std::optional<Parameter::Specific>& specific,

                                     IEffect::OpenEffectReturn* ret __unused) {

    ndk::ScopedAStatus status = ndk::ScopedAStatus::fromExceptionCodeWithMessage(

            EX_ILLEGAL_ARGUMENT, "nullEffectHandle");

    ndk::ScopedAStatus status =

            ndk::ScopedAStatus::fromExceptionCodeWithMessage(EX_ILLEGAL_STATE, "nullEffectHandle");

    for (auto& sub : mSubEffects) {

        IEffect::OpenEffectReturn openReturn;

        if (!sub.handle || !(status = sub.handle->open(common, specific, &openReturn)).isOk()) {
@@ -130,6 +130,31 @@ ndk::ScopedAStatus EffectProxy::open(const Parameter::Common& common, 
    return status;

}



ndk::ScopedAStatus EffectProxy::reopen(OpenEffectReturn* ret __unused) {

    ndk::ScopedAStatus status =

            ndk::ScopedAStatus::fromExceptionCodeWithMessage(EX_ILLEGAL_STATE, "nullEffectHandle");

    for (auto& sub : mSubEffects) {

        IEffect::OpenEffectReturn openReturn;

        if (!sub.handle || !(status = sub.handle->reopen(&openReturn)).isOk()) {

            ALOGE("%s: failed to open %p UUID %s", __func__, sub.handle.get(),

                  ::android::audio::utils::toString(sub.descriptor.common.id.uuid).c_str());

            break;

        }

        sub.effectMq.statusQ = std::make_shared<StatusMQ>(openReturn.statusMQ);

        sub.effectMq.inputQ = std::make_shared<DataMQ>(openReturn.inputDataMQ);

        sub.effectMq.outputQ = std::make_shared<DataMQ>(openReturn.outputDataMQ);

    }



    // close all opened effects if failure

    if (!status.isOk()) {

        ALOGE("%s: closing all sub-effects with error %s", __func__,

              status.getDescription().c_str());

        close();

    }



    return status;

}



ndk::ScopedAStatus EffectProxy::close() {

    return runWithAllSubEffects([&](std::shared_ptr<IEffect>& effect) {

        return effect->close();

media/libaudiohal/impl/EffectProxy.h

+2 −0
Original line number Diff line number Diff line
@@ -62,6 +62,8 @@ class EffectProxy final : public ::aidl::android::hardware::audio::effect::BnEff 
                    specific,

            ::aidl::android::hardware::audio::effect::IEffect::OpenEffectReturn* ret) override;

    ndk::ScopedAStatus close() override;

    ndk::ScopedAStatus reopen(

            ::aidl::android::hardware::audio::effect::IEffect::OpenEffectReturn* ret) override;

    ndk::ScopedAStatus getDescriptor(

            ::aidl::android::hardware::audio::effect::Descriptor* desc) override;

    ndk::ScopedAStatus command(::aidl::android::hardware::audio::effect::CommandId id) override;