commit 319587bbe7f0a3ee36df87700d983a5aa184c5ff
author Andy Hung <hunga@google.com> Tue May 23 14:01:03 2023 -0700
committer Andy Hung <hunga@google.com> Wed May 24 14:50:45 2023 -0700
tree f9d2bced18dcadf62776d62e59cf643d8a0037b0
parent 2683692b85f8c6fe1732d9f4c3c8058df0423a2e

AudioFlinger: Remove conditional effect types

We no longer conditionally compile integer effects.

Test: Compile and check that libaudioflinger.so size does not change.
Bug: 284009360
Merged-In: Ib67fc35ac15858533634b6dc942d5bd8f40574c0
Change-Id: Ib67fc35ac15858533634b6dc942d5bd8f40574c0

services/audioflinger/Effects.cpp

diff --git a/services/audioflinger/Effects.cpp b/services/audioflinger/Effects.cpp
index 4f39e54..1c46ddd 100644
--- a/services/audioflinger/Effects.cpp
+++ b/services/audioflinger/Effects.cpp
@@ -867,8 +867,8 @@
     mOutChannelCountRequested =
             audio_channel_count_from_out_mask(mConfig.outputCfg.channels);
 
-    mConfig.inputCfg.format = EFFECT_BUFFER_FORMAT;
-    mConfig.outputCfg.format = EFFECT_BUFFER_FORMAT;
+    mConfig.inputCfg.format = AUDIO_FORMAT_PCM_FLOAT;
+    mConfig.outputCfg.format = AUDIO_FORMAT_PCM_FLOAT;
 
     // Don't use sample rate for thread if effect isn't offloadable.
     if (callback->isOffloadOrDirect() && !isOffloaded()) {
@@ -2177,7 +2177,7 @@
     if (mInBuffer == NULL) {
         return;
     }
-    const size_t frameSize = audio_bytes_per_sample(EFFECT_BUFFER_FORMAT)
+    const size_t frameSize = audio_bytes_per_sample(AUDIO_FORMAT_PCM_FLOAT)
             * mEffectCallback->inChannelCount(mEffects[0]->id());
 
     memset(mInBuffer->audioBuffer()->raw, 0, mEffectCallback->frameCount() * frameSize);