OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/pepper_to_video_track_adapter.h" | 5 #include "content/renderer/media/pepper_to_video_track_adapter.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/base64.h" | 9 #include "base/base64.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
251 // existing sources. | 251 // existing sources. |
252 base::Base64Encode(base::RandBytesAsString(64), &track_id); | 252 base::Base64Encode(base::RandBytesAsString(64), &track_id); |
253 | 253 |
254 PpFrameWriter* writer = new PpFrameWriter(); | 254 PpFrameWriter* writer = new PpFrameWriter(); |
255 | 255 |
256 // Create a new webkit video track. | 256 // Create a new webkit video track. |
257 blink::WebMediaStreamSource webkit_source; | 257 blink::WebMediaStreamSource webkit_source; |
258 blink::WebMediaStreamSource::Type type = | 258 blink::WebMediaStreamSource::Type type = |
259 blink::WebMediaStreamSource::TypeVideo; | 259 blink::WebMediaStreamSource::TypeVideo; |
260 blink::WebString webkit_track_id = blink::WebString::fromUTF8(track_id); | 260 blink::WebString webkit_track_id = blink::WebString::fromUTF8(track_id); |
261 webkit_source.initialize(webkit_track_id, type, webkit_track_id); | 261 webkit_source.initialize(webkit_track_id, type, webkit_track_id, |
| 262 false /* remote */); |
262 webkit_source.setExtraData(writer); | 263 webkit_source.setExtraData(writer); |
263 | 264 |
264 blink::WebMediaConstraints constraints; | 265 blink::WebMediaConstraints constraints; |
265 constraints.initialize(); | 266 constraints.initialize(); |
266 bool track_enabled = true; | 267 bool track_enabled = true; |
267 | 268 |
268 stream.addTrack(MediaStreamVideoTrack::CreateVideoTrack( | 269 stream.addTrack(MediaStreamVideoTrack::CreateVideoTrack( |
269 writer, constraints, MediaStreamVideoSource::ConstraintsCallback(), | 270 writer, constraints, MediaStreamVideoSource::ConstraintsCallback(), |
270 track_enabled)); | 271 track_enabled)); |
271 | 272 |
272 *frame_writer = new PpFrameWriterProxy(writer->AsWeakPtr()); | 273 *frame_writer = new PpFrameWriterProxy(writer->AsWeakPtr()); |
273 return true; | 274 return true; |
274 } | 275 } |
275 | 276 |
276 } // namespace content | 277 } // namespace content |
OLD | NEW |