diff options
| author | Eric Laurent <elaurent@google.com> | 2015-04-09 01:12:06 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-09 01:12:06 +0000 |
| commit | 17769490d499bc665ddfef83143ac1ed647fa0d4 (patch) | |
| tree | b2d5bc5fe875be119ffd3ce3352a9444caf2d1e2 /services/audiopolicy/common/managerdefinitions/src/AudioOutputDescriptor.cpp | |
| parent | 9c7f67264d3b3ace9703b3a96bd7bc4922111b4f (diff) | |
| parent | ffbc80f5908eaf67a033c6e93a343c39dd6894eb (diff) | |
| download | frameworks_av-17769490d499bc665ddfef83143ac1ed647fa0d4.zip frameworks_av-17769490d499bc665ddfef83143ac1ed647fa0d4.tar.gz frameworks_av-17769490d499bc665ddfef83143ac1ed647fa0d4.tar.bz2 | |
Merge "audio policy: volume in dBs"
Diffstat (limited to 'services/audiopolicy/common/managerdefinitions/src/AudioOutputDescriptor.cpp')
| -rw-r--r-- | services/audiopolicy/common/managerdefinitions/src/AudioOutputDescriptor.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/services/audiopolicy/common/managerdefinitions/src/AudioOutputDescriptor.cpp b/services/audiopolicy/common/managerdefinitions/src/AudioOutputDescriptor.cpp index 0837a54..596aa1d 100644 --- a/services/audiopolicy/common/managerdefinitions/src/AudioOutputDescriptor.cpp +++ b/services/audiopolicy/common/managerdefinitions/src/AudioOutputDescriptor.cpp @@ -21,6 +21,7 @@ #include "AudioOutputDescriptor.h" #include "IOProfile.h" #include "AudioGain.h" +#include "Volume.h" #include "HwModule.h" #include <media/AudioPolicy.h> @@ -354,11 +355,12 @@ bool SwAudioOutputDescriptor::setVolume(float volume, if (changed) { // Force VOICE_CALL to track BLUETOOTH_SCO stream volume when bluetooth audio is // enabled + float volume = Volume::DbToAmpl(mCurVolume[stream]); if (stream == AUDIO_STREAM_BLUETOOTH_SCO) { mClientInterface->setStreamVolume( - AUDIO_STREAM_VOICE_CALL, mCurVolume[stream], mIoHandle, delayMs); + AUDIO_STREAM_VOICE_CALL, volume, mIoHandle, delayMs); } - mClientInterface->setStreamVolume(stream, mCurVolume[stream], mIoHandle, delayMs); + mClientInterface->setStreamVolume(stream, volume, mIoHandle, delayMs); } return changed; } |