Add support for multiple V4L2 video devices of the same type.

media/gpu/v4l2_device.h

 // Copyright 2014 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.
 //
 // This file defines the V4L2Device interface which is used by the
 // V4L2DecodeAccelerator class to delegate/pass the device specific
 // handling of any of the functionalities.
 
 #ifndef MEDIA_GPU_V4L2_DEVICE_H_
 #define MEDIA_GPU_V4L2_DEVICE_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <linux/videodev2.h>
 
 #include "base/files/scoped_file.h"
 #include "base/memory/ref_counted.h"
 #include "media/base/video_decoder_config.h"
 #include "media/base/video_frame.h"
 #include "media/gpu/media_gpu_export.h"
 #include "media/video/video_decode_accelerator.h"
+#include "media/video/video_encode_accelerator.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gl/gl_bindings.h"
 
 // TODO(posciak): remove this once V4L2 headers are updated.
 #define V4L2_PIX_FMT_VP9 v4l2_fourcc('V', 'P', '9', '0')
 #define V4L2_PIX_FMT_H264_SLICE v4l2_fourcc('S', '2', '6', '4')
 #define V4L2_PIX_FMT_VP8_FRAME v4l2_fourcc('V', 'P', '8', 'F')
 #define V4L2_PIX_FMT_MT21 v4l2_fourcc('M', 'T', '2', '1')
 
 namespace media {
 
 class MEDIA_GPU_EXPORT V4L2Device
     : public base::RefCountedThreadSafe<V4L2Device> {
  public:
   // Utility format conversion functions
   static VideoPixelFormat V4L2PixFmtToVideoPixelFormat(uint32_t format);
   static uint32_t VideoPixelFormatToV4L2PixFmt(VideoPixelFormat format);
   static uint32_t VideoCodecProfileToV4L2PixFmt(VideoCodecProfile profile,
                                                 bool slice_based);
+  std::vector<VideoCodecProfile> V4L2PixFmtToVideoCodecProfiles(
+      uint32_t pix_fmt,
+      bool is_encoder);
   static uint32_t V4L2PixFmtToDrmFormat(uint32_t format);
   // Convert format requirements requested by a V4L2 device to gfx::Size.
   static gfx::Size CodedSizeFromV4L2Format(struct v4l2_format format);
 
-  enum Type {
+  enum class Type {
     kDecoder,
     kEncoder,
     kImageProcessor,
     kJpegDecoder,
   };
 
-  // Creates and initializes an appropriate V4L2Device of |type| for the
-  // current platform and returns a scoped_refptr<V4L2Device> on success, or
-  // NULL.
-  static scoped_refptr<V4L2Device> Create(Type type);
+  // Create and initialize an appropriate V4L2Device instance for the current

[kcwu, 2016/10/07 11:19:05]

s/Create/Creates/, s/initialize/initializes/

[Pawel Osciak, 2016/10/11 06:13:46]

My personal preference when writing docs is usually the non-s version, I could
change if the whole class was in the s-style to match, but we already have a mix
of both in here, so if you don't feel strongly about this, I'd prefer this
version...

[kcwu, 2016/10/11 06:45:06]

It's style guide's suggestion. I don't feel strongly about this.

+  // platform, or return nullptr if not available.
+  static scoped_refptr<V4L2Device> Create();
+
+  // Open a V4L2 device of |type| for use with |v4l2_pixfmt|.
+  // Return true on success.

[kcwu, 2016/10/07 11:19:05]

Add comment the dtor will close automatically.
Otherwise it is confusing why there is no Close() paired with Open().

[Pawel Osciak, 2016/10/11 06:13:46]

Done.

+  virtual bool Open(Type type, uint32_t v4l2_pixfmt) = 0;
 
   // Parameters and return value are the same as for the standard ioctl() system
   // call.
   virtual int Ioctl(int request, void* arg) = 0;
 
   // This method sleeps until either:
   // - SetDevicePollInterrupt() is called (on another thread),
   // - |poll_device| is true, and there is new data to be read from the device,
   //   or an event from the device has arrived; in the latter case
   //   |*event_pending| will be set to true.
@@ skipping 11 matching lines @@
   virtual bool ClearDevicePollInterrupt() = 0;
 
   // Wrappers for standard mmap/munmap system calls.
   virtual void* Mmap(void* addr,
                      unsigned int len,
                      int prot,
                      int flags,
                      unsigned int offset) = 0;
   virtual void Munmap(void* addr, unsigned int len) = 0;
 
-  // Initializes the V4L2Device to operate as a device of |type|.
-  // Returns true on success.
-  virtual bool Initialize() = 0;
-
   // Return a vector of dmabuf file descriptors, exported for V4L2 buffer with
   // |index|, assuming the buffer contains |num_planes| V4L2 planes and is of
   // |type|. Return an empty vector on failure.
   // The caller is responsible for closing the file descriptors after use.
   virtual std::vector<base::ScopedFD> GetDmabufsForV4L2Buffer(
       int index,
       size_t num_planes,
       enum v4l2_buf_type type) = 0;
 
   // Return true if the given V4L2 pixfmt can be used in CreateEGLImage()
@@ skipping 16 matching lines @@
       uint32_t v4l2_pixfmt,
       const std::vector<base::ScopedFD>& dmabuf_fds) = 0;
 
   // Destroys the EGLImageKHR.
   virtual EGLBoolean DestroyEGLImage(EGLDisplay egl_display,
                                      EGLImageKHR egl_image) = 0;
 
   // Returns the supported texture target for the V4L2Device.
   virtual GLenum GetTextureTarget() = 0;
 
-  // Returns the preferred V4L2 input format or 0 if don't care.
-  virtual uint32_t PreferredInputFormat() = 0;
+  // Returns the preferred V4L2 input format for |type| or 0 if none.
+  virtual uint32_t PreferredInputFormat(Type type) = 0;
+
+  // NOTE: The below methods to query capabilities have a side effect of
+  // closing the previously-open device, if any, and should not be called after
+  // Open().
+  // TODO(posciak): fix this.
 
   // Get minimum and maximum resolution for fourcc |pixelformat| and store to
   // |min_resolution| and |max_resolution|.
   void GetSupportedResolution(uint32_t pixelformat,
                               gfx::Size* min_resolution,
                               gfx::Size* max_resolution);
 
+  // Return V4L2 pixelformats supported by the available image processor
+  // devices for |buf_type|.
+  virtual std::vector<uint32_t> GetSupportedImageProcessorPixelformats(
+      v4l2_buf_type buf_type) = 0;
+
   // Return supported profiles for decoder, including only profiles for given
   // fourcc |pixelformats|.
-  VideoDecodeAccelerator::SupportedProfiles GetSupportedDecodeProfiles(
+  virtual VideoDecodeAccelerator::SupportedProfiles GetSupportedDecodeProfiles(
+      const size_t num_formats,
+      const uint32_t pixelformats[]) = 0;
+
+  // Return supported profiles for encoder.
+  virtual VideoEncodeAccelerator::SupportedProfiles
+  GetSupportedEncodeProfiles() = 0;
+
+  // Return true if image processing is supported, false otherwise.
+  virtual bool IsImageProcessingSupported() = 0;
+
+  // Return true if JPEG decoding is supported, false otherwise.
+  virtual bool IsJpegDecodingSupported() = 0;
+
+ protected:
+  friend class base::RefCountedThreadSafe<V4L2Device>;
+  V4L2Device();
+  virtual ~V4L2Device();
+
+  virtual bool Initialize() = 0;

[kcwu, 2016/10/07 11:19:05]

Please keep its comments for children classes.

[Pawel Osciak, 2016/10/11 06:13:46]

Done.

+
+  VideoDecodeAccelerator::SupportedProfiles EnumerateSupportedDecodeProfiles(
       const size_t num_formats,
       const uint32_t pixelformats[]);
 
-  // Return true if the device supports |profile|, taking into account only
-  // fourccs from the given array of |pixelformats| of size |num_formats|.
-  bool SupportsDecodeProfileForV4L2PixelFormats(VideoCodecProfile profile,
-                                                const size_t num_formats,
-                                                const uint32_t pixelformats[]);
+  VideoEncodeAccelerator::SupportedProfiles EnumerateSupportedEncodeProfiles();
 
- protected:
-  friend class base::RefCountedThreadSafe<V4L2Device>;
-  explicit V4L2Device(Type type);
-  virtual ~V4L2Device();
-
-  const Type type_;
+  std::vector<uint32_t> EnumerateSupportedPixelformats(v4l2_buf_type buf_type);
 };
 
 }  //  namespace media
 
 #endif  // MEDIA_GPU_V4L2_DEVICE_H_