Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c0d800c1 authored by Shunkai Yao's avatar Shunkai Yao Committed by Automerger Merge Worker
Browse files

Merge "Make EffectsFactoryHalHidl members const" am: 32efe595 am: 667ebabf... 

Merge "Make EffectsFactoryHalHidl members const" am: 32efe595 am: 667ebabf am: 5ec86f2f am: 5225d638

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2549650



Change-Id: Ied66f56bfb73697aab394c713f3bf1e89704d305
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 021076cf 5225d638

media/libaudiohal/impl/EffectsFactoryHalHidl.cpp

+12 −10
Original line number Diff line number Diff line
@@ -80,18 +80,20 @@ EffectDescriptorCache::QueryResult EffectDescriptorCache::queryAllDescriptors( 


EffectsFactoryHalHidl::EffectsFactoryHalHidl(sp<IEffectsFactory> effectsFactory)

    : EffectConversionHelperHidl("EffectsFactory"),

      mEffectsFactory(std::move(effectsFactory)),

      mCache(new EffectDescriptorCache),

      mEffectProcessings([&]() -> effectsConfig::EffectProcessings {

      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};

                          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

+2 −2
Original line number Diff line number Diff line
@@ -66,8 +66,8 @@ class EffectsFactoryHalHidl final : public EffectsFactoryHalInterface, 
    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;

};