From dc96519c4b8342f5b2ea49eb864ceef2a3193fd1 Mon Sep 17 00:00:00 2001 From: Yu-Hsuan Hsu Date: Thu, 20 Dec 2018 00:02:25 +0800 Subject: 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 Tested-by: Yu-Hsuan Hsu Reviewed-by: Cheng-Yi Chiang --- cras/src/server/audio_thread.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'cras') 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; -- cgit v1.2.3