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

Side by Side Diff: media/capture/video/win/video_capture_device_win.h

Issue 1535193003: Add missing macros includes in media/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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
« no previous file with comments | « media/capture/video/win/video_capture_device_mf_win.h ('k') | media/capture/webm_muxer.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 // Windows specific implementation of VideoCaptureDevice. DirectShow is used for 5 // Windows specific implementation of VideoCaptureDevice. DirectShow is used for
6 // capturing. DirectShow provide its own threads for capturing. 6 // capturing. DirectShow provide its own threads for capturing.
7 7
8 #ifndef MEDIA_VIDEO_CAPTURE_WIN_VIDEO_CAPTURE_DEVICE_WIN_H_ 8 #ifndef MEDIA_VIDEO_CAPTURE_WIN_VIDEO_CAPTURE_DEVICE_WIN_H_
9 #define MEDIA_VIDEO_CAPTURE_WIN_VIDEO_CAPTURE_DEVICE_WIN_H_ 9 #define MEDIA_VIDEO_CAPTURE_WIN_VIDEO_CAPTURE_DEVICE_WIN_H_
10 10
11 // Avoid including strsafe.h via dshow as it will cause build warnings. 11 // Avoid including strsafe.h via dshow as it will cause build warnings.
12 #define NO_DSHOW_STRSAFE 12 #define NO_DSHOW_STRSAFE
13 #include <dshow.h> 13 #include <dshow.h>
14 14
15 #include <map> 15 #include <map>
16 #include <string> 16 #include <string>
17 17
18 #include "base/macros.h"
18 #include "base/threading/thread_checker.h" 19 #include "base/threading/thread_checker.h"
19 #include "base/win/scoped_comptr.h" 20 #include "base/win/scoped_comptr.h"
20 #include "media/base/video_capture_types.h" 21 #include "media/base/video_capture_types.h"
21 #include "media/capture/video/video_capture_device.h" 22 #include "media/capture/video/video_capture_device.h"
22 #include "media/capture/video/win/capability_list_win.h" 23 #include "media/capture/video/win/capability_list_win.h"
23 #include "media/capture/video/win/sink_filter_win.h" 24 #include "media/capture/video/win/sink_filter_win.h"
24 #include "media/capture/video/win/sink_input_pin_win.h" 25 #include "media/capture/video/win/sink_input_pin_win.h"
25 26
26 namespace tracked_objects { 27 namespace tracked_objects {
27 class Location; 28 class Location;
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 VideoCaptureFormat capture_format_; 111 VideoCaptureFormat capture_format_;
111 112
112 base::ThreadChecker thread_checker_; 113 base::ThreadChecker thread_checker_;
113 114
114 DISALLOW_IMPLICIT_CONSTRUCTORS(VideoCaptureDeviceWin); 115 DISALLOW_IMPLICIT_CONSTRUCTORS(VideoCaptureDeviceWin);
115 }; 116 };
116 117
117 } // namespace media 118 } // namespace media
118 119
119 #endif // MEDIA_VIDEO_CAPTURE_WIN_VIDEO_CAPTURE_DEVICE_WIN_H_ 120 #endif // MEDIA_VIDEO_CAPTURE_WIN_VIDEO_CAPTURE_DEVICE_WIN_H_
OLDNEW
« no previous file with comments | « media/capture/video/win/video_capture_device_mf_win.h ('k') | media/capture/webm_muxer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698