diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-01-14 06:17:50 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-01-14 06:17:50 -0800 |
| commit | 856b5771d1d4e4dbfbc37d977bfde32651e1121f (patch) | |
| tree | c1c745f21b1cafceda81d7c2528ef64a696ecda0 | |
| parent | c0b58d181475439e3c908e4ee34bd4874ac8a508 (diff) | |
| parent | 7eaaf12f02321e5559aa577166b998fb8cfb683b (diff) | |
| download | android_hardware_qcom_audio-856b5771d1d4e4dbfbc37d977bfde32651e1121f.tar.gz android_hardware_qcom_audio-856b5771d1d4e4dbfbc37d977bfde32651e1121f.tar.bz2 android_hardware_qcom_audio-856b5771d1d4e4dbfbc37d977bfde32651e1121f.zip | |
Merge "policy: Delay FM volume update to start of FM playback"
| -rw-r--r-- | policy_hal/AudioPolicyManager.cpp | 12 | ||||
| -rw-r--r-- | policy_hal/AudioPolicyManager.h | 1 |
2 files changed, 10 insertions, 3 deletions
diff --git a/policy_hal/AudioPolicyManager.cpp b/policy_hal/AudioPolicyManager.cpp index a5df55a0..257e9055 100644 --- a/policy_hal/AudioPolicyManager.cpp +++ b/policy_hal/AudioPolicyManager.cpp @@ -279,15 +279,20 @@ status_t AudioPolicyManagerCustom::setDeviceConnectionStateInt(audio_devices_t d #ifdef FM_POWER_OPT // handle FM device connection state to trigger FM AFE loopback - if(device == AUDIO_DEVICE_OUT_FM && hasPrimaryOutput()) { + if (device == AUDIO_DEVICE_OUT_FM && hasPrimaryOutput()) { audio_devices_t newDevice = getNewOutputDevice(mPrimaryOutput, false /*fromCache*/); if (state == AUDIO_POLICY_DEVICE_STATE_AVAILABLE) { mPrimaryOutput->changeRefCount(AUDIO_STREAM_MUSIC, 1); newDevice = newDevice | AUDIO_DEVICE_OUT_FM; + mFMIsActive = true; } else { + mFMIsActive = false; mPrimaryOutput->changeRefCount(AUDIO_STREAM_MUSIC, -1); } AudioParameter param = AudioParameter(); + float volumeDb = mPrimaryOutput->mCurVolume[AUDIO_STREAM_MUSIC]; + mPrevFMVolumeDb = volumeDb; + param.addFloat(String8("fm_volume"), Volume::DbToAmpl(volumeDb)); param.addInt(String8("handle_fm"), (int)newDevice); mpClientInterface->setParameters(mPrimaryOutput->mIoHandle, param.toString()); } @@ -1225,7 +1230,7 @@ status_t AudioPolicyManagerCustom::checkAndSetVolume(audio_stream_type_t stream, } #ifdef FM_POWER_OPT } else if (stream == AUDIO_STREAM_MUSIC && hasPrimaryOutput() && - outputDesc == mPrimaryOutput) { + outputDesc == mPrimaryOutput && mFMIsActive) { /* Avoid unnecessary set_parameter calls as it puts the primary outputs FastMixer in HOT_IDLE leading to breaks in audio */ if (volumeDb != mPrevFMVolumeDb) { @@ -1956,7 +1961,8 @@ AudioPolicyManagerCustom::AudioPolicyManagerCustom(AudioPolicyClientInterface *c mHdmiAudioDisabled(false), mHdmiAudioEvent(false), mPrevPhoneState(0), - mPrevFMVolumeDb(0.0f) + mPrevFMVolumeDb(0.0f), + mFMIsActive(false) { char ssr_enabled[PROPERTY_VALUE_MAX] = {0}; bool prop_ssr_enabled = false; diff --git a/policy_hal/AudioPolicyManager.h b/policy_hal/AudioPolicyManager.h index 4df5e6ba..9b4a44a4 100644 --- a/policy_hal/AudioPolicyManager.h +++ b/policy_hal/AudioPolicyManager.h @@ -146,6 +146,7 @@ private: bool mIsInputRequestOnProgress; #endif float mPrevFMVolumeDb; + bool mFMIsActive; }; }; |