commit 30c8c36ea54575f52f0ce0e17666b9a171285543
author Sebastian Pickl <spickl@google.com> Fri Apr 21 08:29:27 2023 +0000
committer Sebastian Pickl <spickl@google.com> Fri Apr 21 12:14:54 2023 +0000
tree 259d19860dd4692847572fd1313883f7ccd8e166
parent 4b7f1de3e560c0ba10242942b83172bd92945501

Revert "Move EffectsConfig loading in AudioPolicyEffects to libAudioHal"

This reverts commit e3e403d4598c5460baffeba766f469eceafd91e5.

Reason for revert: fixes b/279127394 validated by http://go/abtd-run/L71300000960106239 and b/279108570

Change-Id: I58054d98365a6bf10b4dab2f347d4ee78205440c

media/libaudiohal/impl/EffectsFactoryHalHidl.cpp

diff --git a/media/libaudiohal/impl/EffectsFactoryHalHidl.cpp b/media/libaudiohal/impl/EffectsFactoryHalHidl.cpp
index 483f643..172ebdf 100644
--- a/media/libaudiohal/impl/EffectsFactoryHalHidl.cpp
+++ b/media/libaudiohal/impl/EffectsFactoryHalHidl.cpp
@@ -33,11 +33,10 @@
 
 #include "android/media/AudioHalVersion.h"
 
-using ::android::base::unexpected;
 using ::android::detail::AudioHalVersionInfo;
-using ::android::hardware::Return;
 using ::android::hardware::audio::common::CPP_VERSION::implementation::UuidUtils;
 using ::android::hardware::audio::effect::CPP_VERSION::implementation::EffectUtils;
+using ::android::hardware::Return;
 
 namespace android {
 namespace effect {
@@ -79,17 +78,7 @@
 }
 
 EffectsFactoryHalHidl::EffectsFactoryHalHidl(sp<IEffectsFactory> effectsFactory)
-    : EffectConversionHelperHidl("EffectsFactory"),
-      mCache(new EffectDescriptorCache),
-      mEffectProcessings([&]() -> effectsConfig::EffectProcessings {
-          effectsConfig::EffectProcessings processings;
-          const auto& parseResult = effectsConfig::parse();
-          if (!parseResult.parsedConfig) {
-              return INVALID_EFFECT_PROCESSING;
-          }
-          return {parseResult.nbSkippedElement, parseResult.parsedConfig->preprocess,
-                  parseResult.parsedConfig->postprocess, parseResult.parsedConfig->deviceprocess};
-      }()) {
+        : EffectConversionHelperHidl("EffectsFactory"), mCache(new EffectDescriptorCache) {
     ALOG_ASSERT(effectsFactory != nullptr, "Provided IEffectsFactory service is NULL");
     mEffectsFactory = std::move(effectsFactory);
 }
@@ -239,10 +228,6 @@
     return AudioHalVersionInfo(AudioHalVersionInfo::Type::HIDL, MAJOR_VERSION, MINOR_VERSION);
 }
 
-const effectsConfig::EffectProcessings& EffectsFactoryHalHidl::getProcessings() const {
-    return mEffectProcessings;
-}
-
 } // namespace effect
 
 // When a shared library is built from a static library, even explicit