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 79836a370fc8e5de230649698911ca1f9c41bbc2..6bcd9b3b5cb37de921d008b52269d1bb9696ec09 100644 |
--- a/media/video/capture/linux/video_capture_device_linux.h |
+++ b/media/video/capture/linux/video_capture_device_linux.h |
@@ -22,9 +22,9 @@ namespace media { |
class VideoCaptureDeviceLinux : public VideoCaptureDevice { |
public: |
- static VideoPixelFormat V4l2ColorToVideoCaptureColorFormat(int32 v4l2_fourcc); |
- static void GetListOfUsableFourCCs(bool favour_mjpeg, |
- std::list<int>* fourccs); |
+ static VideoPixelFormat V4l2FourCcToChromiumPixelFormat(uint32 v4l2_fourcc); |
+ static std::list<int> GetListOfUsableFourCCs(bool favour_mjpeg); |
+ static int Ioctl(const base::ScopedFD& device_fd, int request, void* arg); |
perkj_chrome
2014/12/16 10:34:43
please remove Ioctl from public interface.
mcasas
2014/12/16 18:08:17
Done.
(FTR, it was there to be called from VCDFac
|
explicit VideoCaptureDeviceLinux(const Name& device_name); |
~VideoCaptureDeviceLinux() override; |