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

Commit 4b7f1de3 authored by Sebastian Pickl's avatar Sebastian Pickl
Browse files

Revert "Make EffectsFactoryHalHidl members const" 

This reverts commit bfb9b0d1.

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

Change-Id: Ia493da3f1b0843b095b751361cfb2b55e0f4c55f
parent bfb9b0d1

media/libaudiohal/impl/EffectsFactoryHalHidl.cpp

+10 −12
Original line number Diff line number Diff line
@@ -80,20 +80,18 @@ 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:

    const sp<IEffectsFactory> mEffectsFactory;

    const std::unique_ptr<EffectDescriptorCache> mCache;

    sp<IEffectsFactory> mEffectsFactory;

    std::unique_ptr<EffectDescriptorCache> mCache;

    // Configuration file parser result together with all processings from effect factory

    const effectsConfig::EffectProcessings mEffectProcessings;

};