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

Commit 1f854a17 authored by Sebastian Pickl's avatar Sebastian Pickl Committed by Gerrit Code Review
Browse files

Merge changes I58054d98,Ia493da3f 

* changes:
  Revert "Move EffectsConfig loading in AudioPolicyEffects to libAudioHal"
  Revert "Make EffectsFactoryHalHidl members const"
parents 3e2ff26e 30c8c36e

media/libaudiohal/Android.bp

+0 −6
Original line number Diff line number Diff line
@@ -74,12 +74,6 @@ cc_library_shared { 
cc_library_headers {

    name: "libaudiohal_headers",



    header_libs: [

        "libeffectsconfig_headers",

    ],



    export_header_lib_headers: ["libeffectsconfig_headers"],



    export_include_dirs: ["include"],

}

media/libaudiohal/impl/Android.bp

+1 −3
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ cc_defaults { 
        "android.hidl.allocator@1.0",

        "android.hidl.memory@1.0",

        "libaudiohal_deathhandler",

        "libeffectsconfig",

        "libhidlbase",

        "libhidlmemory",

    ],
@@ -282,16 +281,15 @@ cc_library_shared { 
        "android.hardware.common.fmq-V1-ndk",

    ],

    shared_libs: [

        "libbinder_ndk",

        "libaudio_aidl_conversion_common_cpp",

        "libaudio_aidl_conversion_common_ndk",

        "libaudio_aidl_conversion_core_ndk",

        "libaudio_aidl_conversion_effect_ndk",

        "libaudioaidlcommon",

        "libbinder_ndk",

    ],

    header_libs: [

        "libaudio_system_headers",

        "libeffectsconfig_headers",

    ],

    cflags: [

        "-Wall",

media/libaudiohal/impl/EffectsFactoryHalAidl.cpp

+6 −14
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
//#define LOG_NDEBUG 0



#include <error/expected_utils.h>

#include <aidl/android/media/audio/common/AudioStreamType.h>

#include <android/binder_manager.h>

#include <media/AidlConversionCppNdk.h>

#include <media/AidlConversionEffect.h>
@@ -36,13 +35,11 @@ 
#include "EffectsFactoryHalAidl.h"



using ::aidl::android::legacy2aidl_audio_uuid_t_AudioUuid;

using ::aidl::android::aidl_utils::statusTFromBinderStatus;

using ::aidl::android::hardware::audio::effect::Descriptor;

using ::aidl::android::hardware::audio::effect::IFactory;

using ::aidl::android::hardware::audio::effect::Processing;

using ::aidl::android::media::audio::common::AudioUuid;

using ::android::base::unexpected;

using ::android::detail::AudioHalVersionInfo;

using aidl::android::aidl_utils::statusTFromBinderStatus;

using aidl::android::hardware::audio::effect::Descriptor;

using aidl::android::hardware::audio::effect::IFactory;

using aidl::android::media::audio::common::AudioUuid;

using android::detail::AudioHalVersionInfo;



namespace android {

namespace effect {
@@ -95,8 +92,7 @@ EffectsFactoryHalAidl::EffectsFactoryHalAidl(std::shared_ptr<IFactory> effectsFa 
                       [](const Descriptor& desc) { return !desc.common.id.proxy.has_value(); });

          return list;

      }()),

      mEffectCount(mNonProxyDescList.size() + mProxyDescList.size()),

      mEffectProcessings(INVALID_EFFECT_PROCESSING) {

      mEffectCount(mNonProxyDescList.size() + mProxyDescList.size()) {

    ALOG_ASSERT(mFactory != nullptr, "Provided IEffectsFactory service is NULL");

    ALOGI("%s with %zu nonProxyEffects and %zu proxyEffects", __func__, mNonProxyDescList.size(),

          mProxyDescList.size());
@@ -273,10 +269,6 @@ bool EffectsFactoryHalAidl::isProxyEffect(const AudioUuid& uuid) const { 
    return 0 != mUuidProxyMap.count(uuid);

}



const effectsConfig::EffectProcessings& EffectsFactoryHalAidl::getProcessings() const {

    return mEffectProcessings;

}



} // namespace effect



// When a shared library is built from a static library, even explicit

media/libaudiohal/impl/EffectsFactoryHalAidl.h

+0 −4
Original line number Diff line number Diff line
@@ -62,8 +62,6 @@ class EffectsFactoryHalAidl final : public EffectsFactoryHalInterface { 


    detail::AudioHalVersionInfo getHalVersion() const override;



    const effectsConfig::EffectProcessings& getProcessings() const override;



  private:

    const std::shared_ptr<IFactory> mFactory;

    const detail::AudioHalVersionInfo mHalVersion;
@@ -79,8 +77,6 @@ class EffectsFactoryHalAidl final : public EffectsFactoryHalInterface { 
    const std::vector<Descriptor> mNonProxyDescList;

    // total number of effects including proxy effects

    const size_t mEffectCount;

    // Query result and all processing from effect factory

    const effectsConfig::EffectProcessings mEffectProcessings;



    std::mutex mLock;

    uint64_t mEffectIdCounter GUARDED_BY(mLock) = 0;  // Align with HIDL (0 is INVALID_ID)

media/libaudiohal/impl/EffectsFactoryHalHidl.cpp

+3 −20
Original line number Diff line number Diff line
@@ -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,21 +78,9 @@ EffectDescriptorCache::QueryResult EffectDescriptorCache::queryAllDescriptors( 
}



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

              }()) {

        : EffectConversionHelperHidl("EffectsFactory"), mCache(new EffectDescriptorCache) {

    ALOG_ASSERT(effectsFactory != nullptr, "Provided IEffectsFactory service is NULL");

    mEffectsFactory = std::move(effectsFactory);

}



status_t EffectsFactoryHalHidl::queryNumberEffects(uint32_t *pNumEffects) {
@@ -241,10 +228,6 @@ AudioHalVersionInfo EffectsFactoryHalHidl::getHalVersion() const { 
    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