| Index: media/capture/video/linux/video_capture_device_linux.h
|
| diff --git a/media/capture/video/linux/video_capture_device_linux.h b/media/capture/video/linux/video_capture_device_linux.h
|
| index e8adbde8df41715bdd075c0c921c3f6446eb4383..4004ef3790f7dfc4f85525b8d68f9412b44aa3e7 100644
|
| --- a/media/capture/video/linux/video_capture_device_linux.h
|
| +++ b/media/capture/video/linux/video_capture_device_linux.h
|
| @@ -16,8 +16,10 @@
|
|
|
| #include "base/files/file_util.h"
|
| #include "base/files/scoped_file.h"
|
| +#include "base/lazy_instance.h"
|
| #include "base/macros.h"
|
| #include "base/threading/thread.h"
|
| +#include "media/capture/video/linux/camera_characteristics.h"
|
| #include "media/capture/video/video_capture_device.h"
|
| #include "media/capture/video_capture_types.h"
|
|
|
| @@ -45,19 +47,18 @@ class VideoCaptureDeviceLinux : public VideoCaptureDevice {
|
| SetPhotoOptionsCallback callback) override;
|
|
|
| protected:
|
| - void SetRotation(int rotation);
|
| + virtual void SetRotation(int rotation);
|
|
|
| - private:
|
| - static int TranslatePowerLineFrequencyToV4L2(PowerLineFrequency frequency);
|
| + base::Thread v4l2_thread_; // Thread used for reading data from the device.
|
| + const VideoCaptureDeviceDescriptor device_descriptor_;
|
|
|
| // Internal delegate doing the actual capture setting, buffer allocation and
|
| // circulation with the V4L2 API. Created and deleted in the thread where
|
| // VideoCaptureDeviceLinux lives but otherwise operating on |v4l2_thread_|.
|
| scoped_refptr<V4L2CaptureDelegate> capture_impl_;
|
|
|
| - base::Thread v4l2_thread_; // Thread used for reading data from the device.
|
| -
|
| - const VideoCaptureDeviceDescriptor device_descriptor_;
|
| + private:
|
| + static int TranslatePowerLineFrequencyToV4L2(PowerLineFrequency frequency);
|
|
|
| DISALLOW_IMPLICIT_CONSTRUCTORS(VideoCaptureDeviceLinux);
|
| };
|
|
|