summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authordalecurtis <dalecurtis@chromium.org>2015-01-05 19:03:18 -0800
committerCommit bot <commit-bot@chromium.org>2015-01-06 03:04:01 +0000
commitac667fe33e781fb48412dca392cd85d7d7bfca19 (patch)
tree9f93c97530f254f8a4d307f8b8950ff26a8335bf /media
parentde0d76005c4cbcc115d96ac0fc4b9afcedcd8a07 (diff)
downloadchromium_src-ac667fe33e781fb48412dca392cd85d7d7bfca19.zip
chromium_src-ac667fe33e781fb48412dca392cd85d7d7bfca19.tar.gz
chromium_src-ac667fe33e781fb48412dca392cd85d7d7bfca19.tar.bz2
Fix hanging the audio thread when the input stream cork fails.
BUG=422522 TEST=dcheng@ reports success! Review URL: https://codereview.chromium.org/836903002 Cr-Commit-Position: refs/heads/master@{#310042}
Diffstat (limited to 'media')
-rw-r--r--media/audio/pulse/pulse_input.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/media/audio/pulse/pulse_input.cc b/media/audio/pulse/pulse_input.cc
index 7e2ca22..7cc8ff4 100644
--- a/media/audio/pulse/pulse_input.cc
+++ b/media/audio/pulse/pulse_input.cc
@@ -79,7 +79,8 @@ void PulseAudioInputStream::Start(AudioInputCallback* callback) {
pa_stream_readable_size(handle_);
stream_started_ = true;
- pa_operation* operation = pa_stream_cork(handle_, 0, NULL, NULL);
+ pa_operation* operation =
+ pa_stream_cork(handle_, 0, &pulse::StreamSuccessCallback, pa_mainloop_);
WaitForOperationCompletion(pa_mainloop_, operation);
}