GpuArcVideoService

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 "base/callback_helpers.h"
 #include "base/logging.h"
 #include "base/run_loop.h"
 #include "chrome/gpu/arc_gpu_video_decode_accelerator.h"
 #include "content/public/gpu/gpu_video_decode_accelerator_factory.h"
 #include "media/base/video_frame.h"
 
 #undef DVLOG
 #define DVLOG VLOG
 
 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::ArcGpuVideoDecodeAccelerator(
-    const gpu::GpuPreferences& gpu_preferences)
+ArcGpuVideoDecodeAccelerator::ArcGpuVideoDecodeAccelerator()
     : pending_eos_output_buffer_(false),
       arc_client_(nullptr),
       next_bitstream_buffer_id_(0),
-      output_buffer_size_(0),
-      gpu_preferences_(gpu_preferences) {}
+      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;
 
 }  // anonymous namespace
@@ skipping 68 matching lines @@
         media::PictureBuffer(base::checked_cast<int32_t>(id), coded_size_, 0));
   }
   vda_->AssignPictureBuffers(buffers);
 
   buffers_pending_import_.clear();
   buffers_pending_import_.resize(number);
 }
 
 void ArcGpuVideoDecodeAccelerator::BindSharedMemory(PortType port,
                                                     uint32_t index,
-                                                    int ashmem_fd,
+                                                    base::ScopedFD ashmem_fd,
                                                     off_t offset,
                                                     size_t length) {
   DVLOG(5) << "ArcGVDA::BindSharedMemory, offset: " << offset
            << ", length: " << length;
   DCHECK(thread_checker_.CalledOnValidThread());
   if (!vda_) {
     DLOG(ERROR) << "VDA not initialized";
     return;
   }
 
-  // Make sure we will close the file descriptor.
-  base::ScopedFD handle(ashmem_fd);
   if (port != PORT_INPUT) {
     DLOG(ERROR) << "SharedBuffer is only supported for input";
     arc_client_->OnError(INVALID_ARGUMENT);
     return;
   }
   if (!ValidatePortAndIndex(port, index)) {
     arc_client_->OnError(INVALID_ARGUMENT);
     return;
   }
   InputBufferInfo* input_info = &input_buffer_info_[index];
-  input_info->handle = std::move(handle);
+  input_info->handle = std::move(ashmem_fd);
   input_info->offset = offset;
   input_info->length = length;
 }
 
 void ArcGpuVideoDecodeAccelerator::BindDmabuf(PortType port,
                                               uint32_t index,
-                                              int dmabuf_fd) {
+                                              base::ScopedFD dmabuf_fd) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   if (!vda_) {
     DLOG(ERROR) << "VDA not initialized";
     return;
   }
 
-  // Make sure we will close the file descriptor.
-  base::ScopedFD handle(dmabuf_fd);
   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(handle);
+  buffers_pending_import_[index] = std::move(dmabuf_fd);
 }
 
 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 224 matching lines @@
       }
       return true;
     default:
       DLOG(ERROR) << "Invalid port: " << port;
       return false;
   }
 }
 
 }  // namespace arc
 }  // namespace chromeos