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_dependency_factory.h" | 5 #include "content/renderer/media/media_stream_dependency_factory.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
11 #include "base/synchronization/waitable_event.h" | 11 #include "base/synchronization/waitable_event.h" |
12 #include "content/public/common/content_switches.h" | 12 #include "content/public/common/content_switches.h" |
13 #include "content/renderer/media/media_stream_source_extra_data.h" | 13 #include "content/renderer/media/media_stream_source_extra_data.h" |
14 #include "content/renderer/media/media_stream_track_extra_data.h" | 14 #include "content/renderer/media/media_stream_track_extra_data.h" |
| 15 #include "content/renderer/media/media_stream_video_track.h" |
15 #include "content/renderer/media/peer_connection_identity_service.h" | 16 #include "content/renderer/media/peer_connection_identity_service.h" |
16 #include "content/renderer/media/rtc_media_constraints.h" | 17 #include "content/renderer/media/rtc_media_constraints.h" |
17 #include "content/renderer/media/rtc_peer_connection_handler.h" | 18 #include "content/renderer/media/rtc_peer_connection_handler.h" |
18 #include "content/renderer/media/rtc_video_capturer.h" | 19 #include "content/renderer/media/rtc_video_capturer.h" |
19 #include "content/renderer/media/rtc_video_decoder_factory.h" | 20 #include "content/renderer/media/rtc_video_decoder_factory.h" |
20 #include "content/renderer/media/rtc_video_encoder_factory.h" | 21 #include "content/renderer/media/rtc_video_encoder_factory.h" |
21 #include "content/renderer/media/video_capture_impl_manager.h" | 22 #include "content/renderer/media/video_capture_impl_manager.h" |
22 #include "content/renderer/media/webaudio_capturer_source.h" | 23 #include "content/renderer/media/webaudio_capturer_source.h" |
23 #include "content/renderer/media/webrtc_audio_device_impl.h" | 24 #include "content/renderer/media/webrtc_audio_device_impl.h" |
24 #include "content/renderer/media/webrtc_local_audio_track.h" | 25 #include "content/renderer/media/webrtc_local_audio_track.h" |
(...skipping 894 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
919 | 920 |
920 return capturer; | 921 return capturer; |
921 } | 922 } |
922 | 923 |
923 void MediaStreamDependencyFactory::AddNativeTrackToBlinkTrack( | 924 void MediaStreamDependencyFactory::AddNativeTrackToBlinkTrack( |
924 webrtc::MediaStreamTrackInterface* native_track, | 925 webrtc::MediaStreamTrackInterface* native_track, |
925 const blink::WebMediaStreamTrack& webkit_track, | 926 const blink::WebMediaStreamTrack& webkit_track, |
926 bool is_local_track) { | 927 bool is_local_track) { |
927 DCHECK(!webkit_track.isNull() && !webkit_track.extraData()); | 928 DCHECK(!webkit_track.isNull() && !webkit_track.extraData()); |
928 blink::WebMediaStreamTrack track = webkit_track; | 929 blink::WebMediaStreamTrack track = webkit_track; |
929 track.setExtraData(new MediaStreamTrackExtraData(native_track, | 930 |
930 is_local_track)); | 931 if (track.source().type() == blink::WebMediaStreamSource::TypeVideo) { |
| 932 track.setExtraData(new MediaStreamVideoTrack( |
| 933 static_cast<webrtc::VideoTrackInterface*>(native_track), |
| 934 is_local_track)); |
| 935 } else { |
| 936 track.setExtraData(new MediaStreamTrackExtraData(native_track, |
| 937 is_local_track)); |
| 938 } |
931 } | 939 } |
932 | 940 |
933 webrtc::MediaStreamInterface* | 941 webrtc::MediaStreamInterface* |
934 MediaStreamDependencyFactory::GetNativeMediaStream( | 942 MediaStreamDependencyFactory::GetNativeMediaStream( |
935 const blink::WebMediaStream& stream) { | 943 const blink::WebMediaStream& stream) { |
936 if (stream.isNull()) | 944 if (stream.isNull()) |
937 return NULL; | 945 return NULL; |
938 MediaStreamExtraData* extra_data = | 946 MediaStreamExtraData* extra_data = |
939 static_cast<MediaStreamExtraData*>(stream.extraData()); | 947 static_cast<MediaStreamExtraData*>(stream.extraData()); |
940 return extra_data ? extra_data->stream().get() : NULL; | 948 return extra_data ? extra_data->stream().get() : NULL; |
941 } | 949 } |
942 | 950 |
943 webrtc::MediaStreamTrackInterface* | 951 webrtc::MediaStreamTrackInterface* |
944 MediaStreamDependencyFactory::GetNativeMediaStreamTrack( | 952 MediaStreamDependencyFactory::GetNativeMediaStreamTrack( |
945 const blink::WebMediaStreamTrack& track) { | 953 const blink::WebMediaStreamTrack& track) { |
946 if (track.isNull()) | 954 if (track.isNull()) |
947 return NULL; | 955 return NULL; |
948 MediaStreamTrackExtraData* extra_data = | 956 MediaStreamTrackExtraData* extra_data = |
949 static_cast<MediaStreamTrackExtraData*>(track.extraData()); | 957 static_cast<MediaStreamTrackExtraData*>(track.extraData()); |
950 return extra_data ? extra_data->track().get() : NULL; | 958 return extra_data ? extra_data->track().get() : NULL; |
951 } | 959 } |
952 | 960 |
953 } // namespace content | 961 } // namespace content |
OLD | NEW |