Chromium Code Reviews| Index: chromecast/media/cma/backend/alsa/stream_mixer_alsa.cc |
| diff --git a/chromecast/media/cma/backend/alsa/stream_mixer_alsa.cc b/chromecast/media/cma/backend/alsa/stream_mixer_alsa.cc |
| index 2f1afc7f9d41a45cb4cbe59754ca1fec65ae1e95..aec64cf2b3831e6f3d31dc2ee1fd3d16efe50a96 100644 |
| --- a/chromecast/media/cma/backend/alsa/stream_mixer_alsa.cc |
| +++ b/chromecast/media/cma/backend/alsa/stream_mixer_alsa.cc |
| @@ -256,9 +256,13 @@ void StreamMixerAlsa::DefineAlsaParameters() { |
| } |
| alsa_avail_min_ = avail_min; |
| + // --accept-resource-provider should imply a check close timeout of 0. |
| + int default_close_timeout = |
| + base::GetSwitchValueBoolean(switches::kAcceptResourceProvider) |
| + ? 0 |
| + : kDefaultCheckCloseTimeoutMs; |
|
byungchul
2016/03/07 17:19:40
Is this a right indentation? Why isn't it:
int de
jyw
2016/03/08 02:09:24
git cl format is a no-op.
|
| GetSwitchValueAsNonNegativeInt(switches::kAlsaCheckCloseTimeout, |
| - kDefaultCheckCloseTimeoutMs, |
| - &check_close_timeout_); |
| + default_close_timeout, &check_close_timeout_); |
| } |
| int StreamMixerAlsa::SetAlsaPlaybackParams() { |