diff options
| author | Eric Laurent <elaurent@google.com> | 2012-03-20 19:35:43 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-03-20 19:35:43 -0700 |
| commit | 50991e55eebbbc8e259b3e75aa6671c714f26abe (patch) | |
| tree | 1a12356e49d27ba638aecea256205b745b2f4e1f /audio | |
| parent | 63a40f9855ab3f5301006bd0274db97447ba655e (diff) | |
| parent | d28a1a802b1965ab4b9014c658240faafe219994 (diff) | |
| download | device_samsung_tuna-50991e55eebbbc8e259b3e75aa6671c714f26abe.zip device_samsung_tuna-50991e55eebbbc8e259b3e75aa6671c714f26abe.tar.gz device_samsung_tuna-50991e55eebbbc8e259b3e75aa6671c714f26abe.tar.bz2 | |
am d28a1a80: am 467c02b6: am 78a7609d: audio: fix audio drop when speaker is selected
* commit 'd28a1a802b1965ab4b9014c658240faafe219994':
audio: fix audio drop when speaker is selected
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/audio_hw.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/audio/audio_hw.c b/audio/audio_hw.c index 5201b6e..fe3dce3 100644 --- a/audio/audio_hw.c +++ b/audio/audio_hw.c @@ -1414,12 +1414,24 @@ static int out_set_parameters(struct audio_stream *stream, const char *kvpairs) } /* force standby if moving to/from HDMI/SPDIF or if the output * device changes when in HDMI/SPDIF mode */ + + /* FIXME workaround for audio being dropped when switching path without forcing standby + * (several hundred ms of audio can be lost: e.g beginning of a ringtone. We must understand + * the root cause in audio HAL, driver or ABE. if (((val & AUDIO_DEVICE_OUT_AUX_DIGITAL) ^ (adev->devices & AUDIO_DEVICE_OUT_AUX_DIGITAL)) || ((val & AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET) ^ (adev->devices & AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET)) || (adev->devices & (AUDIO_DEVICE_OUT_AUX_DIGITAL | AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET))) + */ + if (((val & AUDIO_DEVICE_OUT_AUX_DIGITAL) ^ + (adev->devices & AUDIO_DEVICE_OUT_AUX_DIGITAL)) || + ((val & AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET) ^ + (adev->devices & AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET)) || + (adev->devices & (AUDIO_DEVICE_OUT_AUX_DIGITAL | + AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET)) || + (val == AUDIO_DEVICE_OUT_SPEAKER)) do_output_standby(out); } adev->devices &= ~AUDIO_DEVICE_OUT_ALL; |