diff options
| author | henrika@chromium.org <henrika@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-18 10:05:59 +0000 |
|---|---|---|
| committer | henrika@chromium.org <henrika@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-18 10:05:59 +0000 |
| commit | 785fa7b84392484ee75d33736eb659e7d983011f (patch) | |
| tree | 9030a1acfbac6941bb39852459c81bdfc50967dd /content/renderer/media/media_stream_impl.cc | |
| parent | dd5632636249c8bf858a000eefd0984bbd8e3602 (diff) | |
| download | chromium_src-785fa7b84392484ee75d33736eb659e7d983011f.zip chromium_src-785fa7b84392484ee75d33736eb659e7d983011f.tar.gz chromium_src-785fa7b84392484ee75d33736eb659e7d983011f.tar.bz2 | |
Avoids crash in WebRTC audio clients for unsupported capture sample rates.
TEST=Large set of WebRTC audio-related test applications at different (non-supported) sample rates.
BUG=166503
Review URL: https://codereview.chromium.org/11612018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173709 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/media/media_stream_impl.cc')
| -rw-r--r-- | content/renderer/media/media_stream_impl.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/content/renderer/media/media_stream_impl.cc b/content/renderer/media/media_stream_impl.cc index b7a935c..174bb25 100644 --- a/content/renderer/media/media_stream_impl.cc +++ b/content/renderer/media/media_stream_impl.cc @@ -602,6 +602,12 @@ MediaStreamImpl::CreateLocalAudioRenderer(int session_id) { // Ensure that the existing capturer reads data from the selected microphone. scoped_refptr<WebRtcAudioCapturer> source = dependency_factory_->GetWebRtcAudioDevice()->capturer(); + if (!source) { + // The WebRtcAudioCapturer instance can be NULL e.g. if an unsupported + // sample rate is used. + // TODO(henrika): extend support of capture sample rates. + return NULL; + } source->SetDevice(session_id); // Create a new WebRtcLocalAudioRenderer instance and connect it to the |