Index: content/renderer/media/media_stream_dependency_factory.cc |
diff --git a/content/renderer/media/media_stream_dependency_factory.cc b/content/renderer/media/media_stream_dependency_factory.cc |
index 93d071d002bf058c27aba596de75ac6c71fe2e67..9c5f7d06bf6de09297dc8e0d2a387b2c5fae25a4 100644 |
--- a/content/renderer/media/media_stream_dependency_factory.cc |
+++ b/content/renderer/media/media_stream_dependency_factory.cc |
@@ -455,7 +455,11 @@ MediaStreamDependencyFactory::CreateLocalVideoSource( |
bool MediaStreamDependencyFactory::InitializeAudioSource( |
const StreamDeviceInfo& device_info) { |
DVLOG(1) << "MediaStreamDependencyFactory::InitializeAudioSource()"; |
- const MediaStreamDevice device = device_info.device; |
+ |
+ // TODO(henrika): the current design does not support a unique source |
+ // for each audio track. |
+ if (device_info.session_id <= 0) |
+ return false; |
// Initialize the source using audio parameters for the selected |
// capture device. |
@@ -463,18 +467,10 @@ bool MediaStreamDependencyFactory::InitializeAudioSource( |
// TODO(henrika): refactor \content\public\common\media_stream_request.h |
// to allow dependency of media::ChannelLayout and avoid static_cast. |
if (!capturer->Initialize( |
- static_cast<media::ChannelLayout>(device.channel_layout), |
- device.sample_rate)) |
- return false; |
- |
- // Specify which capture device to use. The acquired session id is used |
- // for identification. |
- // TODO(henrika): the current design does not support a uniqe source |
- // for each audio track. |
- if (device_info.session_id <= 0) |
+ static_cast<media::ChannelLayout>(device_info.device.channel_layout), |
+ device_info.device.sample_rate, device_info.session_id)) |
return false; |
- capturer->SetDevice(device_info.session_id); |
return true; |
} |