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" |
11 #include "base/macros.h" | 11 #include "base/macros.h" |
12 #include "base/rand_util.h" | 12 #include "base/rand_util.h" |
13 #include "base/strings/utf_string_conversions.h" | 13 #include "base/strings/utf_string_conversions.h" |
14 #include "base/trace_event/trace_event.h" | 14 #include "base/trace_event/trace_event.h" |
15 #include "content/renderer/media/media_stream.h" | 15 #include "content/renderer/media/media_stream.h" |
16 #include "content/renderer/media/media_stream_registry_interface.h" | 16 #include "content/renderer/media/media_stream_registry_interface.h" |
17 #include "content/renderer/media/media_stream_video_source.h" | 17 #include "content/renderer/media/media_stream_video_source.h" |
18 #include "content/renderer/media/media_stream_video_track.h" | 18 #include "content/renderer/media/media_stream_video_track.h" |
19 #include "content/renderer/pepper/ppb_image_data_impl.h" | 19 #include "content/renderer/pepper/ppb_image_data_impl.h" |
20 #include "content/renderer/render_thread_impl.h" | 20 #include "content/renderer/render_thread_impl.h" |
21 #include "media/base/video_capture_types.h" | |
22 #include "media/base/video_frame_pool.h" | 21 #include "media/base/video_frame_pool.h" |
| 22 #include "media/capture/video_capture_types.h" |
23 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h" | 23 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h" |
24 #include "third_party/WebKit/public/platform/WebURL.h" | 24 #include "third_party/WebKit/public/platform/WebURL.h" |
25 #include "third_party/WebKit/public/web/WebMediaStreamRegistry.h" | 25 #include "third_party/WebKit/public/web/WebMediaStreamRegistry.h" |
26 #include "third_party/libyuv/include/libyuv/convert.h" | 26 #include "third_party/libyuv/include/libyuv/convert.h" |
27 #include "url/gurl.h" | 27 #include "url/gurl.h" |
28 | 28 |
29 namespace content { | 29 namespace content { |
30 | 30 |
31 // PpFrameWriter implements MediaStreamVideoSource and can therefore provide | 31 // PpFrameWriter implements MediaStreamVideoSource and can therefore provide |
32 // video frames to MediaStreamVideoTracks. It also implements | 32 // video frames to MediaStreamVideoTracks. It also implements |
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
268 | 268 |
269 stream.addTrack(MediaStreamVideoTrack::CreateVideoTrack( | 269 stream.addTrack(MediaStreamVideoTrack::CreateVideoTrack( |
270 writer, constraints, MediaStreamVideoSource::ConstraintsCallback(), | 270 writer, constraints, MediaStreamVideoSource::ConstraintsCallback(), |
271 track_enabled)); | 271 track_enabled)); |
272 | 272 |
273 *frame_writer = new PpFrameWriterProxy(writer->AsWeakPtr()); | 273 *frame_writer = new PpFrameWriterProxy(writer->AsWeakPtr()); |
274 return true; | 274 return true; |
275 } | 275 } |
276 | 276 |
277 } // namespace content | 277 } // namespace content |
OLD | NEW |