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

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

Issue 623263003: replace OVERRIDE and FINAL with override and final in media/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
« no previous file with comments | « media/video/capture/win/video_capture_device_mf_win.cc ('k') | no next file » | 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. 5 // Windows specific implementation of VideoCaptureDevice.
6 // DirectShow is used for capturing. DirectShow provide its own threads 6 // DirectShow is used for capturing. DirectShow provide its own threads
7 // for capturing. 7 // for capturing.
8 8
9 #ifndef MEDIA_VIDEO_CAPTURE_WIN_VIDEO_CAPTURE_DEVICE_WIN_H_ 9 #ifndef MEDIA_VIDEO_CAPTURE_WIN_VIDEO_CAPTURE_DEVICE_WIN_H_
10 #define MEDIA_VIDEO_CAPTURE_WIN_VIDEO_CAPTURE_DEVICE_WIN_H_ 10 #define MEDIA_VIDEO_CAPTURE_WIN_VIDEO_CAPTURE_DEVICE_WIN_H_
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 const GUID& sub_type); 64 const GUID& sub_type);
65 65
66 explicit VideoCaptureDeviceWin(const Name& device_name); 66 explicit VideoCaptureDeviceWin(const Name& device_name);
67 virtual ~VideoCaptureDeviceWin(); 67 virtual ~VideoCaptureDeviceWin();
68 // Opens the device driver for this device. 68 // Opens the device driver for this device.
69 bool Init(); 69 bool Init();
70 70
71 // VideoCaptureDevice implementation. 71 // VideoCaptureDevice implementation.
72 virtual void AllocateAndStart( 72 virtual void AllocateAndStart(
73 const VideoCaptureParams& params, 73 const VideoCaptureParams& params,
74 scoped_ptr<VideoCaptureDevice::Client> client) OVERRIDE; 74 scoped_ptr<VideoCaptureDevice::Client> client) override;
75 virtual void StopAndDeAllocate() OVERRIDE; 75 virtual void StopAndDeAllocate() override;
76 76
77 private: 77 private:
78 enum InternalState { 78 enum InternalState {
79 kIdle, // The device driver is opened but camera is not in use. 79 kIdle, // The device driver is opened but camera is not in use.
80 kCapturing, // Video is being captured. 80 kCapturing, // Video is being captured.
81 kError // Error accessing HW functions. 81 kError // Error accessing HW functions.
82 // User needs to recover by destroying the object. 82 // User needs to recover by destroying the object.
83 }; 83 };
84 84
85 // Implements SinkFilterObserver. 85 // Implements SinkFilterObserver.
(...skipping 29 matching lines...) Expand all
115 // Map of all capabilities this device support. 115 // Map of all capabilities this device support.
116 CapabilityList capabilities_; 116 CapabilityList capabilities_;
117 VideoCaptureFormat capture_format_; 117 VideoCaptureFormat capture_format_;
118 118
119 DISALLOW_IMPLICIT_CONSTRUCTORS(VideoCaptureDeviceWin); 119 DISALLOW_IMPLICIT_CONSTRUCTORS(VideoCaptureDeviceWin);
120 }; 120 };
121 121
122 } // namespace media 122 } // namespace media
123 123
124 #endif // MEDIA_VIDEO_CAPTURE_WIN_VIDEO_CAPTURE_DEVICE_WIN_H_ 124 #endif // MEDIA_VIDEO_CAPTURE_WIN_VIDEO_CAPTURE_DEVICE_WIN_H_
OLDNEW
« no previous file with comments | « media/video/capture/win/video_capture_device_mf_win.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698