commit 95302b70ebd87a9647cbc689db1544daa0c951c8
author Shunkai Yao <yaoshunkai@google.com> Fri Jul 12 18:49:37 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 12 18:49:37 2024 +0000
tree 077fccade2874e91dae18dec05885135690440e1
parent 62ccaab91b1c66cfab48ee563a8dcac81ea36a6f
parent 675bad658b603adc8cb5fc9f7b2707c24dedda9f

Merge changes Id3043140,I13676bc6 into main

* changes:
  Fix device effect creation for AIDL Audio Effect HAL
  Fix device effect instatiation

media/libaudiohal/impl/EffectsFactoryHalAidl.cpp

diff --git a/media/libaudiohal/impl/EffectsFactoryHalAidl.cpp b/media/libaudiohal/impl/EffectsFactoryHalAidl.cpp
index 64cc7ed..740bf60 100644
--- a/media/libaudiohal/impl/EffectsFactoryHalAidl.cpp
+++ b/media/libaudiohal/impl/EffectsFactoryHalAidl.cpp
@@ -174,9 +174,6 @@
     if (uuid == nullptr || effect == nullptr) {
         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);
 
     AudioUuid aidlUuid =

services/audioflinger/Effects.cpp

diff --git a/services/audioflinger/Effects.cpp b/services/audioflinger/Effects.cpp
index 973b2ab..c46027c 100644
--- a/services/audioflinger/Effects.cpp
+++ b/services/audioflinger/Effects.cpp
@@ -3537,12 +3537,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 830fe81..66ec837 100644
--- a/services/audioflinger/Effects.h
+++ b/services/audioflinger/Effects.h
@@ -810,7 +810,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;