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

Side by Side Diff: media/video/capture/linux/video_capture_device_linux.h

Issue 804473007: Linux Video Capture: small cleanup (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: corrected indentations Created 6 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
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 // Linux specific implementation of VideoCaptureDevice. 5 // Linux specific implementation of VideoCaptureDevice.
6 // V4L2 is used for capturing. V4L2 does not provide its own thread for 6 // V4L2 is used for capturing. V4L2 does not provide its own thread for
7 // capturing so this implementation uses a Chromium thread for fetching frames 7 // capturing so this implementation uses a Chromium thread for fetching frames
8 // from V4L2. 8 // from V4L2.
9 9
10 #ifndef MEDIA_VIDEO_CAPTURE_LINUX_VIDEO_CAPTURE_DEVICE_LINUX_H_ 10 #ifndef MEDIA_VIDEO_CAPTURE_LINUX_VIDEO_CAPTURE_DEVICE_LINUX_H_
11 #define MEDIA_VIDEO_CAPTURE_LINUX_VIDEO_CAPTURE_DEVICE_LINUX_H_ 11 #define MEDIA_VIDEO_CAPTURE_LINUX_VIDEO_CAPTURE_DEVICE_LINUX_H_
12 12
13 #include <string> 13 #include <string>
14 14
15 #include "base/files/file_util.h" 15 #include "base/files/file_util.h"
16 #include "base/files/scoped_file.h" 16 #include "base/files/scoped_file.h"
17 #include "base/threading/thread.h" 17 #include "base/threading/thread.h"
18 #include "media/video/capture/video_capture_device.h" 18 #include "media/video/capture/video_capture_device.h"
19 #include "media/video/capture/video_capture_types.h" 19 #include "media/video/capture/video_capture_types.h"
20 20
21 namespace media { 21 namespace media {
22 22
23 class VideoCaptureDeviceLinux : public VideoCaptureDevice { 23 class VideoCaptureDeviceLinux : public VideoCaptureDevice {
24 public: 24 public:
25 static VideoPixelFormat V4l2ColorToVideoCaptureColorFormat(int32 v4l2_fourcc); 25 static VideoPixelFormat V4l2FourCcToChromiumPixelFormat(uint32 v4l2_fourcc);
26 static void GetListOfUsableFourCCs(bool favour_mjpeg, 26 static std::list<int> GetListOfUsableFourCCs(bool favour_mjpeg);
27 std::list<int>* fourccs);
28 27
29 explicit VideoCaptureDeviceLinux(const Name& device_name); 28 explicit VideoCaptureDeviceLinux(const Name& device_name);
30 ~VideoCaptureDeviceLinux() override; 29 ~VideoCaptureDeviceLinux() override;
31 30
32 // VideoCaptureDevice implementation. 31 // VideoCaptureDevice implementation.
33 void AllocateAndStart(const VideoCaptureParams& params, 32 void AllocateAndStart(const VideoCaptureParams& params,
34 scoped_ptr<Client> client) override; 33 scoped_ptr<Client> client) override;
35 34
36 void StopAndDeAllocate() override; 35 void StopAndDeAllocate() override;
37 36
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 // This is only used on |v4l2_thread_| when it is running, or the constructor 74 // This is only used on |v4l2_thread_| when it is running, or the constructor
76 // thread otherwise. 75 // thread otherwise.
77 int rotation_; 76 int rotation_;
78 77
79 DISALLOW_IMPLICIT_CONSTRUCTORS(VideoCaptureDeviceLinux); 78 DISALLOW_IMPLICIT_CONSTRUCTORS(VideoCaptureDeviceLinux);
80 }; 79 };
81 80
82 } // namespace media 81 } // namespace media
83 82
84 #endif // MEDIA_VIDEO_CAPTURE_LINUX_VIDEO_CAPTURE_DEVICE_LINUX_H_ 83 #endif // MEDIA_VIDEO_CAPTURE_LINUX_VIDEO_CAPTURE_DEVICE_LINUX_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698