OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/public/renderer/media_stream_utils.h" | 5 #include "content/public/renderer/media_stream_utils.h" |
6 | 6 |
7 #include <utility> | |
8 | |
9 #include "base/callback.h" | 7 #include "base/callback.h" |
10 #include "base/guid.h" | 8 #include "base/guid.h" |
11 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
12 #include "base/rand_util.h" | 10 #include "base/rand_util.h" |
13 #include "base/strings/utf_string_conversions.h" | 11 #include "base/strings/utf_string_conversions.h" |
14 #include "content/renderer/media/media_stream_audio_source.h" | 12 #include "content/renderer/media/external_media_stream_audio_source.h" |
15 #include "content/renderer/media/media_stream_video_capturer_source.h" | 13 #include "content/renderer/media/media_stream_video_capturer_source.h" |
16 #include "content/renderer/media/media_stream_video_source.h" | 14 #include "content/renderer/media/media_stream_video_source.h" |
17 #include "content/renderer/media/media_stream_video_track.h" | 15 #include "content/renderer/media/media_stream_video_track.h" |
18 #include "content/renderer/render_thread_impl.h" | |
19 #include "media/base/audio_capturer_source.h" | 16 #include "media/base/audio_capturer_source.h" |
20 #include "media/base/video_capturer_source.h" | 17 #include "media/base/video_capturer_source.h" |
21 #include "third_party/WebKit/public/platform/WebMediaStream.h" | 18 #include "third_party/WebKit/public/platform/WebMediaStream.h" |
22 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h" | 19 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h" |
23 #include "third_party/WebKit/public/web/WebMediaStreamRegistry.h" | 20 #include "third_party/WebKit/public/web/WebMediaStreamRegistry.h" |
24 | 21 |
25 namespace content { | 22 namespace content { |
26 | 23 |
27 bool AddVideoTrackToMediaStream( | 24 bool AddVideoTrackToMediaStream( |
28 scoped_ptr<media::VideoCapturerSource> video_source, | 25 scoped_ptr<media::VideoCapturerSource> video_source, |
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
76 DLOG(ERROR) << "Invalid audio parameters."; | 73 DLOG(ERROR) << "Invalid audio parameters."; |
77 return false; | 74 return false; |
78 } | 75 } |
79 | 76 |
80 blink::WebMediaStreamSource web_media_stream_source; | 77 blink::WebMediaStreamSource web_media_stream_source; |
81 const blink::WebString track_id = | 78 const blink::WebString track_id = |
82 blink::WebString::fromUTF8(base::GenerateGUID()); | 79 blink::WebString::fromUTF8(base::GenerateGUID()); |
83 web_media_stream_source.initialize(track_id, | 80 web_media_stream_source.initialize(track_id, |
84 blink::WebMediaStreamSource::TypeAudio, | 81 blink::WebMediaStreamSource::TypeAudio, |
85 track_id, is_remote, is_readonly); | 82 track_id, is_remote, is_readonly); |
86 | 83 MediaStreamAudioSource* const media_stream_source = |
87 MediaStreamAudioSource* media_stream_source(new MediaStreamAudioSource( | 84 new ExternalMediaStreamAudioSource(std::move(audio_source), sample_rate, |
88 -1, StreamDeviceInfo(), MediaStreamSource::SourceStoppedCallback(), | 85 channel_layout, frames_per_buffer, |
89 RenderThreadImpl::current()->GetPeerConnectionDependencyFactory())); | 86 is_remote); |
90 | 87 // Takes ownership of |media_stream_source|. |
91 blink::WebMediaConstraints constraints; | 88 web_media_stream_source.setExtraData(media_stream_source); |
92 constraints.initialize(); | |
93 { | |
94 // TODO(miu): In an upcoming change, a source purposed for passing audio | |
95 // directly (i.e., without modification) will replace this "hacky" use of | |
96 // WebRtcAudioCapturer. http://crbug.com/577881 | |
97 scoped_ptr<WebRtcAudioCapturer> capturer( | |
98 WebRtcAudioCapturer::CreateCapturer(-1, StreamDeviceInfo(), constraints, | |
99 nullptr, media_stream_source)); | |
100 capturer->SetCapturerSource(std::move(audio_source), params); | |
101 media_stream_source->SetAudioCapturer(std::move(capturer)); | |
102 } | |
103 web_media_stream_source.setExtraData( | |
104 media_stream_source); // Takes ownership. | |
105 | 89 |
106 blink::WebMediaStreamTrack web_media_stream_track; | 90 blink::WebMediaStreamTrack web_media_stream_track; |
107 web_media_stream_track.initialize(web_media_stream_source); | 91 web_media_stream_track.initialize(web_media_stream_source); |
108 RenderThreadImpl::current() | 92 if (!media_stream_source->ConnectToTrack(web_media_stream_track)) |
109 ->GetPeerConnectionDependencyFactory() | 93 return false; |
110 ->CreateLocalAudioTrack(web_media_stream_track); | |
111 | |
112 web_media_stream->addTrack(web_media_stream_track); | 94 web_media_stream->addTrack(web_media_stream_track); |
113 return true; | 95 return true; |
114 } | 96 } |
115 | 97 |
116 const media::VideoCaptureFormat* GetCurrentVideoTrackFormat( | 98 const media::VideoCaptureFormat* GetCurrentVideoTrackFormat( |
117 const blink::WebMediaStreamTrack& video_track) { | 99 const blink::WebMediaStreamTrack& video_track) { |
118 if (video_track.isNull()) | 100 if (video_track.isNull()) |
119 return nullptr; | 101 return nullptr; |
120 | 102 |
121 content::MediaStreamVideoSource* source = | 103 content::MediaStreamVideoSource* source = |
122 content::MediaStreamVideoSource::GetVideoSource(video_track.source()); | 104 content::MediaStreamVideoSource::GetVideoSource(video_track.source()); |
123 if (!source) | 105 if (!source) |
124 return nullptr; | 106 return nullptr; |
125 | 107 |
126 return source->GetCurrentFormat(); | 108 return source->GetCurrentFormat(); |
127 } | 109 } |
128 | 110 |
129 } // namespace content | 111 } // namespace content |
OLD | NEW |