diff options
| author | dalecurtis@google.com <dalecurtis@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-19 23:25:22 +0000 |
|---|---|---|
| committer | dalecurtis@google.com <dalecurtis@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-19 23:25:22 +0000 |
| commit | c4a7dd9701574b23f98a5905ed09dcdeb379996d (patch) | |
| tree | 6827cfc6b152a62efd3654a0181357c895d25728 /media/audio/audio_output_dispatcher_impl.cc | |
| parent | aa6976ae6634ee7c2da09921897f090106446fad (diff) | |
| download | chromium_src-c4a7dd9701574b23f98a5905ed09dcdeb379996d.zip chromium_src-c4a7dd9701574b23f98a5905ed09dcdeb379996d.tar.gz chromium_src-c4a7dd9701574b23f98a5905ed09dcdeb379996d.tar.bz2 | |
Force audio stream Stop() before Close().
Bandaid over situations where we are seemingly calling Close() without
calling Stop() beforehand.
BUG=150619
TEST=media_unittests
Review URL: https://codereview.chromium.org/10950033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@157652 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/audio/audio_output_dispatcher_impl.cc')
| -rw-r--r-- | media/audio/audio_output_dispatcher_impl.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/media/audio/audio_output_dispatcher_impl.cc b/media/audio/audio_output_dispatcher_impl.cc index 757ac69..dbf8ab0 100644 --- a/media/audio/audio_output_dispatcher_impl.cc +++ b/media/audio/audio_output_dispatcher_impl.cc @@ -85,12 +85,10 @@ void AudioOutputDispatcherImpl::StopStream(AudioOutputProxy* stream_proxy) { AudioStreamMap::iterator it = proxy_to_physical_map_.find(stream_proxy); // StopStream() may have already been called. - if (it == proxy_to_physical_map_.end()) { - // TODO(dalecurtis): StopStream() shouldn't be called twice! See the bug: - // http://crbug.com/149815 - LOG(WARNING) << "AudioOutputDispatcherImpl::StopStream() called twice!"; + // TODO(dalecurtis): StopStream() shouldn't be called twice! See: + // http://crbug.com/149815 and http://crbug.com/150619 + if (it == proxy_to_physical_map_.end()) return; - } AudioOutputStream* physical_stream = it->second; proxy_to_physical_map_.erase(it); |