Index: media/audio/audio_output_controller.h |
diff --git a/media/audio/audio_output_controller.h b/media/audio/audio_output_controller.h |
index b6fa5c46b5d08cdb4021d1fc168c276323293583..d16ce9e79b6c60c7cb483f6bb6dc1acd8ccdd5f2 100644 |
--- a/media/audio/audio_output_controller.h |
+++ b/media/audio/audio_output_controller.h |
@@ -9,6 +9,7 @@ |
#include "base/callback.h" |
#include "base/cancelable_callback.h" |
#include "base/memory/ref_counted.h" |
+#include "base/timer/timer.h" |
#include "media/audio/audio_io.h" |
#include "media/audio/audio_manager.h" |
#include "media/audio/audio_power_monitor.h" |
@@ -222,6 +223,9 @@ class MEDIA_EXPORT AudioOutputController |
void AllowEntryToOnMoreIOData(); |
void DisallowEntryToOnMoreIOData(); |
+ // Checks if a stream was started successfully but never calls OnMoreIOData(). |
+ void WedgeCheck(); |
+ |
AudioManager* const audio_manager_; |
const AudioParameters params_; |
EventHandler* const handler_; |
@@ -267,9 +271,9 @@ class MEDIA_EXPORT AudioOutputController |
base::CancelableClosure power_poll_callback_; |
#endif |
- // When starting stream we wait for data to become available. |
- // Number of times left. |
- int number_polling_attempts_left_; |
+ // Flags when we've asked for a stream to start but it never did. |
+ base::AtomicRefCount on_more_io_data_called_; |
+ scoped_ptr<base::OneShotTimer<AudioOutputController> > wedge_timer_; |
DISALLOW_COPY_AND_ASSIGN(AudioOutputController); |
}; |