Revert "audiopolicy: moves Stream Volume Curves to Engine"
This reverts commit 539311942bdbac65fbf7f2fc1390b6b9ef850a1b.
Bug: 125937703
Test: make
diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.h b/services/audiopolicy/managerdefault/AudioPolicyManager.h
index 06a1f3e..70ad6ac 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.h
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.h
@@ -49,7 +49,7 @@
#include <AudioPolicyMix.h>
#include <EffectDescriptor.h>
#include <SoundTriggerSession.h>
-#include "TypeConverter.h"
+#include <VolumeCurve.h>
namespace android {
@@ -310,24 +310,12 @@
{
return mAvailableInputDevices;
}
+ virtual IVolumeCurvesCollection &getVolumeCurves() { return *mVolumeCurves; }
virtual const sp<DeviceDescriptor> &getDefaultOutputDevice() const
{
return mDefaultOutputDevice;
}
- IVolumeCurves &getVolumeCurves(const audio_attributes_t &attr)
- {
- auto *curves = mEngine->getVolumeCurvesForAttributes(attr);
- ALOG_ASSERT(curves != nullptr, "No curves for attributes %s", toString(attr).c_str());
- return *curves;
- }
- IVolumeCurves &getVolumeCurves(audio_stream_type_t stream)
- {
- auto *curves = mEngine->getVolumeCurvesForStreamType(stream);
- ALOG_ASSERT(curves != nullptr, "No curves for stream %s", toString(stream).c_str());
- return *curves;
- }
-
void addOutput(audio_io_handle_t output, const sp<SwAudioOutputDescriptor>& outputDesc);
void removeOutput(audio_io_handle_t output);
void addInput(audio_io_handle_t input, const sp<AudioInputDescriptor>& inputDesc);
@@ -636,12 +624,12 @@
float mLastVoiceVolume; // last voice volume value sent to audio HAL
bool mA2dpSuspended; // true if A2DP output is suspended
+ std::unique_ptr<IVolumeCurvesCollection> mVolumeCurves; // Volume Curves per use case and device category
EffectDescriptorCollection mEffects; // list of registered audio effects
sp<DeviceDescriptor> mDefaultOutputDevice; // output device selected by default at boot time
HwModuleCollection mHwModules; // contains only modules that have been loaded successfully
HwModuleCollection mHwModulesAll; // normally not needed, used during construction and for
// dumps
-
AudioPolicyConfig mConfig;
std::atomic<uint32_t> mAudioPortGeneration;