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

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

Issue 2169013002: Change class VideoCaptureDevice::Name to struct VideoCaptureDeviceDescriptor (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix build errors Created 4 years, 4 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 // 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_CAPTURE_VIDEO_LINUX_VIDEO_CAPTURE_DEVICE_LINUX_H_ 10 #ifndef MEDIA_CAPTURE_VIDEO_LINUX_VIDEO_CAPTURE_DEVICE_LINUX_H_
(...skipping 13 matching lines...) Expand all
24 namespace media { 24 namespace media {
25 25
26 class V4L2CaptureDelegate; 26 class V4L2CaptureDelegate;
27 27
28 // Linux V4L2 implementation of VideoCaptureDevice. 28 // Linux V4L2 implementation of VideoCaptureDevice.
29 class VideoCaptureDeviceLinux : public VideoCaptureDevice { 29 class VideoCaptureDeviceLinux : public VideoCaptureDevice {
30 public: 30 public:
31 static VideoPixelFormat V4l2FourCcToChromiumPixelFormat(uint32_t v4l2_fourcc); 31 static VideoPixelFormat V4l2FourCcToChromiumPixelFormat(uint32_t v4l2_fourcc);
32 static std::list<uint32_t> GetListOfUsableFourCCs(bool favour_mjpeg); 32 static std::list<uint32_t> GetListOfUsableFourCCs(bool favour_mjpeg);
33 33
34 explicit VideoCaptureDeviceLinux(const Name& device_name); 34 explicit VideoCaptureDeviceLinux(
35 const VideoCaptureDeviceDescriptor& device_descriptor);
35 ~VideoCaptureDeviceLinux() override; 36 ~VideoCaptureDeviceLinux() override;
36 37
37 // VideoCaptureDevice implementation. 38 // VideoCaptureDevice implementation.
38 void AllocateAndStart(const VideoCaptureParams& params, 39 void AllocateAndStart(const VideoCaptureParams& params,
39 std::unique_ptr<Client> client) override; 40 std::unique_ptr<Client> client) override;
40 void StopAndDeAllocate() override; 41 void StopAndDeAllocate() override;
41 42
42 protected: 43 protected:
43 void SetRotation(int rotation); 44 void SetRotation(int rotation);
44 45
45 private: 46 private:
46 static int TranslatePowerLineFrequencyToV4L2(PowerLineFrequency frequency); 47 static int TranslatePowerLineFrequencyToV4L2(PowerLineFrequency frequency);
47 48
48 // Internal delegate doing the actual capture setting, buffer allocation and 49 // Internal delegate doing the actual capture setting, buffer allocation and
49 // circulation with the V4L2 API. Created and deleted in the thread where 50 // circulation with the V4L2 API. Created and deleted in the thread where
50 // VideoCaptureDeviceLinux lives but otherwise operating on |v4l2_thread_|. 51 // VideoCaptureDeviceLinux lives but otherwise operating on |v4l2_thread_|.
51 scoped_refptr<V4L2CaptureDelegate> capture_impl_; 52 scoped_refptr<V4L2CaptureDelegate> capture_impl_;
52 53
53 base::Thread v4l2_thread_; // Thread used for reading data from the device. 54 base::Thread v4l2_thread_; // Thread used for reading data from the device.
54 55
55 const Name device_name_; 56 const VideoCaptureDeviceDescriptor device_descriptor_;
56 57
57 DISALLOW_IMPLICIT_CONSTRUCTORS(VideoCaptureDeviceLinux); 58 DISALLOW_IMPLICIT_CONSTRUCTORS(VideoCaptureDeviceLinux);
58 }; 59 };
59 60
60 } // namespace media 61 } // namespace media
61 62
62 #endif // MEDIA_CAPTURE_VIDEO_LINUX_VIDEO_CAPTURE_DEVICE_LINUX_H_ 63 #endif // MEDIA_CAPTURE_VIDEO_LINUX_VIDEO_CAPTURE_DEVICE_LINUX_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698