commit bfb9b0d1a32c88496fad9d3a3048df50bf8a5161
author Shunkai Yao <yaoshunkai@google.com> Wed Apr 19 22:56:53 2023 +0000
committer Shunkai Yao <yaoshunkai@google.com> Wed Apr 19 22:56:53 2023 +0000
tree 801085a1c8a69ec809d1f6b5cf5920a904868391
parent e3e403d4598c5460baffeba766f469eceafd91e5

Make EffectsFactoryHalHidl members const

Bug: 261129656
Test: m
Change-Id: I57809e61463c6420855f9f37a436fba369e5d14b

media/libaudiohal/impl/EffectsFactoryHalHidl.cpp

diff --git a/media/libaudiohal/impl/EffectsFactoryHalHidl.cpp b/media/libaudiohal/impl/EffectsFactoryHalHidl.cpp
index 483f643..bc3b375 100644
--- a/media/libaudiohal/impl/EffectsFactoryHalHidl.cpp
+++ b/media/libaudiohal/impl/EffectsFactoryHalHidl.cpp
@@ -80,18 +80,20 @@
 
 EffectsFactoryHalHidl::EffectsFactoryHalHidl(sp<IEffectsFactory> effectsFactory)
     : EffectConversionHelperHidl("EffectsFactory"),
+      mEffectsFactory(std::move(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};
-      }()) {
+      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};
+              }()) {
     ALOG_ASSERT(effectsFactory != nullptr, "Provided IEffectsFactory service is NULL");
-    mEffectsFactory = std::move(effectsFactory);
 }
 
 status_t EffectsFactoryHalHidl::queryNumberEffects(uint32_t *pNumEffects) {

media/libaudiohal/impl/EffectsFactoryHalHidl.h

diff --git a/media/libaudiohal/impl/EffectsFactoryHalHidl.h b/media/libaudiohal/impl/EffectsFactoryHalHidl.h
index c64ca3a..698c961 100644
--- a/media/libaudiohal/impl/EffectsFactoryHalHidl.h
+++ b/media/libaudiohal/impl/EffectsFactoryHalHidl.h
@@ -66,8 +66,8 @@
     const effectsConfig::EffectProcessings& getProcessings() const override;
 
   private:
-    sp<IEffectsFactory> mEffectsFactory;
-    std::unique_ptr<EffectDescriptorCache> mCache;
+    const sp<IEffectsFactory> mEffectsFactory;
+    const std::unique_ptr<EffectDescriptorCache> mCache;
     // Configuration file parser result together with all processings from effect factory
     const effectsConfig::EffectProcessings mEffectProcessings;
 };