OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/renderer/media/media_stream_center.h" | 5 #include "content/renderer/media/media_stream_center.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <string> | 9 #include <string> |
10 | 10 |
11 #include "base/command_line.h" | 11 #include "base/command_line.h" |
12 #include "base/logging.h" | 12 #include "base/logging.h" |
13 #include "content/common/media/media_stream_messages.h" | 13 #include "content/common/media/media_stream_messages.h" |
14 #include "content/public/common/content_switches.h" | 14 #include "content/public/common/content_switches.h" |
15 #include "content/public/renderer/media_stream_audio_sink.h" | 15 #include "content/public/renderer/media_stream_audio_sink.h" |
16 #include "content/public/renderer/render_thread.h" | 16 #include "content/public/renderer/render_thread.h" |
17 #include "content/renderer/media/media_stream.h" | 17 #include "content/renderer/media/media_stream.h" |
| 18 #include "content/renderer/media/media_stream_audio_track.h" |
18 #include "content/renderer/media/media_stream_source.h" | 19 #include "content/renderer/media/media_stream_source.h" |
19 #include "content/renderer/media/media_stream_video_source.h" | 20 #include "content/renderer/media/media_stream_video_source.h" |
20 #include "content/renderer/media/media_stream_video_track.h" | 21 #include "content/renderer/media/media_stream_video_track.h" |
21 #include "content/renderer/media/webrtc/peer_connection_dependency_factory.h" | 22 #include "content/renderer/media/webrtc/peer_connection_dependency_factory.h" |
22 #include "content/renderer/media/webrtc_local_audio_source_provider.h" | 23 #include "content/renderer/media/webrtc_local_audio_source_provider.h" |
23 #include "third_party/WebKit/public/platform/WebMediaConstraints.h" | 24 #include "third_party/WebKit/public/platform/WebMediaConstraints.h" |
24 #include "third_party/WebKit/public/platform/WebMediaStream.h" | 25 #include "third_party/WebKit/public/platform/WebMediaStream.h" |
25 #include "third_party/WebKit/public/platform/WebMediaStreamCenterClient.h" | 26 #include "third_party/WebKit/public/platform/WebMediaStreamCenterClient.h" |
26 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h" | 27 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h" |
27 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h" | 28 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h" |
28 #include "third_party/WebKit/public/platform/WebMediaStreamTrackSourcesRequest.h
" | 29 #include "third_party/WebKit/public/platform/WebMediaStreamTrackSourcesRequest.h
" |
29 #include "third_party/WebKit/public/platform/WebSourceInfo.h" | 30 #include "third_party/WebKit/public/platform/WebSourceInfo.h" |
30 #include "third_party/WebKit/public/platform/WebVector.h" | 31 #include "third_party/WebKit/public/platform/WebVector.h" |
31 #include "third_party/WebKit/public/web/WebFrame.h" | 32 #include "third_party/WebKit/public/web/WebFrame.h" |
32 | 33 |
33 using blink::WebFrame; | 34 using blink::WebFrame; |
34 using blink::WebView; | 35 using blink::WebView; |
35 | 36 |
36 namespace content { | 37 namespace content { |
37 | 38 |
38 namespace { | 39 namespace { |
39 | 40 |
40 void CreateNativeAudioMediaStreamTrack( | 41 void CreateNativeAudioMediaStreamTrack( |
41 const blink::WebMediaStreamTrack& track, | 42 const blink::WebMediaStreamTrack& track, |
42 PeerConnectionDependencyFactory* factory) { | 43 PeerConnectionDependencyFactory* factory) { |
43 DCHECK(!track.extraData()); | 44 DCHECK(!MediaStreamAudioTrack::GetTrack(track)); |
44 blink::WebMediaStreamSource source = track.source(); | 45 blink::WebMediaStreamSource source = track.source(); |
45 DCHECK_EQ(source.type(), blink::WebMediaStreamSource::TypeAudio); | 46 DCHECK_EQ(source.type(), blink::WebMediaStreamSource::TypeAudio); |
46 if (source.remote()) { | 47 if (source.remote()) { |
47 factory->CreateRemoteAudioTrack(track); | 48 factory->CreateRemoteAudioTrack(track); |
48 } else { | 49 } else { |
49 factory->CreateLocalAudioTrack(track); | 50 factory->CreateLocalAudioTrack(track); |
50 } | 51 } |
51 } | 52 } |
52 | 53 |
53 void CreateNativeVideoMediaStreamTrack( | 54 void CreateNativeVideoMediaStreamTrack( |
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
123 DVLOG(1) << "MediaStreamCenter::didStopMediaStreamTrack"; | 124 DVLOG(1) << "MediaStreamCenter::didStopMediaStreamTrack"; |
124 MediaStreamTrack* native_track = MediaStreamTrack::GetTrack(track); | 125 MediaStreamTrack* native_track = MediaStreamTrack::GetTrack(track); |
125 native_track->Stop(); | 126 native_track->Stop(); |
126 return true; | 127 return true; |
127 } | 128 } |
128 | 129 |
129 blink::WebAudioSourceProvider* | 130 blink::WebAudioSourceProvider* |
130 MediaStreamCenter::createWebAudioSourceFromMediaStreamTrack( | 131 MediaStreamCenter::createWebAudioSourceFromMediaStreamTrack( |
131 const blink::WebMediaStreamTrack& track) { | 132 const blink::WebMediaStreamTrack& track) { |
132 DVLOG(1) << "MediaStreamCenter::createWebAudioSourceFromMediaStreamTrack"; | 133 DVLOG(1) << "MediaStreamCenter::createWebAudioSourceFromMediaStreamTrack"; |
133 MediaStreamTrack* media_stream_track = | 134 if (!MediaStreamAudioTrack::GetTrack(track)) { |
134 static_cast<MediaStreamTrack*>(track.extraData()); | |
135 if (!media_stream_track) { | |
136 DLOG(ERROR) << "Native track missing for webaudio source."; | 135 DLOG(ERROR) << "Native track missing for webaudio source."; |
137 return nullptr; | 136 return nullptr; |
138 } | 137 } |
139 | 138 |
140 blink::WebMediaStreamSource source = track.source(); | 139 blink::WebMediaStreamSource source = track.source(); |
141 DCHECK_EQ(source.type(), blink::WebMediaStreamSource::TypeAudio); | 140 DCHECK_EQ(source.type(), blink::WebMediaStreamSource::TypeAudio); |
142 | 141 |
143 // TODO(tommi): Rename WebRtcLocalAudioSourceProvider to | 142 // TODO(tommi): Rename WebRtcLocalAudioSourceProvider to |
144 // WebRtcAudioSourceProvider since it's not specific to local. | 143 // WebRtcAudioSourceProvider since it's not specific to local. |
145 return new WebRtcLocalAudioSourceProvider(track); | 144 return new WebRtcLocalAudioSourceProvider(track); |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
184 | 183 |
185 bool MediaStreamCenter::didRemoveMediaStreamTrack( | 184 bool MediaStreamCenter::didRemoveMediaStreamTrack( |
186 const blink::WebMediaStream& stream, | 185 const blink::WebMediaStream& stream, |
187 const blink::WebMediaStreamTrack& track) { | 186 const blink::WebMediaStreamTrack& track) { |
188 DVLOG(1) << "MediaStreamCenter::didRemoveMediaStreamTrack"; | 187 DVLOG(1) << "MediaStreamCenter::didRemoveMediaStreamTrack"; |
189 MediaStream* native_stream = MediaStream::GetMediaStream(stream); | 188 MediaStream* native_stream = MediaStream::GetMediaStream(stream); |
190 return native_stream->RemoveTrack(track); | 189 return native_stream->RemoveTrack(track); |
191 } | 190 } |
192 | 191 |
193 } // namespace content | 192 } // namespace content |
OLD | NEW |