Chromium Code Reviews| Index: media/video/capture/linux/video_capture_device_linux.h |
| diff --git a/media/video/capture/linux/video_capture_device_linux.h b/media/video/capture/linux/video_capture_device_linux.h |
| index 94cbac24fdf69fb4fd7a63e92eff687c1bb056d5..8e71e57da7e408a3a85c5b93d15c1befd457e87f 100644 |
| --- a/media/video/capture/linux/video_capture_device_linux.h |
| +++ b/media/video/capture/linux/video_capture_device_linux.h |
| @@ -20,11 +20,14 @@ |
| namespace media { |
| +class V4L2VideoCaptureDelegate; |
| + |
| // Linux V4L2 implementation of VideoCaptureDevice. |
| class VideoCaptureDeviceLinux : public VideoCaptureDevice { |
| public: |
| static VideoPixelFormat V4l2FourCcToChromiumPixelFormat(uint32 v4l2_fourcc); |
| - static std::list<int> GetListOfUsableFourCCs(bool favour_mjpeg); |
| + static std::list<uint32_t> GetListOfUsableFourCCs(bool favour_mjpeg); |
| + static int TranslatePowerLineFrequencyToV4L2(int frequency); |
|
Pawel Osciak
2015/03/13 09:52:53
This can be private I think?
mcasas
2015/03/14 03:36:12
Done.
|
| explicit VideoCaptureDeviceLinux(const Name& device_name); |
| ~VideoCaptureDeviceLinux() override; |
| @@ -41,8 +44,7 @@ class VideoCaptureDeviceLinux : public VideoCaptureDevice { |
| // Internal delegate doing the actual capture setting, buffer allocation and |
| // circulacion with the V4L2 API. Created and deleted in the thread where |
| // VideoCaptureDeviceLinux lives but otherwise operating on |v4l2_thread_|. |
| - class V4L2CaptureDelegate; |
| - scoped_refptr<V4L2CaptureDelegate> capture_impl_; |
| + scoped_refptr<V4L2VideoCaptureDelegate> capture_impl_; |
| base::Thread v4l2_thread_; // Thread used for reading data from the device. |