Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1196)

Unified Diff: content/renderer/media/mock_media_stream_dependency_factory.cc

Issue 133903004: Cleaned up the WebRtcAudioCapturer a bit. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased and fixed the comment. Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/media/mock_media_stream_dependency_factory.cc
diff --git a/content/renderer/media/mock_media_stream_dependency_factory.cc b/content/renderer/media/mock_media_stream_dependency_factory.cc
index 8b5ee8b0adf7b6ba7dc8c13c23d6373929081f3b..bdcb69aef60051ca067df9943af1e0bb703379c3 100644
--- a/content/renderer/media/mock_media_stream_dependency_factory.cc
+++ b/content/renderer/media/mock_media_stream_dependency_factory.cc
@@ -480,9 +480,12 @@ MockMediaStreamDependencyFactory::CreateLocalAudioTrack(
WebAudioCapturerSource* webaudio_source,
webrtc::AudioSourceInterface* source) {
DCHECK(mock_pc_factory_created_);
- DCHECK(!capturer.get());
+ blink::WebMediaConstraints constraints;
+ scoped_refptr<WebRtcAudioCapturer> audio_capturer = capturer ?
+ capturer : WebRtcAudioCapturer::CreateCapturer(-1, StreamDeviceInfo(),
+ constraints, NULL);
return WebRtcLocalAudioTrack::Create(
- id, WebRtcAudioCapturer::CreateCapturer(), webaudio_source, source);
+ id, audio_capturer, webaudio_source, source);
}
SessionDescriptionInterface*
@@ -502,10 +505,11 @@ MockMediaStreamDependencyFactory::CreateIceCandidate(
}
scoped_refptr<WebRtcAudioCapturer>
-MockMediaStreamDependencyFactory::MaybeCreateAudioCapturer(
+MockMediaStreamDependencyFactory::CreateAudioCapturer(
int render_view_id, const StreamDeviceInfo& device_info,
const blink::WebMediaConstraints& constraints) {
- return WebRtcAudioCapturer::CreateCapturer();
+ return WebRtcAudioCapturer::CreateCapturer(-1, device_info,
+ constraints, NULL);
}
} // namespace content
« no previous file with comments | « content/renderer/media/mock_media_stream_dependency_factory.h ('k') | content/renderer/media/rtc_peer_connection_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698