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

Side by Side Diff: media/video/capture/mac/video_capture_device_mac.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
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 // MacOSX implementation of generic VideoCaptureDevice, using either QTKit or 5 // MacOSX implementation of generic VideoCaptureDevice, using either QTKit or
6 // AVFoundation as native capture API. QTKit is available in all OSX versions, 6 // AVFoundation as native capture API. QTKit is available in all OSX versions,
7 // although namely deprecated in 10.9, and AVFoundation is available in versions 7 // although namely deprecated in 10.9, and AVFoundation is available in versions
8 // 10.7 (Lion) and later. 8 // 10.7 (Lion) and later.
9 9
10 #ifndef MEDIA_VIDEO_CAPTURE_MAC_VIDEO_CAPTURE_DEVICE_MAC_H_ 10 #ifndef MEDIA_VIDEO_CAPTURE_MAC_VIDEO_CAPTURE_DEVICE_MAC_H_
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 // Called by VideoCaptureManager to open, close and start, stop Mac video 54 // Called by VideoCaptureManager to open, close and start, stop Mac video
55 // capture devices. 55 // capture devices.
56 class VideoCaptureDeviceMac : public VideoCaptureDevice { 56 class VideoCaptureDeviceMac : public VideoCaptureDevice {
57 public: 57 public:
58 explicit VideoCaptureDeviceMac(const Name& device_name); 58 explicit VideoCaptureDeviceMac(const Name& device_name);
59 virtual ~VideoCaptureDeviceMac(); 59 virtual ~VideoCaptureDeviceMac();
60 60
61 // VideoCaptureDevice implementation. 61 // VideoCaptureDevice implementation.
62 virtual void AllocateAndStart( 62 virtual void AllocateAndStart(
63 const VideoCaptureParams& params, 63 const VideoCaptureParams& params,
64 scoped_ptr<VideoCaptureDevice::Client> client) OVERRIDE; 64 scoped_ptr<VideoCaptureDevice::Client> client) override;
65 virtual void StopAndDeAllocate() OVERRIDE; 65 virtual void StopAndDeAllocate() override;
66 66
67 bool Init(VideoCaptureDevice::Name::CaptureApiType capture_api_type); 67 bool Init(VideoCaptureDevice::Name::CaptureApiType capture_api_type);
68 68
69 // Called to deliver captured video frames. 69 // Called to deliver captured video frames.
70 void ReceiveFrame(const uint8* video_frame, 70 void ReceiveFrame(const uint8* video_frame,
71 int video_frame_length, 71 int video_frame_length,
72 const VideoCaptureFormat& frame_format, 72 const VideoCaptureFormat& frame_format,
73 int aspect_numerator, 73 int aspect_numerator,
74 int aspect_denominator); 74 int aspect_denominator);
75 75
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 // VideoCaptureDeviceMac is destroyed. 112 // VideoCaptureDeviceMac is destroyed.
113 // NOTE: Weak pointers must be invalidated before all other member variables. 113 // NOTE: Weak pointers must be invalidated before all other member variables.
114 base::WeakPtrFactory<VideoCaptureDeviceMac> weak_factory_; 114 base::WeakPtrFactory<VideoCaptureDeviceMac> weak_factory_;
115 115
116 DISALLOW_COPY_AND_ASSIGN(VideoCaptureDeviceMac); 116 DISALLOW_COPY_AND_ASSIGN(VideoCaptureDeviceMac);
117 }; 117 };
118 118
119 } // namespace media 119 } // namespace media
120 120
121 #endif // MEDIA_VIDEO_CAPTURE_MAC_VIDEO_CAPTURE_DEVICE_MAC_H_ 121 #endif // MEDIA_VIDEO_CAPTURE_MAC_VIDEO_CAPTURE_DEVICE_MAC_H_
OLDNEW
« no previous file with comments | « media/video/capture/mac/video_capture_device_factory_mac.h ('k') | media/video/capture/video_capture_device_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698