summaryrefslogtreecommitdiff
path: root/cras/src/server/audio_thread.c
diff options
context:
space:
mode:
authorYu-Hsuan Hsu <yuhsuan@chromium.org>2018-12-20 00:02:25 +0800
committerchrome-bot <chrome-bot@chromium.org>2018-12-20 13:49:42 -0800
commitdc96519c4b8342f5b2ea49eb864ceef2a3193fd1 (patch)
treea467c6f401ce058d96b290c291daed020985aece /cras/src/server/audio_thread.c
parent3cb652c54cab38cd52c7ae7a878894bf5d352060 (diff)
downloadadhd-dc96519c4b8342f5b2ea49eb864ceef2a3193fd1.tar.gz
CRAS: audio_thread - get_next_output_wake should consider pending stream
This bug is related to 23be69a CRAS: Do not mix stream before its first fetching In get_next_output_wake function, also need to consider pending streams. BUG=chromium:916508, b:117915490 TEST=Playback works fine after switching output node. Change-Id: I1e75b454d00a7a1e738acdbd705e272efcf520c1 Reviewed-on: https://chromium-review.googlesource.com/1385826 Commit-Ready: Yu-Hsuan Hsu <yuhsuan@chromium.org> Tested-by: Yu-Hsuan Hsu <yuhsuan@chromium.org> Reviewed-by: Cheng-Yi Chiang <cychiang@chromium.org>
Diffstat (limited to 'cras/src/server/audio_thread.c')
-rw-r--r--cras/src/server/audio_thread.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/cras/src/server/audio_thread.c b/cras/src/server/audio_thread.c
index 8f6f32ed..4de036a8 100644
--- a/cras/src/server/audio_thread.c
+++ b/cras/src/server/audio_thread.c
@@ -855,6 +855,11 @@ static int get_next_output_wake(struct open_dev **odevs,
adev->dev->streams,
min_ts);
+ DL_FOREACH(*odevs, adev)
+ ret += get_next_stream_wake_from_list(
+ adev->dev->pending_streams,
+ min_ts);
+
DL_FOREACH(*odevs, adev) {
if (!cras_iodev_odev_should_wake(adev->dev))
continue;