diff options
| author | dalecurtis@chromium.org <dalecurtis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-08 09:28:51 +0000 |
|---|---|---|
| committer | dalecurtis@chromium.org <dalecurtis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-08 09:28:51 +0000 |
| commit | 82cb10900b887b8a8df0bdd3de5c7686ed5f57bd (patch) | |
| tree | 060c9ea2f3102e3b9aed65d0becd89a9e2702a53 /media | |
| parent | 1b932b96cbd1f55f8789ba52b413d6ab7361ac10 (diff) | |
| download | chromium_src-82cb10900b887b8a8df0bdd3de5c7686ed5f57bd.zip chromium_src-82cb10900b887b8a8df0bdd3de5c7686ed5f57bd.tar.gz chromium_src-82cb10900b887b8a8df0bdd3de5c7686ed5f57bd.tar.bz2 | |
Ensure the wedge timer isn't started until after StartStream().
Otherwise, in rare conditions, a very long StartStream() may
incorrectly cause a wedge to be flagged.
If StartStream() hangs the message loop is blocked and the timer
will never run anyways.
Also, increase wedge timer to 5 seconds.
BUG=160920
TEST=none
Review URL: https://codereview.chromium.org/64493003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233843 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/audio/audio_output_controller.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/media/audio/audio_output_controller.cc b/media/audio/audio_output_controller.cc index c2a0619..d46dfda 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(); } |