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

Side by Side Diff: content/renderer/media/media_stream_video_source.h

Issue 2415703002: Move files video_capture*.* from media/base to media/capture (Closed)
Patch Set: rebase Created 4 years, 1 month 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
OLDNEW
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 #ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_VIDEO_SOURCE_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_VIDEO_SOURCE_H_
6 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_VIDEO_SOURCE_H_ 6 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_VIDEO_SOURCE_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "base/memory/weak_ptr.h" 13 #include "base/memory/weak_ptr.h"
14 #include "base/message_loop/message_loop.h" 14 #include "base/message_loop/message_loop.h"
15 #include "base/threading/non_thread_safe.h" 15 #include "base/threading/non_thread_safe.h"
16 #include "content/common/content_export.h" 16 #include "content/common/content_export.h"
17 #include "content/common/media/video_capture.h" 17 #include "content/common/media/video_capture.h"
18 #include "content/public/renderer/media_stream_video_sink.h" 18 #include "content/public/renderer/media_stream_video_sink.h"
19 #include "content/renderer/media/media_stream_source.h" 19 #include "content/renderer/media/media_stream_source.h"
20 #include "content/renderer/media/secure_display_link_tracker.h" 20 #include "content/renderer/media/secure_display_link_tracker.h"
21 #include "media/base/video_capture_types.h"
22 #include "media/base/video_frame.h" 21 #include "media/base/video_frame.h"
22 #include "media/capture/video_capture_types.h"
23 #include "third_party/WebKit/public/platform/WebMediaConstraints.h" 23 #include "third_party/WebKit/public/platform/WebMediaConstraints.h"
24 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h" 24 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h"
25 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h" 25 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
26 26
27 namespace content { 27 namespace content {
28 28
29 class MediaStreamVideoTrack; 29 class MediaStreamVideoTrack;
30 class VideoTrackAdapter; 30 class VideoTrackAdapter;
31 31
32 // MediaStreamVideoSource is an interface used for sending video frames to a 32 // MediaStreamVideoSource is an interface used for sending video frames to a
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 203
204 // NOTE: Weak pointers must be invalidated before all other member variables. 204 // NOTE: Weak pointers must be invalidated before all other member variables.
205 base::WeakPtrFactory<MediaStreamVideoSource> weak_factory_; 205 base::WeakPtrFactory<MediaStreamVideoSource> weak_factory_;
206 206
207 DISALLOW_COPY_AND_ASSIGN(MediaStreamVideoSource); 207 DISALLOW_COPY_AND_ASSIGN(MediaStreamVideoSource);
208 }; 208 };
209 209
210 } // namespace content 210 } // namespace content
211 211
212 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_VIDEO_SOURCE_H_ 212 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_VIDEO_SOURCE_H_
OLDNEW
« no previous file with comments | « content/renderer/media/media_stream_video_capturer_source.cc ('k') | content/renderer/media/pepper_to_video_track_adapter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698