Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(656)

Unified Diff: media/audio/audio_output_controller.cc

Issue 64493003: Ensure the wedge timer isn't started until after StartStream(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove crash. Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/audio_output_controller.cc
diff --git a/media/audio/audio_output_controller.cc b/media/audio/audio_output_controller.cc
index 4325a1b1ad290a78b1e815d05714563620e5064a..af1a122865d9eda188660103f856b665d1a1290d 100644
--- a/media/audio/audio_output_controller.cc
+++ b/media/audio/audio_output_controller.cc
@@ -198,6 +198,10 @@ void AudioOutputController::DoPlay() {
power_poll_callback_.callback().Run();
#endif
+ on_more_io_data_called_ = 0;
+ AllowEntryToOnMoreIOData();
+ stream_->Start(this);
+
// For UMA tracking purposes, start the wedge detection timer. This allows us
// to record statistics about the number of wedged playbacks in the field.
//
@@ -211,12 +215,8 @@ void AudioOutputController::DoPlay() {
// invalidate the previous timer.
wedge_timer_.reset(new base::OneShotTimer<AudioOutputController>());
wedge_timer_->Start(
- FROM_HERE, TimeDelta::FromSeconds(3), this,
+ FROM_HERE, TimeDelta::FromSeconds(5), this,
&AudioOutputController::WedgeCheck);
- on_more_io_data_called_ = 0;
-
- AllowEntryToOnMoreIOData();
- stream_->Start(this);
handler_->OnPlaying();
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698