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

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

Issue 201583003: Implement a source for remote video tracks. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 "content/renderer/media/media_stream_center.h" 5 #include "content/renderer/media/media_stream_center.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 } 43 }
44 44
45 void CreateNativeVideoMediaStreamTrack( 45 void CreateNativeVideoMediaStreamTrack(
46 const blink::WebMediaStreamTrack& track, 46 const blink::WebMediaStreamTrack& track,
47 MediaStreamDependencyFactory* factory) { 47 MediaStreamDependencyFactory* factory) {
48 DCHECK(track.extraData() == NULL); 48 DCHECK(track.extraData() == NULL);
49 blink::WebMediaStreamSource source = track.source(); 49 blink::WebMediaStreamSource source = track.source();
50 DCHECK_EQ(source.type(), blink::WebMediaStreamSource::TypeVideo); 50 DCHECK_EQ(source.type(), blink::WebMediaStreamSource::TypeVideo);
51 MediaStreamVideoSource* native_source = 51 MediaStreamVideoSource* native_source =
52 MediaStreamVideoSource::GetVideoSource(source); 52 MediaStreamVideoSource::GetVideoSource(source);
53 if (!native_source) { 53 DCHECK(native_source);
54 // TODO(perkj): Implement support for sources from
55 // remote MediaStreams.
56 NOTIMPLEMENTED();
57 return;
58 }
59 blink::WebMediaStreamTrack writable_track(track); 54 blink::WebMediaStreamTrack writable_track(track);
60 writable_track.setExtraData( 55 writable_track.setExtraData(
61 new MediaStreamVideoTrack(native_source, source.constraints(), 56 new MediaStreamVideoTrack(native_source, source.constraints(),
62 MediaStreamVideoSource::ConstraintsCallback(), 57 MediaStreamVideoSource::ConstraintsCallback(),
63 track.isEnabled(), factory)); 58 track.isEnabled(), factory));
64 } 59 }
65 60
66 void CreateNativeMediaStreamTrack(const blink::WebMediaStreamTrack& track, 61 void CreateNativeMediaStreamTrack(const blink::WebMediaStreamTrack& track,
67 MediaStreamDependencyFactory* factory) { 62 MediaStreamDependencyFactory* factory) {
68 DCHECK(!track.isNull() && !track.extraData()); 63 DCHECK(!track.isNull() && !track.extraData());
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 device.type == MEDIA_DEVICE_AUDIO_CAPTURE 244 device.type == MEDIA_DEVICE_AUDIO_CAPTURE
250 ? blink::WebSourceInfo::SourceKindAudio 245 ? blink::WebSourceInfo::SourceKindAudio
251 : blink::WebSourceInfo::SourceKindVideo, 246 : blink::WebSourceInfo::SourceKindVideo,
252 blink::WebString::fromUTF8(device.name), 247 blink::WebString::fromUTF8(device.name),
253 video_facing); 248 video_facing);
254 } 249 }
255 request_it->second.requestSucceeded(sourceInfos); 250 request_it->second.requestSucceeded(sourceInfos);
256 } 251 }
257 252
258 } // namespace content 253 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698