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

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

Merge "Avoid create preprocessing effect for playback port" into udc-dev am:... 

Merge "Avoid create preprocessing effect for playback port" into udc-dev am: c98182c5 am: adde7e0d

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



Change-Id: I9eaa6b3e3e957a4ca70eff1615817174a42dbc39
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4d7d54af adde7e0d

services/audioflinger/Effects.cpp

+13 −10
Original line number Diff line number Diff line
@@ -3375,8 +3375,18 @@ status_t AudioFlinger::DeviceEffectProxy::checkPort(const PatchPanel::Patch& pat 
    ALOGV("%s type %d device type %d address %s device ID %d patch.isSoftware() %d",

            __func__, port->type, port->ext.device.type,

            port->ext.device.address, port->id, patch.isSoftware());

    if (port->type != AUDIO_PORT_TYPE_DEVICE || port->ext.device.type != mDevice.mType

        || port->ext.device.address != mDevice.address()) {

    if (port->type != AUDIO_PORT_TYPE_DEVICE || port->ext.device.type != mDevice.mType ||

        port->ext.device.address != mDevice.address()) {

        return NAME_NOT_FOUND;

    }

    if (((mDescriptor.flags & EFFECT_FLAG_TYPE_MASK) == EFFECT_FLAG_TYPE_POST_PROC) &&

        (audio_port_config_has_input_direction(port))) {

        ALOGI("%s don't create postprocessing effect on record port", __func__);

        return NAME_NOT_FOUND;

    }

    if (((mDescriptor.flags & EFFECT_FLAG_TYPE_MASK) == EFFECT_FLAG_TYPE_PRE_PROC) &&

        (!audio_port_config_has_input_direction(port))) {

        ALOGI("%s don't create preprocessing effect on playback port", __func__);

        return NAME_NOT_FOUND;

    }

    status_t status = NAME_NOT_FOUND;
@@ -3407,20 +3417,12 @@ status_t AudioFlinger::DeviceEffectProxy::checkPort(const PatchPanel::Patch& pat 
    } else if (patch.isSoftware() || patch.thread().promote() != nullptr) {

        sp <ThreadBase> thread;

        if (audio_port_config_has_input_direction(port)) {

            if ((mDescriptor.flags & EFFECT_FLAG_TYPE_MASK) == EFFECT_FLAG_TYPE_POST_PROC) {

                ALOGI("%s don't create postprocessing effect on record thread", __func__);

                return NAME_NOT_FOUND;

            }

            if (patch.isSoftware()) {

                thread = patch.mRecord.thread();

            } else {

                thread = patch.thread().promote();

            }

        } else {

            if ((mDescriptor.flags & EFFECT_FLAG_TYPE_MASK) == EFFECT_FLAG_TYPE_PRE_PROC) {

                ALOGI("%s don't create preprocessing effect on playback thread", __func__);

                return NAME_NOT_FOUND;

            }

            if (patch.isSoftware()) {

                thread = patch.mPlayback.thread();

            } else {
@@ -3436,6 +3438,7 @@ status_t AudioFlinger::DeviceEffectProxy::checkPort(const PatchPanel::Patch& pat 
    } else {

        status = BAD_VALUE;

    }



    if (status == NO_ERROR || status == ALREADY_EXISTS) {

        Status bs;

        if (isEnabled()) {