Add stride for imported Dmabuf in ArcVideoAccelerator.

chrome/gpu/arc_gpu_video_decode_accelerator.h

 // Copyright 2016 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.
 
 #ifndef CHROME_GPU_ARC_GPU_VIDEO_DECODE_ACCELERATOR_H_
 #define CHROME_GPU_ARC_GPU_VIDEO_DECODE_ACCELERATOR_H_
 
 #include <list>
 #include <memory>
 #include <queue>
@@ skipping 24 matching lines @@
   bool Initialize(const Config& config,
                   ArcVideoAccelerator::Client* client) override;
   void SetNumberOfOutputBuffers(size_t number) override;
   void BindSharedMemory(PortType port,
                         uint32_t index,
                         base::ScopedFD ashmem_fd,
                         off_t offset,
                         size_t length) override;
   void BindDmabuf(PortType port,
                   uint32_t index,
-                  base::ScopedFD dmabuf_fd) override;
+                  base::ScopedFD dmabuf_fd,
+                  int32_t stride) override;
   void UseBuffer(PortType port,
                  uint32_t index,
                  const BufferMetadata& metadata) override;
   void Reset() override;
 
   // Implementation of the VideoDecodeAccelerator::Client interface.
   void ProvidePictureBuffers(uint32_t requested_num_of_buffers,
                              uint32_t textures_per_buffer,
                              const gfx::Size& dimensions,
                              uint32_t texture_target) override;
@@ skipping 15 matching lines @@
     InputRecord(int32_t bitstream_buffer_id,
                 uint32_t buffer_index,
                 int64_t timestamp);
   };
 
   // The information about the shared memory used as an input buffer.
   struct InputBufferInfo {
     // The file handle to access the buffer. It is owned by this class and
     // should be closed after use.
     base::ScopedFD handle;
-    off_t offset;
-    size_t length;
+
+    // The offset of the payload to the beginning of the shared memory.
+    off_t offset = 0;
+
+    // The size of the payload in bytes.
+    size_t length = 0;
 
     InputBufferInfo();
     InputBufferInfo(InputBufferInfo&& other);
     ~InputBufferInfo();
   };
 
+  // The information about the dmabuf used as an output buffer.
+  struct OutputBufferInfo {
+    base::ScopedFD handle;
+    int32_t stride = 0;  // In bytes.
+
+    OutputBufferInfo();
+    OutputBufferInfo(OutputBufferInfo&& other);
+    ~OutputBufferInfo();
+  };
+
   // Helper function to Send the end-of-stream output buffer if
   // |pending_eos_output_buffer_| is true, or reuse the picture in ArcVDA.
   void SendEosIfNeededOrReusePicture(uint32_t index);
 
   // Helper function to validate |port| and |index|.
   bool ValidatePortAndIndex(PortType port, uint32_t index);
 
+  // Helper function to verify the length of stride is legal.
+  bool VerifyStride(const base::ScopedFD& fd, int32_t stride);
+
   // Creates an InputRecord for the given |bitstream_buffer_id|. The
   // |buffer_index| is the index of the associated input buffer. The |timestamp|
   // is the time the video frame should be displayed.
   void CreateInputRecord(int32_t bitstream_buffer_id,
                          uint32_t buffer_index,
                          int64_t timestamp);
 
   // Finds the InputRecord which matches to given |bitstream_buffer_id|.
   // Returns |nullptr| if it cannot be found.
   InputRecord* FindInputRecord(int32_t bitstream_buffer_id);
 
   // When true, an EOS output buffer need to be sent to |arc_client_| once an
   // output buffer is available.
   bool pending_eos_output_buffer_;
 
   std::unique_ptr<media::VideoDecodeAccelerator> vda_;
 
   // It's safe to use the pointer here, the life cycle of the |arc_client_|
   // is longer than this ArcGpuVideoDecodeAccelerator.
   ArcVideoAccelerator::Client* arc_client_;
 
   // The next ID for the bitstream buffer, started from 0.
   int32_t next_bitstream_buffer_id_;
 
   gfx::Size coded_size_;
+  media::VideoPixelFormat output_pixel_format_;
 
   // The |picture_buffer_id|s for Pictures that were returned to us from VDA
   // via PictureReady() while flushing. We keep them until NotifyFlushDone();
   // once it's called, we send one of the pending buffers from this queue (if
   // not empty), marked with an EOS flag, to |arc_client_|, and return the rest
   // to VDA for reuse.
   std::queue<int32_t> buffers_pending_eos_;
 
   // A list of most recent |kMaxNumberOfInputRecord| InputRecords.
   // |kMaxNumberOfInputRecord| is defined in the cc file.
   std::list<InputRecord> input_records_;
 
   // The details of the shared memory of each input buffers.
   std::vector<InputBufferInfo> input_buffer_info_;
 
-  // To keep those output buffers which have been bound by bindDmabuf() but not
-  // be used yet. Will call VDA::ImportBufferForPicture() when those buffers are
-  // used for the first time.
-  std::vector<base::ScopedFD> buffers_pending_import_;
+  // To keep those output buffers which have been bound by bindDmabuf() but
+  // haven't been passed to VDA yet. Will call VDA::ImportBufferForPicture()
+  // when those buffers are used for the first time.
+  std::vector<OutputBufferInfo> buffers_pending_import_;
 
   base::ThreadChecker thread_checker_;
   size_t output_buffer_size_;
 
   gpu::GpuPreferences gpu_preferences_;
 
   DISALLOW_COPY_AND_ASSIGN(ArcGpuVideoDecodeAccelerator);
 };
 
 }  // namespace arc
 }  // namespace chromeos
 
 #endif  // CHROME_GPU_ARC_GPU_VIDEO_DECODE_ACCELERATOR_H_