diff options
| author | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-28 09:22:36 +0000 |
|---|---|---|
| committer | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-28 09:22:36 +0000 |
| commit | cd00f8a9349cd6ec0f1fd7426c300b4d164c1a42 (patch) | |
| tree | 7bfce7fa2ad355497d9d10ee169d8a925f297a72 /media | |
| parent | de4b01cc9e693c78911ee6401ae58948ca861fd2 (diff) | |
| download | chromium_src-cd00f8a9349cd6ec0f1fd7426c300b4d164c1a42.zip chromium_src-cd00f8a9349cd6ec0f1fd7426c300b4d164c1a42.tar.gz chromium_src-cd00f8a9349cd6ec0f1fd7426c300b4d164c1a42.tar.bz2 | |
Disable the "check for no data" timer for audio on Mac.
This seems to be causing problems when a mic gets temporarily suspended.
BUG=357501
R=henrika@chromium.org
Review URL: https://codereview.chromium.org/216483003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260099 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/audio/audio_input_controller.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/media/audio/audio_input_controller.cc b/media/audio/audio_input_controller.cc index 7cac8a7..ef2c4a9 100644 --- a/media/audio/audio_input_controller.cc +++ b/media/audio/audio_input_controller.cc @@ -18,6 +18,8 @@ const int kMaxInputChannels = 2; // to resolve http://crbug.com/79936 for Windows platforms. This then caused // breakage (very hard to repro bugs!) on other platforms: See // http://crbug.com/226327 and http://crbug.com/230972. +// See also that the timer has been disabled on Mac now due to +// crbug.com/357501. const int kTimerResetIntervalSeconds = 1; // We have received reports that the timer can be too trigger happy on some // Mac devices and the initial timer interval has therefore been increased @@ -199,6 +201,13 @@ void AudioInputController::DoCreateForStream( } DCHECK(!no_data_timer_.get()); + +#if defined(OS_MACOSX) + // This is a fix for crbug.com/357501. The timer can trigger when closing + // the lid on Macs, which causes more problems than the timer fixes. + enable_nodata_timer = false; +#endif + if (enable_nodata_timer) { // Create the data timer which will call DoCheckForNoData(). The timer // is started in DoRecord() and restarted in each DoCheckForNoData() |