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

Commit 7abcc988 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "EffectProxy return the active sub-effect descriptor" into main

parents d8287424 df7bd8b2
Loading
Loading
Loading
Loading
+8 −2
Original line number Diff line number Diff line
@@ -134,8 +134,8 @@ ndk::ScopedAStatus EffectProxy::close() {
}

ndk::ScopedAStatus EffectProxy::getDescriptor(Descriptor* desc) {
    desc->common = mDescriptorCommon;
    desc->capability = mSubEffects[mActiveSubIdx].descriptor.capability;
    *desc = mSubEffects[mActiveSubIdx].descriptor;
    desc->common.id.uuid = desc->common.id.proxy.value();
    return ndk::ScopedAStatus::ok();
}

@@ -166,6 +166,12 @@ Descriptor::Common EffectProxy::buildDescriptorCommon(
            common.flags.hwAcceleratorMode = Flags::HardwareAccelerator::TUNNEL;
        }

        // initial flag values before we know which sub-effect to active (with setOffloadParam)
        // same as HIDL EffectProxy flags
        common.flags.type = Flags::Type::INSERT;
        common.flags.insert = Flags::Insert::LAST;
        common.flags.volume = Flags::Volume::NONE;

        // set indication if any sub-effect indication was set
        common.flags.offloadIndication |= desc.common.flags.offloadIndication;
        common.flags.deviceIndication |= desc.common.flags.deviceIndication;