Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6)

Side by Side Diff: content/renderer/media/rtc_peer_connection_handler_unittest.cc

Issue 155853002: Chrome MediaStream VideoTrack implementation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More cleanup. Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 <string> 5 #include <string>
6 #include <vector> 6 #include <vector>
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "base/values.h" 10 #include "base/values.h"
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 223
224 blink::WebMediaStreamSource audio_source; 224 blink::WebMediaStreamSource audio_source;
225 audio_source.initialize(blink::WebString::fromUTF8(audio_track_label), 225 audio_source.initialize(blink::WebString::fromUTF8(audio_track_label),
226 blink::WebMediaStreamSource::TypeAudio, 226 blink::WebMediaStreamSource::TypeAudio,
227 blink::WebString::fromUTF8("audio_track")); 227 blink::WebString::fromUTF8("audio_track"));
228 audio_source.setExtraData(new MediaStreamAudioSource()); 228 audio_source.setExtraData(new MediaStreamAudioSource());
229 blink::WebMediaStreamSource video_source; 229 blink::WebMediaStreamSource video_source;
230 video_source.initialize(blink::WebString::fromUTF8(video_track_label), 230 video_source.initialize(blink::WebString::fromUTF8(video_track_label),
231 blink::WebMediaStreamSource::TypeVideo, 231 blink::WebMediaStreamSource::TypeVideo,
232 blink::WebString::fromUTF8("video_track")); 232 blink::WebString::fromUTF8("video_track"));
233 video_source.setExtraData( 233 MockMediaStreamVideoSource* native_video_source =
234 new MockMediaStreamVideoSource(mock_dependency_factory_.get(), 234 new MockMediaStreamVideoSource(mock_dependency_factory_.get(),
235 false)); 235 false);
236 video_source.setExtraData(native_video_source);
237
236 238
237 blink::WebVector<blink::WebMediaStreamTrack> audio_tracks( 239 blink::WebVector<blink::WebMediaStreamTrack> audio_tracks(
238 static_cast<size_t>(1)); 240 static_cast<size_t>(1));
239 audio_tracks[0].initialize(audio_source.id(), audio_source); 241 audio_tracks[0].initialize(audio_source.id(), audio_source);
240 audio_tracks[0].setExtraData( 242 audio_tracks[0].setExtraData(
241 new MediaStreamTrack( 243 new MediaStreamTrack(
242 WebRtcLocalAudioTrackAdapter::Create(audio_track_label, 244 WebRtcLocalAudioTrackAdapter::Create(audio_track_label,
243 NULL), 245 NULL),
244 true)); 246 true));
245 blink::WebVector<blink::WebMediaStreamTrack> video_tracks( 247 blink::WebVector<blink::WebMediaStreamTrack> video_tracks(
246 static_cast<size_t>(1)); 248 static_cast<size_t>(1));
247 video_tracks[0].initialize(video_source.id(), video_source); 249 video_tracks[0].initialize(video_source.id(), video_source);
248 video_tracks[0].setExtraData( 250 video_tracks[0].setExtraData(
249 new MediaStreamVideoTrack(mock_dependency_factory_.get())); 251 new MediaStreamVideoTrack(
252 native_video_source,
253 mock_dependency_factory_.get()));
254
255 blink::WebMediaConstraints constraints;
256 constraints.initialize();
257 native_video_source->AddTrack(
258 video_tracks[0],
259 constraints,
260 MediaStreamVideoSource::ConstraintsCallback());
250 261
251 blink::WebMediaStream local_stream; 262 blink::WebMediaStream local_stream;
252 local_stream.initialize(base::UTF8ToUTF16(stream_label), audio_tracks, 263 local_stream.initialize(base::UTF8ToUTF16(stream_label), audio_tracks,
253 video_tracks); 264 video_tracks);
254 local_stream.setExtraData( 265 local_stream.setExtraData(
255 new MediaStream(mock_dependency_factory_.get(), 266 new MediaStream(mock_dependency_factory_.get(),
256 MediaStream::StreamStopCallback(), 267 MediaStream::StreamStopCallback(),
257 local_stream)); 268 local_stream));
258 return local_stream; 269 return local_stream;
259 } 270 }
(...skipping 576 matching lines...) Expand 10 before | Expand all | Expand 10 after
836 EXPECT_CALL(*mock_tracker_.get(), 847 EXPECT_CALL(*mock_tracker_.get(),
837 TrackCreateDTMFSender(pc_handler_.get(), 848 TrackCreateDTMFSender(pc_handler_.get(),
838 testing::Ref(tracks[0]))); 849 testing::Ref(tracks[0])));
839 850
840 scoped_ptr<blink::WebRTCDTMFSenderHandler> sender( 851 scoped_ptr<blink::WebRTCDTMFSenderHandler> sender(
841 pc_handler_->createDTMFSender(tracks[0])); 852 pc_handler_->createDTMFSender(tracks[0]));
842 EXPECT_TRUE(sender.get()); 853 EXPECT_TRUE(sender.get());
843 } 854 }
844 855
845 } // namespace content 856 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698