VideoCaptureDeviceLinux: Add support for SPLANE+DMABUF V4L2 type capture

media/video/capture/linux/v4l2_capture_delegate_single_plane.h

Index: media/video/capture/linux/v4l2_capture_delegate_single_plane.h
diff --git a/media/video/capture/linux/v4l2_capture_delegate_single_plane.h b/media/video/capture/linux/v4l2_capture_delegate_single_plane.h
index 8d4dc91f5206a2e8bb0a23c5b106768ca7e86bd4..073e39fc06df99c5f870a2e96682a7e97c27cb40 100644
--- a/media/video/capture/linux/v4l2_capture_delegate_single_plane.h
+++ b/media/video/capture/linux/v4l2_capture_delegate_single_plane.h
@@ -16,27 +16,25 @@ class SingleThreadTaskRunner;
 namespace media {
 
 // V4L2 specifics for SPLANE API.
-class V4L2CaptureDelegateSinglePlane final : public V4L2CaptureDelegate {
+class V4L2CaptureDelegateSinglePlane : public V4L2CaptureDelegate {
  public:
   V4L2CaptureDelegateSinglePlane(
       const VideoCaptureDevice::Name& device_name,
       const scoped_refptr<base::SingleThreadTaskRunner>& v4l2_task_runner,
-      int power_line_frequency)
-      : V4L2CaptureDelegate(device_name,
-                            v4l2_task_runner,
-                            power_line_frequency) {}
+      int power_line_frequency,
+      bool try_to_use_dma_buf);

[Pawel Osciak, 2015/06/15 10:34:55]

This is not really "try", but "use dmabuf or fail" I believe?

[mcasas, 2015/06/17 01:30:53]

Is a "try" and if you can't, is fine.
Changed to |allow_using_dma_bufs|, please
instruct if not clear enough.

 
- private:
+ protected:
   // BufferTracker derivation to implement construction semantics for SPLANE.
-  class BufferTrackerSPlane final : public BufferTracker {
+  class BufferTrackerSPlane : public BufferTracker {
    public:
     bool Init(int fd, const v4l2_buffer& buffer) override;
 
-   private:
+   protected:
     ~BufferTrackerSPlane() override {}
   };
 
-  ~V4L2CaptureDelegateSinglePlane() override {}
+  ~V4L2CaptureDelegateSinglePlane() override;
 
   // V4L2CaptureDelegate virtual methods implementation.
   scoped_refptr<BufferTracker> CreateBufferTracker() const override;
@@ -44,11 +42,20 @@ class V4L2CaptureDelegateSinglePlane final : public V4L2CaptureDelegate {
                       uint32_t width,
                       uint32_t height,
                       uint32_t pixelformat_fourcc) const override;
-  void FinishFillingV4L2Buffer(v4l2_buffer* buffer) const override;
   void SetPayloadSize(const scoped_refptr<BufferTracker>& buffer_tracker,
                       const v4l2_buffer& buffer) const override;
+  void FinishFillingV4L2Buffer(v4l2_buffer* buffer,
+                               bool for_enqueue) const override;
+  void FinishFillingV4L2RequestBuffers(
+      v4l2_requestbuffers* request) const override;
   void SendBuffer(const scoped_refptr<BufferTracker>& buffer_tracker,
                   const v4l2_format& format) const override;
+
+ private:
+  // Memory Type configured on ctor, mappable or not.
+  v4l2_memory memory_type_;

[Pawel Osciak, 2015/06/15 10:34:55]

This should be a member of V4l2CaptureDelegate. We always have a memory type,
for both single and multi plane. Using dmabuf should also be a property of
V4l2CaptureDelegate and not an argument to constructor of this class.

[mcasas, 2015/06/17 01:30:53]

Done.

+
+  mutable ScopedVector<VideoCaptureDevice::Client::Buffer> allocated_buffers_;
 };
 
 }  // namespace media