diff options
| author | François Gaffie <francois.gaffie@intel.com> | 2015-03-24 08:41:51 +0100 |
|---|---|---|
| committer | Jean-Michel Trivi <jmtrivi@google.com> | 2015-04-01 10:22:42 -0700 |
| commit | 2110e04cdfbf9ad85ce154ce5f778ee5ccfc95eb (patch) | |
| tree | 5051da296e1fbc067db7ac190334d7d98a4410eb /services/audiopolicy/common/managerdefinitions/include | |
| parent | dfd7409c1b708f6c429aa43722ca8493a91d8df0 (diff) | |
| download | frameworks_av-2110e04cdfbf9ad85ce154ce5f778ee5ccfc95eb.zip frameworks_av-2110e04cdfbf9ad85ce154ce5f778ee5ccfc95eb.tar.gz frameworks_av-2110e04cdfbf9ad85ce154ce5f778ee5ccfc95eb.tar.bz2 | |
Split ManagerDefault into manager and engine
This patch defines an interface for a new component: policy engine.
The APIs found under this interface are the one we may want to customize
and to configure easily.
This patch also split the current manager code into manager and engine to
provide a default version of the policy engine.
Change-Id: I97cf59760b53d248fe9efe466ae5e73bd7e5cc06
Signed-off-by: François Gaffie <francois.gaffie@intel.com>
Diffstat (limited to 'services/audiopolicy/common/managerdefinitions/include')
| -rw-r--r-- | services/audiopolicy/common/managerdefinitions/include/AudioGain.h | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/services/audiopolicy/common/managerdefinitions/include/AudioGain.h b/services/audiopolicy/common/managerdefinitions/include/AudioGain.h index 944fadc..21fbf9b 100644 --- a/services/audiopolicy/common/managerdefinitions/include/AudioGain.h +++ b/services/audiopolicy/common/managerdefinitions/include/AudioGain.h @@ -16,46 +16,12 @@ #pragma once -#include <Volume.h> #include <utils/Errors.h> #include <utils/RefBase.h> #include <system/audio.h> namespace android { -class StreamDescriptor; - -class ApmGains -{ -public : - static float volIndexToAmpl(audio_devices_t device, const StreamDescriptor& streamDesc, - int indexInUi); - - // default volume curve - static const VolumeCurvePoint sDefaultVolumeCurve[Volume::VOLCNT]; - // default volume curve for media strategy - static const VolumeCurvePoint sDefaultMediaVolumeCurve[Volume::VOLCNT]; - // volume curve for non-media audio on ext media outputs (HDMI, Line, etc) - static const VolumeCurvePoint sExtMediaSystemVolumeCurve[Volume::VOLCNT]; - // volume curve for media strategy on speakers - static const VolumeCurvePoint sSpeakerMediaVolumeCurve[Volume::VOLCNT]; - static const VolumeCurvePoint sSpeakerMediaVolumeCurveDrc[Volume::VOLCNT]; - // volume curve for sonification strategy on speakers - static const VolumeCurvePoint sSpeakerSonificationVolumeCurve[Volume::VOLCNT]; - static const VolumeCurvePoint sSpeakerSonificationVolumeCurveDrc[Volume::VOLCNT]; - static const VolumeCurvePoint sDefaultSystemVolumeCurve[Volume::VOLCNT]; - static const VolumeCurvePoint sDefaultSystemVolumeCurveDrc[Volume::VOLCNT]; - static const VolumeCurvePoint sHeadsetSystemVolumeCurve[Volume::VOLCNT]; - static const VolumeCurvePoint sDefaultVoiceVolumeCurve[Volume::VOLCNT]; - static const VolumeCurvePoint sSpeakerVoiceVolumeCurve[Volume::VOLCNT]; - static const VolumeCurvePoint sLinearVolumeCurve[Volume::VOLCNT]; - static const VolumeCurvePoint sSilentVolumeCurve[Volume::VOLCNT]; - static const VolumeCurvePoint sFullScaleVolumeCurve[Volume::VOLCNT]; - // default volume curves per stream and device category. See initializeVolumeCurves() - static const VolumeCurvePoint *sVolumeProfiles[AUDIO_STREAM_CNT][Volume::DEVICE_CATEGORY_CNT]; -}; - - class AudioGain: public RefBase { public: |