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

Commit 95302b70 authored by Shunkai Yao's avatar Shunkai Yao Committed by Android (Google) Code Review
Browse files

Merge changes Id3043140,I13676bc6 into main

* changes:
  Fix device effect creation for AIDL Audio Effect HAL
  Fix device effect instatiation
parents 62ccaab9 675bad65
Loading
Loading
Loading
Loading
+0 −3
Original line number Original line Diff line number Diff line
@@ -174,9 +174,6 @@ status_t EffectsFactoryHalAidl::createEffect(const effect_uuid_t* uuid, int32_t
    if (uuid == nullptr || effect == nullptr) {
    if (uuid == nullptr || effect == nullptr) {
        return BAD_VALUE;
        return BAD_VALUE;
    }
    }
    if (sessionId == AUDIO_SESSION_DEVICE && ioId == AUDIO_IO_HANDLE_NONE) {
        return INVALID_OPERATION;
    }
    ALOGV("%s session %d ioId %d", __func__, sessionId, ioId);
    ALOGV("%s session %d ioId %d", __func__, sessionId, ioId);


    AudioUuid aidlUuid =
    AudioUuid aidlUuid =
+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);
+4 −1
Original line number Original line Diff line number Diff line
@@ -810,7 +810,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;