Linux Video Capture: small cleanup

media/video/capture/linux/video_capture_device_linux.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Linux specific implementation of VideoCaptureDevice.
 // V4L2 is used for capturing. V4L2 does not provide its own thread for
 // capturing so this implementation uses a Chromium thread for fetching frames
 // from V4L2.
 
 #ifndef MEDIA_VIDEO_CAPTURE_LINUX_VIDEO_CAPTURE_DEVICE_LINUX_H_
 #define MEDIA_VIDEO_CAPTURE_LINUX_VIDEO_CAPTURE_DEVICE_LINUX_H_
 
 #include <string>
 
 #include "base/files/file_util.h"
 #include "base/files/scoped_file.h"
 #include "base/threading/thread.h"
 #include "media/video/capture/video_capture_device.h"
 #include "media/video/capture/video_capture_types.h"
 
 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 VCDFactoryLinux).

 
   explicit VideoCaptureDeviceLinux(const Name& device_name);
   ~VideoCaptureDeviceLinux() override;
 
   // VideoCaptureDevice implementation.
   void AllocateAndStart(const VideoCaptureParams& params,
                         scoped_ptr<Client> client) override;
 
   void StopAndDeAllocate() override;
 
@@ skipping 37 matching lines @@
   // This is only used on |v4l2_thread_| when it is running, or the constructor
   // thread otherwise.
   int rotation_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(VideoCaptureDeviceLinux);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_VIDEO_CAPTURE_LINUX_VIDEO_CAPTURE_DEVICE_LINUX_H_