Add stride for imported Dmabuf in ArcVideoAccelerator.

chrome/gpu/arc_gpu_video_decode_accelerator.cc

 // 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.
 
 #include "chrome/gpu/arc_gpu_video_decode_accelerator.h"
 
 #include "base/callback_helpers.h"
 #include "base/logging.h"
 #include "base/run_loop.h"
 #include "content/public/gpu/gpu_video_decode_accelerator_factory.h"
 #include "media/base/video_frame.h"
 
 namespace chromeos {
 namespace arc {
 
 ArcGpuVideoDecodeAccelerator::InputRecord::InputRecord(
     int32_t bitstream_buffer_id,
     uint32_t buffer_index,
     int64_t timestamp)
     : bitstream_buffer_id(bitstream_buffer_id),
       buffer_index(buffer_index),
       timestamp(timestamp) {}
 
-ArcGpuVideoDecodeAccelerator::InputBufferInfo::InputBufferInfo()
-    : offset(0), length(0) {}
+ArcGpuVideoDecodeAccelerator::InputBufferInfo::InputBufferInfo() = default;
 
 ArcGpuVideoDecodeAccelerator::InputBufferInfo::InputBufferInfo(
-    InputBufferInfo&& other)
-    : handle(std::move(other.handle)),
-      offset(other.offset),
-      length(other.length) {}
+    InputBufferInfo&& other) = default;
 
-ArcGpuVideoDecodeAccelerator::InputBufferInfo::~InputBufferInfo() {}
+ArcGpuVideoDecodeAccelerator::InputBufferInfo::~InputBufferInfo() = default;
+
+ArcGpuVideoDecodeAccelerator::OutputBufferInfo::OutputBufferInfo() = default;
+
+ArcGpuVideoDecodeAccelerator::OutputBufferInfo::OutputBufferInfo(
+    OutputBufferInfo&& other) = default;
+
+ArcGpuVideoDecodeAccelerator::OutputBufferInfo::~OutputBufferInfo() = default;
 
 ArcGpuVideoDecodeAccelerator::ArcGpuVideoDecodeAccelerator()
     : pending_eos_output_buffer_(false),
       arc_client_(nullptr),
       next_bitstream_buffer_id_(0),
+      output_pixel_format_(media::PIXEL_FORMAT_UNKNOWN),
       output_buffer_size_(0) {}
 
 ArcGpuVideoDecodeAccelerator::~ArcGpuVideoDecodeAccelerator() {}
 
 namespace {
 
 // An arbitrary chosen limit of the number of buffers. The number of
 // buffers used is requested from the untrusted client side.
 const size_t kMaxBufferCount = 128;
 
@@ skipping 98 matching lines @@
   if (!ValidatePortAndIndex(port, index)) {
     arc_client_->OnError(INVALID_ARGUMENT);
     return;
   }
   InputBufferInfo* input_info = &input_buffer_info_[index];
   input_info->handle = std::move(ashmem_fd);
   input_info->offset = offset;
   input_info->length = length;
 }
 
+bool ArcGpuVideoDecodeAccelerator::VerifyStride(const base::ScopedFD& dmabuf_fd,
+                                                int32_t stride) {
+  off_t size = lseek(dmabuf_fd.get(), 0, SEEK_END);
+  lseek(dmabuf_fd.get(), 0, SEEK_SET);
+
+  if (size < 0) {
+    DLOG(ERROR) << "fail to find the size of dmabuf" << errno;
+    return false;
+  }
+
+  int height = coded_size_.height();
+  switch (output_pixel_format_) {
+    case media::PIXEL_FORMAT_I420:
+    case media::PIXEL_FORMAT_YV12:
+    case media::PIXEL_FORMAT_NV12:
+    case media::PIXEL_FORMAT_NV21:
+      // Adjusts the height for UV plane.
+      height = height * 3 / 2;

[dcheng, 2016/05/17 01:12:28]

What happens if height isn't even divisible by two after this?

[Owen Lin, 2016/05/17 08:52:16]

The coded height should be always even for YUV frame. I added a DCHECK for it.

+      break;
+    case media::PIXEL_FORMAT_ARGB:
+      // No need to adjust height.
+      break;
+    default:
+      DLOG(ERROR) << "Format not supported: " << output_pixel_format_;
+      return false;
+  }
+
+  if (stride < 0 || height * stride > size) {

[dcheng, 2016/05/17 01:12:27]

height * stride should use CheckedNumeric:
https://code.google.com/p/chromium/codesearch#chromium/src/base/numerics/safe...

[Owen Lin, 2016/05/17 08:52:16]

Thanks. 

+    DLOG(ERROR) << "invalid stride: " << stride << ", height: " << height
+                << ", size of dmabuf: " << size;
+    return false;
+  }
+
+  return true;
+}
+
 void ArcGpuVideoDecodeAccelerator::BindDmabuf(PortType port,
                                               uint32_t index,
-                                              base::ScopedFD dmabuf_fd) {
+                                              base::ScopedFD dmabuf_fd,
+                                              int32_t stride) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   if (!vda_) {
     DLOG(ERROR) << "VDA not initialized";
     return;
   }
 
   if (port != PORT_OUTPUT) {
     DLOG(ERROR) << "Dmabuf is only supported for input";
     arc_client_->OnError(INVALID_ARGUMENT);
     return;
   }
   if (!ValidatePortAndIndex(port, index)) {
     arc_client_->OnError(INVALID_ARGUMENT);
     return;
   }
-  buffers_pending_import_[index] = std::move(dmabuf_fd);
+  if (!VerifyStride(dmabuf_fd, stride)) {
+    arc_client_->OnError(INVALID_ARGUMENT);
+    return;
+  }
+
+  OutputBufferInfo& info = buffers_pending_import_[index];
+  info.handle = std::move(dmabuf_fd);
+  info.stride = stride;
 }
 
 void ArcGpuVideoDecodeAccelerator::UseBuffer(PortType port,
                                              uint32_t index,
                                              const BufferMetadata& metadata) {
   DVLOG(5) << "UseBuffer(port=" << port << ", index=" << index
            << ", metadata=(bytes_used=" << metadata.bytes_used
            << ", timestamp=" << metadata.timestamp << ")";
   DCHECK(thread_checker_.CalledOnValidThread());
   if (!vda_) {
@@ skipping 47 matching lines @@
 void ArcGpuVideoDecodeAccelerator::ProvidePictureBuffers(
     uint32_t requested_num_of_buffers,
     uint32_t textures_per_buffer,
     const gfx::Size& dimensions,
     uint32_t texture_target) {
   DVLOG(5) << "ProvidePictureBuffers("
            << "requested_num_of_buffers=" << requested_num_of_buffers
            << ", dimensions=" << dimensions.ToString() << ")";
   DCHECK(thread_checker_.CalledOnValidThread());
   coded_size_ = dimensions;
+  output_pixel_format_ = vda_->GetOutputFormat();
 
   VideoFormat video_format;
-  media::VideoPixelFormat output_format = vda_->GetOutputFormat();
-  switch (output_format) {
+  switch (output_pixel_format_) {
     case media::PIXEL_FORMAT_I420:
     case media::PIXEL_FORMAT_YV12:
     case media::PIXEL_FORMAT_NV12:
     case media::PIXEL_FORMAT_NV21:
       // HAL_PIXEL_FORMAT_YCbCr_420_888 is the flexible pixel format in Android
       // which handles all 420 formats, with both orderings of chroma (CbCr and
       // CrCb) as well as planar and semi-planar layouts.
       video_format.pixel_format = HAL_PIXEL_FORMAT_YCbCr_420_888;
       break;
     default:
-      DLOG(ERROR) << "Format not supported: " << output_format;
+      DLOG(ERROR) << "Format not supported: " << output_pixel_format_;
       arc_client_->OnError(PLATFORM_FAILURE);
       return;
   }
   video_format.buffer_size =
-      media::VideoFrame::AllocationSize(output_format, coded_size_);
+      media::VideoFrame::AllocationSize(output_pixel_format_, coded_size_);
   output_buffer_size_ = video_format.buffer_size;
   video_format.min_num_buffers = requested_num_of_buffers;
   video_format.coded_width = dimensions.width();
   video_format.coded_height = dimensions.height();
   // TODO(owenlin): How to get visible size?
   video_format.crop_top = 0;
   video_format.crop_left = 0;
   video_format.crop_width = dimensions.width();
   video_format.crop_height = dimensions.height();
   arc_client_->OnOutputFormatChanged(video_format);
@@ skipping 80 matching lines @@
 }
 
 void ArcGpuVideoDecodeAccelerator::SendEosIfNeededOrReusePicture(
     uint32_t index) {
   if (pending_eos_output_buffer_) {
     BufferMetadata metadata;
     metadata.flags = BUFFER_FLAG_EOS;
     arc_client_->OnBufferDone(PORT_OUTPUT, index, metadata);
     pending_eos_output_buffer_ = false;
   } else {
-    if (buffers_pending_import_[index].is_valid()) {
-      std::vector<gfx::GpuMemoryBufferHandle> buffers;
-      buffers.push_back(gfx::GpuMemoryBufferHandle());
+    OutputBufferInfo& info = buffers_pending_import_[index];
+    if (info.handle.is_valid()) {
+      gfx::GpuMemoryBufferHandle handle;
 #if defined(USE_OZONE)
-      buffers.back().native_pixmap_handle.fd =
-          base::FileDescriptor(buffers_pending_import_[index].release(), true);
+      handle.native_pixmap_handle.fd =
+          base::FileDescriptor(info.handle.release(), true);
+      handle.native_pixmap_handle.stride = info.stride;
 #endif
-      vda_->ImportBufferForPicture(index, buffers);
+      vda_->ImportBufferForPicture(index, {handle});
     } else {
       vda_->ReusePictureBuffer(index);
     }
   }
 }
 
 void ArcGpuVideoDecodeAccelerator::CreateInputRecord(
     int32_t bitstream_buffer_id,
     uint32_t buffer_index,
     int64_t timestamp) {
@@ skipping 35 matching lines @@
       }
       return true;
     default:
       DLOG(ERROR) << "Invalid port: " << port;
       return false;
   }
 }
 
 }  // namespace arc
 }  // namespace chromeos