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

Commit 62e08e80 authored by Mikhail Naganov's avatar Mikhail Naganov Committed by android-build-merger
Browse files

Merge "audiopolicy: Load the engine library dynamically" am: 706d9606 

am: 77a9db4b

Change-Id: I15c5448ce8e09c7e0dd53ede4f6ade91c781cccf
parents 8e944176 77a9db4b

services/audiopolicy/common/managerdefinitions/include/AudioPolicyConfig.h

+14 −1
Original line number Diff line number Diff line
@@ -40,7 +40,8 @@ public: 
                      DeviceVector &availableOutputDevices,

                      DeviceVector &availableInputDevices,

                      sp<DeviceDescriptor> &defaultOutputDevice)

        : mHwModules(hwModules),

        : mEngineLibraryNameSuffix(kDefaultEngineLibraryNameSuffix),

          mHwModules(hwModules),

          mAvailableOutputDevices(availableOutputDevices),

          mAvailableInputDevices(availableInputDevices),

          mDefaultOutputDevice(defaultOutputDevice),
@@ -55,6 +56,14 @@ public: 
        mSource = file;

    }



    const std::string& getEngineLibraryNameSuffix() const {

        return mEngineLibraryNameSuffix;

    }



    void setEngineLibraryNameSuffix(const std::string& suffix) {

        mEngineLibraryNameSuffix = suffix;

    }



    void setHwModules(const HwModuleCollection &hwModules)

    {

        mHwModules = hwModules;
@@ -108,6 +117,7 @@ public: 
    void setDefault(void)

    {

        mSource = "AudioPolicyConfig::setDefault";

        mEngineLibraryNameSuffix = kDefaultEngineLibraryNameSuffix;

        mDefaultOutputDevice = new DeviceDescriptor(AUDIO_DEVICE_OUT_SPEAKER);

        mDefaultOutputDevice->addAudioProfile(AudioProfile::createFullDynamic());

        sp<DeviceDescriptor> defaultInputDevice = new DeviceDescriptor(AUDIO_DEVICE_IN_BUILTIN_MIC);
@@ -167,7 +177,10 @@ public: 
    }



private:

    static const constexpr char* const kDefaultEngineLibraryNameSuffix = "default";



    std::string mSource;

    std::string mEngineLibraryNameSuffix;

    HwModuleCollection &mHwModules; /**< Collection of Module, with Profiles, i.e. Mix Ports. */

    DeviceVector &mAvailableOutputDevices;

    DeviceVector &mAvailableInputDevices;

services/audiopolicy/engine/common/include/EngineBase.h

+3 −3
Original line number Diff line number Diff line
@@ -17,18 +17,18 @@ 
#pragma once



#include <EngineConfig.h>

#include <AudioPolicyManagerInterface.h>

#include <EngineInterface.h>

#include <ProductStrategy.h>

#include <VolumeGroup.h>



namespace android {

namespace audio_policy {



class EngineBase : public AudioPolicyManagerInterface

class EngineBase : public EngineInterface

{

public:

    ///

    /// from AudioPolicyManagerInterface

    /// from EngineInterface

    ///

    android::status_t initCheck() override;

services/audiopolicy/engine/common/include/ProductStrategy.h

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
#include "VolumeGroup.h"



#include <system/audio.h>

#include <AudioPolicyManagerInterface.h>

#include <utils/RefBase.h>

#include <HandleGenerator.h>

#include <string>
@@ -27,6 +26,7 @@ 
#include <map>

#include <utils/Errors.h>

#include <utils/String8.h>

#include <media/AudioAttributes.h>



namespace android {

services/audiopolicy/engine/common/include/VolumeCurve.h

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 


#include "IVolumeCurves.h"

#include <policy.h>

#include <AudioPolicyManagerInterface.h>

#include <utils/RefBase.h>

#include <HandleGenerator.h>

#include <utils/String8.h>

services/audiopolicy/engine/common/include/VolumeGroup.h

+0 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


#pragma once



#include <AudioPolicyManagerInterface.h>

#include <VolumeCurve.h>

#include <system/audio.h>

#include <utils/RefBase.h>