| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/webrtc/webrtc_media_stream_adapter.h" | 5 #include "content/renderer/media/webrtc/webrtc_media_stream_adapter.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <memory> | 9 #include <memory> |
| 10 | 10 |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 76 CHECK(source->ConnectToTrack(audio_track_vector[0])); | 76 CHECK(source->ConnectToTrack(audio_track_vector[0])); |
| 77 } | 77 } |
| 78 | 78 |
| 79 blink::WebVector<blink::WebMediaStreamTrack> video_track_vector( | 79 blink::WebVector<blink::WebMediaStreamTrack> video_track_vector( |
| 80 video ? static_cast<size_t>(1) : 0); | 80 video ? static_cast<size_t>(1) : 0); |
| 81 MediaStreamSource::SourceStoppedCallback dummy_callback; | 81 MediaStreamSource::SourceStoppedCallback dummy_callback; |
| 82 if (video) { | 82 if (video) { |
| 83 blink::WebMediaStreamSource video_source; | 83 blink::WebMediaStreamSource video_source; |
| 84 video_source.Initialize("video", blink::WebMediaStreamSource::kTypeVideo, | 84 video_source.Initialize("video", blink::WebMediaStreamSource::kTypeVideo, |
| 85 "video", false /* remote */); | 85 "video", false /* remote */); |
| 86 MediaStreamVideoSource* native_source = | 86 MediaStreamVideoSource* native_source = new MockMediaStreamVideoSource(); |
| 87 new MockMediaStreamVideoSource(false); | |
| 88 video_source.SetExtraData(native_source); | 87 video_source.SetExtraData(native_source); |
| 89 video_track_vector[0] = MediaStreamVideoTrack::CreateVideoTrack( | 88 video_track_vector[0] = MediaStreamVideoTrack::CreateVideoTrack( |
| 90 native_source, MediaStreamVideoSource::ConstraintsCallback(), true); | 89 native_source, MediaStreamVideoSource::ConstraintsCallback(), true); |
| 91 } | 90 } |
| 92 | 91 |
| 93 blink::WebMediaStream stream_desc; | 92 blink::WebMediaStream stream_desc; |
| 94 stream_desc.Initialize("media stream", audio_track_vector, | 93 stream_desc.Initialize("media stream", audio_track_vector, |
| 95 video_track_vector); | 94 video_track_vector); |
| 96 stream_desc.SetExtraData(new MediaStream()); | 95 stream_desc.SetExtraData(new MediaStream()); |
| 97 return stream_desc; | 96 return stream_desc; |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 175 EXPECT_TRUE(webrtc_stream()->GetVideoTracks().empty()); | 174 EXPECT_TRUE(webrtc_stream()->GetVideoTracks().empty()); |
| 176 | 175 |
| 177 native_stream->AddTrack(audio_tracks[0]); | 176 native_stream->AddTrack(audio_tracks[0]); |
| 178 EXPECT_EQ(1u, webrtc_stream()->GetAudioTracks().size()); | 177 EXPECT_EQ(1u, webrtc_stream()->GetAudioTracks().size()); |
| 179 | 178 |
| 180 native_stream->AddTrack(video_tracks[0]); | 179 native_stream->AddTrack(video_tracks[0]); |
| 181 EXPECT_EQ(1u, webrtc_stream()->GetVideoTracks().size()); | 180 EXPECT_EQ(1u, webrtc_stream()->GetVideoTracks().size()); |
| 182 } | 181 } |
| 183 | 182 |
| 184 } // namespace content | 183 } // namespace content |
| OLD | NEW |