commit e4166084bfa0a8585250d6458d4881bebfa47983
author Shunkai Yao <yaoshunkai@google.com> Mon Jul 15 18:03:03 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jul 15 18:03:03 2024 +0000
tree 792cc713684e32869e36064470ce850983ea04fd
parent 28f4950e7ecd7324bd39e6618453f99277eae4f2
parent 32358360e5475dd5b4ed50113344260643d1b6bf

Merge "Fix device effect instatiation" into main

services/audioflinger/Effects.cpp

diff --git a/services/audioflinger/Effects.cpp b/services/audioflinger/Effects.cpp
index 78e455e..8a29fb2 100644
--- a/services/audioflinger/Effects.cpp
+++ b/services/audioflinger/Effects.cpp
@@ -3534,12 +3534,12 @@
             mHalEffect = sp<HwAccDeviceEffectModule>::make(mMyCallback,
                     const_cast<effect_descriptor_t *>(&mDescriptor), mMyCallback->newEffectId(),
                     port->id);
+            mHalEffect->configure_l();
             if (audio_is_input_device(mDevice.mType)) {
                 mHalEffect->setInputDevice(mDevice);
             } else {
                 mHalEffect->setDevices({mDevice});
             }
-            mHalEffect->configure_l();
         }
         *handle = new EffectHandle(mHalEffect, nullptr, nullptr, 0 /*priority*/,
                                    mNotifyFramesProcessed);

services/audioflinger/Effects.h

diff --git a/services/audioflinger/Effects.h b/services/audioflinger/Effects.h
index de3de01..5c90176 100644
--- a/services/audioflinger/Effects.h
+++ b/services/audioflinger/Effects.h
@@ -811,7 +811,10 @@
         audio_channel_mask_t outChannelMask() const override;
         uint32_t outChannelCount() const override;
         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; }
 
         status_t addEffectToHal(const sp<EffectHalInterface>& effect) override;