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

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

Issue 218763007: Update MediaStreamTrack::Stop to latest draft. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed review comments and added tests. Created 6 years, 9 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/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 1a829c3850ae51e95c6233aef817f361520651e9..53e7ce7566aaa2a49e59b0174168f2eabdad4628 100644
--- a/content/renderer/media/media_stream_dependency_factory.cc
+++ b/content/renderer/media/media_stream_dependency_factory.cc
@@ -205,7 +205,8 @@ bool MediaStreamDependencyFactory::InitializeMediaStreamAudioSource(
&device_info.device.input.effects);
scoped_refptr<WebRtcAudioCapturer> capturer(
- CreateAudioCapturer(render_view_id, device_info, audio_constraints));
+ CreateAudioCapturer(render_view_id, device_info, audio_constraints,
+ source_data));
if (!capturer.get()) {
DLOG(WARNING) << "Failed to create the capturer for device "
<< device_info.device.id;
@@ -704,7 +705,8 @@ scoped_refptr<WebRtcAudioCapturer>
MediaStreamDependencyFactory::CreateAudioCapturer(
int render_view_id,
const StreamDeviceInfo& device_info,
- const blink::WebMediaConstraints& constraints) {
+ const blink::WebMediaConstraints& constraints,
+ MediaStreamAudioSource* audio_source) {
// TODO(xians): Handle the cases when gUM is called without a proper render
// view, for example, by an extension.
DCHECK_GE(render_view_id, 0);
@@ -713,7 +715,8 @@ MediaStreamDependencyFactory::CreateAudioCapturer(
DCHECK(GetWebRtcAudioDevice());
return WebRtcAudioCapturer::CreateCapturer(render_view_id, device_info,
constraints,
- GetWebRtcAudioDevice());
+ GetWebRtcAudioDevice(),
+ audio_source);
}
void MediaStreamDependencyFactory::AddNativeTrackToBlinkTrack(

Powered by Google App Engine
This is Rietveld 408576698