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 <memory> | 7 #include <memory> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/callback.h" | 10 #include "base/callback.h" |
11 #include "base/guid.h" | 11 #include "base/guid.h" |
12 #include "base/rand_util.h" | 12 #include "base/rand_util.h" |
13 #include "base/strings/utf_string_conversions.h" | 13 #include "base/strings/utf_string_conversions.h" |
14 #include "content/renderer/media/external_media_stream_audio_source.h" | 14 #include "content/renderer/media/media_stream_audio_source.h" |
15 #include "content/renderer/media/media_stream_video_capturer_source.h" | 15 #include "content/renderer/media/media_stream_video_capturer_source.h" |
16 #include "content/renderer/media/media_stream_video_source.h" | 16 #include "content/renderer/media/media_stream_video_source.h" |
17 #include "content/renderer/media/media_stream_video_track.h" | 17 #include "content/renderer/media/media_stream_video_track.h" |
| 18 #include "content/renderer/render_thread_impl.h" |
18 #include "media/base/audio_capturer_source.h" | 19 #include "media/base/audio_capturer_source.h" |
19 #include "media/base/video_capturer_source.h" | 20 #include "media/base/video_capturer_source.h" |
20 #include "third_party/WebKit/public/platform/WebMediaStream.h" | 21 #include "third_party/WebKit/public/platform/WebMediaStream.h" |
21 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h" | 22 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h" |
22 #include "third_party/WebKit/public/web/WebMediaStreamRegistry.h" | 23 #include "third_party/WebKit/public/web/WebMediaStreamRegistry.h" |
23 | 24 |
24 namespace content { | 25 namespace content { |
25 | 26 |
26 bool AddVideoTrackToMediaStream( | 27 bool AddVideoTrackToMediaStream( |
27 std::unique_ptr<media::VideoCapturerSource> video_source, | 28 std::unique_ptr<media::VideoCapturerSource> video_source, |
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
75 DLOG(ERROR) << "Invalid audio parameters."; | 76 DLOG(ERROR) << "Invalid audio parameters."; |
76 return false; | 77 return false; |
77 } | 78 } |
78 | 79 |
79 blink::WebMediaStreamSource web_media_stream_source; | 80 blink::WebMediaStreamSource web_media_stream_source; |
80 const blink::WebString track_id = | 81 const blink::WebString track_id = |
81 blink::WebString::fromUTF8(base::GenerateGUID()); | 82 blink::WebString::fromUTF8(base::GenerateGUID()); |
82 web_media_stream_source.initialize(track_id, | 83 web_media_stream_source.initialize(track_id, |
83 blink::WebMediaStreamSource::TypeAudio, | 84 blink::WebMediaStreamSource::TypeAudio, |
84 track_id, is_remote); | 85 track_id, is_remote); |
85 MediaStreamAudioSource* const media_stream_source = | 86 |
86 new ExternalMediaStreamAudioSource(std::move(audio_source), sample_rate, | 87 MediaStreamAudioSource* media_stream_source(new MediaStreamAudioSource( |
87 channel_layout, frames_per_buffer, | 88 -1, StreamDeviceInfo(), MediaStreamSource::SourceStoppedCallback(), |
88 is_remote); | 89 RenderThreadImpl::current()->GetPeerConnectionDependencyFactory())); |
89 // Takes ownership of |media_stream_source|. | 90 |
90 web_media_stream_source.setExtraData(media_stream_source); | 91 blink::WebMediaConstraints constraints; |
| 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 std::unique_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. |
91 | 105 |
92 blink::WebMediaStreamTrack web_media_stream_track; | 106 blink::WebMediaStreamTrack web_media_stream_track; |
93 web_media_stream_track.initialize(web_media_stream_source); | 107 web_media_stream_track.initialize(web_media_stream_source); |
94 if (!media_stream_source->ConnectToTrack(web_media_stream_track)) | 108 RenderThreadImpl::current() |
95 return false; | 109 ->GetPeerConnectionDependencyFactory() |
| 110 ->CreateLocalAudioTrack(web_media_stream_track); |
| 111 |
96 web_media_stream->addTrack(web_media_stream_track); | 112 web_media_stream->addTrack(web_media_stream_track); |
97 return true; | 113 return true; |
98 } | 114 } |
99 | 115 |
100 const media::VideoCaptureFormat* GetCurrentVideoTrackFormat( | 116 const media::VideoCaptureFormat* GetCurrentVideoTrackFormat( |
101 const blink::WebMediaStreamTrack& video_track) { | 117 const blink::WebMediaStreamTrack& video_track) { |
102 if (video_track.isNull()) | 118 if (video_track.isNull()) |
103 return nullptr; | 119 return nullptr; |
104 | 120 |
105 MediaStreamVideoSource* const source = | 121 MediaStreamVideoSource* const source = |
106 MediaStreamVideoSource::GetVideoSource(video_track.source()); | 122 MediaStreamVideoSource::GetVideoSource(video_track.source()); |
107 if (!source) | 123 if (!source) |
108 return nullptr; | 124 return nullptr; |
109 | 125 |
110 return source->GetCurrentFormat(); | 126 return source->GetCurrentFormat(); |
111 } | 127 } |
112 | 128 |
113 void RequestRefreshFrameFromVideoTrack( | 129 void RequestRefreshFrameFromVideoTrack( |
114 const blink::WebMediaStreamTrack& video_track) { | 130 const blink::WebMediaStreamTrack& video_track) { |
115 if (video_track.isNull()) | 131 if (video_track.isNull()) |
116 return; | 132 return; |
117 MediaStreamVideoSource* const source = | 133 MediaStreamVideoSource* const source = |
118 MediaStreamVideoSource::GetVideoSource(video_track.source()); | 134 MediaStreamVideoSource::GetVideoSource(video_track.source()); |
119 if (source) | 135 if (source) |
120 source->RequestRefreshFrame(); | 136 source->RequestRefreshFrame(); |
121 } | 137 } |
122 | 138 |
123 } // namespace content | 139 } // namespace content |
OLD | NEW |