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

Commit be96a7e1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Avoid create preprocessing effect for playback port" am: ff6d3faf am: 4df326d1 

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



Change-Id: I31f93465c1e5a7b31e50636353039e1f9520403b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2a1a01fb 4df326d1

services/audioflinger/Effects.cpp

+13 −2
Original line number Diff line number Diff line
@@ -3355,8 +3355,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;
@@ -3408,6 +3418,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()) {