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

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

Merge "Fix device effect instatiation" into main am: e4166084 

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



Change-Id: I8b8eaa966f4e8675999d164faa49d2bbe3b3907e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bbb7f886 e4166084

services/audioflinger/Effects.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -3537,12 +3537,12 @@ NO_THREAD_SAFETY_ANALYSIS 
            mHalEffect = sp<HwAccDeviceEffectModule>::make(mMyCallback,

            mHalEffect = sp<HwAccDeviceEffectModule>::make(mMyCallback,

                    const_cast<effect_descriptor_t *>(&mDescriptor), mMyCallback->newEffectId(),

                    const_cast<effect_descriptor_t *>(&mDescriptor), mMyCallback->newEffectId(),

                    port->id);

                    port->id);

            mHalEffect->configure_l();

            if (audio_is_input_device(mDevice.mType)) {

            if (audio_is_input_device(mDevice.mType)) {

                mHalEffect->setInputDevice(mDevice);

                mHalEffect->setInputDevice(mDevice);

            } else {

            } else {

                mHalEffect->setDevices({mDevice});

                mHalEffect->setDevices({mDevice});

            }

            }

            mHalEffect->configure_l();

        }

        }

        *handle = new EffectHandle(mHalEffect, nullptr, nullptr, 0 /*priority*/,

        *handle = new EffectHandle(mHalEffect, nullptr, nullptr, 0 /*priority*/,

                                   mNotifyFramesProcessed);

                                   mNotifyFramesProcessed);

services/audioflinger/Effects.h

+4 −1
Original line number Original line Diff line number Diff line
@@ -811,7 +811,10 @@ private: 
        audio_channel_mask_t outChannelMask() const override;

        audio_channel_mask_t outChannelMask() const override;

        uint32_t outChannelCount() const override;

        uint32_t outChannelCount() const override;

        audio_channel_mask_t hapticChannelMask() const override { return AUDIO_CHANNEL_NONE; }

        audio_channel_mask_t hapticChannelMask() const override { return AUDIO_CHANNEL_NONE; }

        size_t frameCount() const override  { return 0; }

        /**

         * frameCount cannot be zero.

         */

        size_t frameCount() const override  { return 1; }

        uint32_t latency() const override  { return 0; }

        uint32_t latency() const override  { return 0; }





        status_t addEffectToHal(const sp<EffectHalInterface>& effect) override;

        status_t addEffectToHal(const sp<EffectHalInterface>& effect) override;