VDA: Restructure EVDA

content/common/gpu/media/exynos_video_decode_accelerator.cc

 // Copyright (c) 2012 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 <dlfcn.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <libdrm/drm_fourcc.h>
 #include <linux/videodev2.h>
 #include <poll.h>
@@ skipping 15 matching lines @@
 
 #define NOTIFY_ERROR(x)                                               \
   do {                                                                \
     SetDecoderState(kError);                                          \
     DLOG(ERROR) << "calling NotifyError(): " << x;                    \
     NotifyError(x);                                                   \
   } while (0)
 
 #define IOCTL_OR_ERROR_RETURN(fd, type, arg)                          \
   do {                                                                \
-    if (HANDLE_EINTR(ioctl(fd, type, arg) != 0)) {                    \
+    if (HANDLE_EINTR(device->dev_ioctl(fd, type, arg) != 0)) {        \

[Pawel Osciak, 2013/12/24 03:45:24]

Please ensure device isn't NULL.

       DPLOG(ERROR) << __func__ << "(): ioctl() failed: " << #type;    \
       NOTIFY_ERROR(PLATFORM_FAILURE);                                 \
       return;                                                         \
     }                                                                 \
   } while (0)
 
 #define IOCTL_OR_ERROR_RETURN_FALSE(fd, type, arg)                    \
   do {                                                                \
-    if (HANDLE_EINTR(ioctl(fd, type, arg) != 0)) {                    \
+    if (HANDLE_EINTR(device->dev_ioctl(fd, type, arg) != 0)) {        \
       DPLOG(ERROR) << __func__ << "(): ioctl() failed: " << #type;    \
       NOTIFY_ERROR(PLATFORM_FAILURE);                                 \
       return false;                                                   \
     }                                                                 \
   } while (0)
 
 namespace {
 
 // TODO(posciak): remove once we update linux-headers.
 #ifndef V4L2_EVENT_RESOLUTION_CHANGE
 #define V4L2_EVENT_RESOLUTION_CHANGE 5
 #endif
 
 const char kExynosMfcDevice[] = "/dev/mfc-dec";

[Pawel Osciak, 2013/12/24 03:45:24]

This should be a property of the ExynosV4L2Device class.

 
 }  // anonymous namespace
 
-struct ExynosVideoDecodeAccelerator::BitstreamBufferRef {
+int V4L2VideoDecodeAccelerator :: ExynosV4L2Device :: dev_open (const char *fd,

[Pawel Osciak, 2013/12/24 03:45:24]

Extract to separate file. Also style (spacing, indent etc.).

+                                                              int flags) {
+  return HANDLE_EINTR(open(fd,flags));
+}
+
+int V4L2VideoDecodeAccelerator :: ExynosV4L2Device :: dev_ioctl (int fd,
+                                                   int flags, void *arg) {
+  return ioctl(fd, flags, arg);

[Pawel Osciak, 2013/12/24 03:45:24]

HANDLE_EINTR?

+}
+
+int V4L2VideoDecodeAccelerator :: ExynosV4L2Device :: dev_close (int fd) {
+  return close(fd);
+}
+
+int V4L2VideoDecodeAccelerator :: ExynosV4L2Device :: dev_poll (
+                                 struct pollfd *fds, nfds_t nfds, int n) {
+  return poll(fds, nfds, n);

[Pawel Osciak, 2013/12/24 03:45:24]

HANDLE_EINTR?

+}
+
+void* V4L2VideoDecodeAccelerator :: ExynosV4L2Device :: dev_mmap (void *addr,
+    unsigned int len, int prot, int flags, int fd, unsigned int offset) {
+  return mmap(addr, len, prot, flags, fd, offset);
+}
+
+void V4L2VideoDecodeAccelerator :: ExynosV4L2Device :: dev_munmap (void *addr,
+    unsigned int len) {
+  munmap(addr,len);
+}
+
+struct V4L2VideoDecodeAccelerator::BitstreamBufferRef {
   BitstreamBufferRef(
       base::WeakPtr<Client>& client,
       scoped_refptr<base::MessageLoopProxy>& client_message_loop_proxy,
       base::SharedMemory* shm,
       size_t size,
       int32 input_id);
   ~BitstreamBufferRef();
   const base::WeakPtr<Client> client;
   const scoped_refptr<base::MessageLoopProxy> client_message_loop_proxy;
   const scoped_ptr<base::SharedMemory> shm;
   const size_t size;
   off_t bytes_used;
   const int32 input_id;
 };
 
-struct ExynosVideoDecodeAccelerator::PictureBufferArrayRef {
+struct V4L2VideoDecodeAccelerator::PictureBufferArrayRef {
   PictureBufferArrayRef(EGLDisplay egl_display);
   ~PictureBufferArrayRef();
 
   struct PictureBufferRef {
     PictureBufferRef(EGLImageKHR egl_image, int32 picture_id)
         : egl_image(egl_image), picture_id(picture_id) {}
     EGLImageKHR egl_image;
     int32 picture_id;
   };
 
   EGLDisplay const egl_display;
   std::vector<PictureBufferRef> picture_buffers;
 };
 
-struct ExynosVideoDecodeAccelerator::EGLSyncKHRRef {
+struct V4L2VideoDecodeAccelerator::EGLSyncKHRRef {
   EGLSyncKHRRef(EGLDisplay egl_display, EGLSyncKHR egl_sync);
   ~EGLSyncKHRRef();
   EGLDisplay const egl_display;
   EGLSyncKHR egl_sync;
 };
 
-struct ExynosVideoDecodeAccelerator::PictureRecord {
+struct V4L2VideoDecodeAccelerator::PictureRecord {
   PictureRecord(bool cleared, const media::Picture& picture);
   ~PictureRecord();
   bool cleared;  // Whether the texture is cleared and safe to render from.
   media::Picture picture;  // The decoded picture.
 };
 
-ExynosVideoDecodeAccelerator::BitstreamBufferRef::BitstreamBufferRef(
+V4L2VideoDecodeAccelerator::BitstreamBufferRef::BitstreamBufferRef(
     base::WeakPtr<Client>& client,
     scoped_refptr<base::MessageLoopProxy>& client_message_loop_proxy,
     base::SharedMemory* shm, size_t size, int32 input_id)
     : client(client),
       client_message_loop_proxy(client_message_loop_proxy),
       shm(shm),
       size(size),
       bytes_used(0),
       input_id(input_id) {
 }
 
-ExynosVideoDecodeAccelerator::BitstreamBufferRef::~BitstreamBufferRef() {
+V4L2VideoDecodeAccelerator::BitstreamBufferRef::~BitstreamBufferRef() {
   if (input_id >= 0) {
     client_message_loop_proxy->PostTask(FROM_HERE, base::Bind(
         &Client::NotifyEndOfBitstreamBuffer, client, input_id));
   }
 }
 
-ExynosVideoDecodeAccelerator::PictureBufferArrayRef::PictureBufferArrayRef(
+V4L2VideoDecodeAccelerator::PictureBufferArrayRef::PictureBufferArrayRef(
     EGLDisplay egl_display)
     : egl_display(egl_display) {}
 
-ExynosVideoDecodeAccelerator::PictureBufferArrayRef::~PictureBufferArrayRef() {
+V4L2VideoDecodeAccelerator::PictureBufferArrayRef::~PictureBufferArrayRef() {
   for (size_t i = 0; i < picture_buffers.size(); ++i) {
     EGLImageKHR egl_image = picture_buffers[i].egl_image;
     if (egl_image != EGL_NO_IMAGE_KHR)
       eglDestroyImageKHR(egl_display, egl_image);
   }
 }
 
-ExynosVideoDecodeAccelerator::EGLSyncKHRRef::EGLSyncKHRRef(
+V4L2VideoDecodeAccelerator::EGLSyncKHRRef::EGLSyncKHRRef(
     EGLDisplay egl_display, EGLSyncKHR egl_sync)
     : egl_display(egl_display),
       egl_sync(egl_sync) {
 }
 
-ExynosVideoDecodeAccelerator::EGLSyncKHRRef::~EGLSyncKHRRef() {
+V4L2VideoDecodeAccelerator::EGLSyncKHRRef::~EGLSyncKHRRef() {
   if (egl_sync != EGL_NO_SYNC_KHR)
     eglDestroySyncKHR(egl_display, egl_sync);
 }
 
-ExynosVideoDecodeAccelerator::MfcInputRecord::MfcInputRecord()
+V4L2VideoDecodeAccelerator::MfcInputRecord::MfcInputRecord()
     : at_device(false),
       address(NULL),
       length(0),
       bytes_used(0),
       input_id(-1) {
 }
 
-ExynosVideoDecodeAccelerator::MfcInputRecord::~MfcInputRecord() {
+V4L2VideoDecodeAccelerator::MfcInputRecord::~MfcInputRecord() {
 }
 
-ExynosVideoDecodeAccelerator::MfcOutputRecord::MfcOutputRecord()
+V4L2VideoDecodeAccelerator::MfcOutputRecord::MfcOutputRecord()
     : at_device(false),
       at_client(false),
       egl_image(EGL_NO_IMAGE_KHR),
       egl_sync(EGL_NO_SYNC_KHR),
       picture_id(-1),
       cleared(false) {
   for (size_t i = 0; i < arraysize(fds); ++i)
     fds[i] = -1;
 }
 
-ExynosVideoDecodeAccelerator::MfcOutputRecord::~MfcOutputRecord() {}
+V4L2VideoDecodeAccelerator::MfcOutputRecord::~MfcOutputRecord() {}
 
-ExynosVideoDecodeAccelerator::PictureRecord::PictureRecord(
+V4L2VideoDecodeAccelerator::PictureRecord::PictureRecord(
     bool cleared,
     const media::Picture& picture)
     : cleared(cleared), picture(picture) {}
 
-ExynosVideoDecodeAccelerator::PictureRecord::~PictureRecord() {}
+V4L2VideoDecodeAccelerator::PictureRecord::~PictureRecord() {}
 
-ExynosVideoDecodeAccelerator::ExynosVideoDecodeAccelerator(
+V4L2VideoDecodeAccelerator::V4L2VideoDecodeAccelerator(
     EGLDisplay egl_display,
-    EGLContext egl_context,
     Client* client,
     const base::WeakPtr<Client>& io_client,
     const base::Callback<bool(void)>& make_context_current,
     const scoped_refptr<base::MessageLoopProxy>& io_message_loop_proxy)
     : child_message_loop_proxy_(base::MessageLoopProxy::current()),
       io_message_loop_proxy_(io_message_loop_proxy),
       weak_this_(base::AsWeakPtr(this)),
       client_ptr_factory_(client),
       client_(client_ptr_factory_.GetWeakPtr()),
       io_client_(io_client),
-      decoder_thread_("ExynosDecoderThread"),
+      decoder_thread_("V4L2DecoderThread"),
       decoder_state_(kUninitialized),
       decoder_delay_bitstream_buffer_id_(-1),
       decoder_current_input_buffer_(-1),
       decoder_decode_buffer_tasks_scheduled_(0),
       decoder_frames_at_client_(0),
       decoder_flushing_(false),
       resolution_change_pending_(false),
       resolution_change_reset_pending_(false),
       decoder_partial_frame_pending_(false),
-      mfc_fd_(-1),
+      videodec_fd_(-1),
       mfc_input_streamon_(false),
       mfc_input_buffer_queued_count_(0),
       mfc_output_streamon_(false),
       mfc_output_buffer_queued_count_(0),
       mfc_output_buffer_pixelformat_(0),
       mfc_output_dpb_size_(0),
       picture_clearing_count_(0),
-      device_poll_thread_("ExynosDevicePollThread"),
+      device_poll_thread_("V4L2DevicePollThread"),
       device_poll_interrupt_fd_(-1),
       make_context_current_(make_context_current),
       egl_display_(egl_display),
-      egl_context_(egl_context),
       video_profile_(media::VIDEO_CODEC_PROFILE_UNKNOWN) {}
 
-ExynosVideoDecodeAccelerator::~ExynosVideoDecodeAccelerator() {
+V4L2VideoDecodeAccelerator::~V4L2VideoDecodeAccelerator() {
   DCHECK(!decoder_thread_.IsRunning());
   DCHECK(!device_poll_thread_.IsRunning());
 
   if (device_poll_interrupt_fd_ != -1) {
-    close(device_poll_interrupt_fd_);
+    device->dev_close(device_poll_interrupt_fd_);

[Pawel Osciak, 2013/12/24 03:45:24]

What if device has never been allocated (before Initialize()) ?

     device_poll_interrupt_fd_ = -1;
   }
-  if (mfc_fd_ != -1) {
+  if (videodec_fd_ != -1) {
     DestroyMfcInputBuffers();
     DestroyMfcOutputBuffers();
-    close(mfc_fd_);
-    mfc_fd_ = -1;
+    device->dev_close(videodec_fd_);
+    videodec_fd_ = -1;
   }
 
   // These maps have members that should be manually destroyed, e.g. file
   // descriptors, mmap() segments, etc.
   DCHECK(mfc_input_buffer_map_.empty());
   DCHECK(mfc_output_buffer_map_.empty());
 }
 
-bool ExynosVideoDecodeAccelerator::Initialize(
+bool V4L2VideoDecodeAccelerator::Initialize(
     media::VideoCodecProfile profile) {
   DVLOG(3) << "Initialize()";
   DCHECK(child_message_loop_proxy_->BelongsToCurrentThread());
   DCHECK_EQ(decoder_state_, kUninitialized);
 
   switch (profile) {
     case media::H264PROFILE_BASELINE:
       DVLOG(2) << "Initialize(): profile H264PROFILE_BASELINE";
       break;
     case media::H264PROFILE_MAIN:
@@ skipping 10 matching lines @@
       return false;
   };
   video_profile_ = profile;
 
   if (egl_display_ == EGL_NO_DISPLAY) {
     DLOG(ERROR) << "Initialize(): could not get EGLDisplay";
     NOTIFY_ERROR(PLATFORM_FAILURE);
     return false;
   }
 
-  if (egl_context_ == EGL_NO_CONTEXT) {
-    DLOG(ERROR) << "Initialize(): could not get EGLContext";
-    NOTIFY_ERROR(PLATFORM_FAILURE);
-    return false;
-  }
-
   // We need the context to be initialized to query extensions.
   if (!make_context_current_.Run()) {
     DLOG(ERROR) << "Initialize(): could not make context current";
     NOTIFY_ERROR(PLATFORM_FAILURE);
     return false;
   }
 
   if (!gfx::g_driver_egl.ext.b_EGL_KHR_fence_sync) {
     DLOG(ERROR) << "Initialize(): context does not have EGL_KHR_fence_sync";
     NOTIFY_ERROR(PLATFORM_FAILURE);
     return false;
   }
 
   // Open the video devices.
   DVLOG(2) << "Initialize(): opening MFC device: " << kExynosMfcDevice;

[Pawel Osciak, 2013/12/24 03:45:24]

Please scrub Exynos from this class.

-  mfc_fd_ = HANDLE_EINTR(open(kExynosMfcDevice,
-                              O_RDWR | O_NONBLOCK | O_CLOEXEC));
-  if (mfc_fd_ == -1) {
+  device = new ExynosV4L2Device;

[Pawel Osciak, 2013/12/24 03:45:24]

I don't see this being freed anywhere.?
In any case, please use a factory method and a scoped_ptr.

+
+  videodec_fd_ = device->dev_open(kExynosMfcDevice,
+                               O_RDWR | O_NONBLOCK | O_CLOEXEC);
+
+  if (videodec_fd_ == -1) {
     DPLOG(ERROR) << "Initialize(): could not open MFC device: "
                  << kExynosMfcDevice;
     NOTIFY_ERROR(PLATFORM_FAILURE);
     return false;
   }
 
   // Create the interrupt fd.
   DCHECK_EQ(device_poll_interrupt_fd_, -1);
   device_poll_interrupt_fd_ = eventfd(0, EFD_NONBLOCK | EFD_CLOEXEC);

[Pawel Osciak, 2013/12/24 03:45:24]

This could be extracted as well I think?

   if (device_poll_interrupt_fd_ == -1) {
     DPLOG(ERROR) << "Initialize(): eventfd() failed";
     NOTIFY_ERROR(PLATFORM_FAILURE);
     return false;
   }
 
   // Capabilities check.
   struct v4l2_capability caps;
   const __u32 kCapsRequired =
       V4L2_CAP_VIDEO_CAPTURE_MPLANE |
       V4L2_CAP_VIDEO_OUTPUT_MPLANE |
       V4L2_CAP_STREAMING;
-  IOCTL_OR_ERROR_RETURN_FALSE(mfc_fd_, VIDIOC_QUERYCAP, &caps);
+  IOCTL_OR_ERROR_RETURN_FALSE(videodec_fd_, VIDIOC_QUERYCAP, &caps);
   if ((caps.capabilities & kCapsRequired) != kCapsRequired) {
     DLOG(ERROR) << "Initialize(): ioctl() failed: VIDIOC_QUERYCAP"
         ", caps check failed: 0x" << std::hex << caps.capabilities;
     NOTIFY_ERROR(PLATFORM_FAILURE);
     return false;
   }
 
   if (!CreateMfcInputBuffers())
     return false;
 
   // MFC output format has to be setup before streaming starts.
   struct v4l2_format format;
   memset(&format, 0, sizeof(format));
   format.type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
   format.fmt.pix_mp.pixelformat = V4L2_PIX_FMT_NV12M;
-  IOCTL_OR_ERROR_RETURN_FALSE(mfc_fd_, VIDIOC_S_FMT, &format);
+  IOCTL_OR_ERROR_RETURN_FALSE(videodec_fd_, VIDIOC_S_FMT, &format);
 
   // Subscribe to the resolution change event.
   struct v4l2_event_subscription sub;
   memset(&sub, 0, sizeof(sub));
   sub.type = V4L2_EVENT_RESOLUTION_CHANGE;
-  IOCTL_OR_ERROR_RETURN_FALSE(mfc_fd_, VIDIOC_SUBSCRIBE_EVENT, &sub);
+  IOCTL_OR_ERROR_RETURN_FALSE(videodec_fd_, VIDIOC_SUBSCRIBE_EVENT, &sub);
 
   // Initialize format-specific bits.
   if (video_profile_ >= media::H264PROFILE_MIN &&
       video_profile_ <= media::H264PROFILE_MAX) {
     decoder_h264_parser_.reset(new content::H264Parser());
   }
 
   if (!decoder_thread_.Start()) {
     DLOG(ERROR) << "Initialize(): decoder thread failed to start";
     NOTIFY_ERROR(PLATFORM_FAILURE);
     return false;
   }
 
   SetDecoderState(kInitialized);
 
   child_message_loop_proxy_->PostTask(FROM_HERE, base::Bind(
       &Client::NotifyInitializeDone, client_));
   return true;
 }
 
-void ExynosVideoDecodeAccelerator::Decode(
+void V4L2VideoDecodeAccelerator::Decode(
     const media::BitstreamBuffer& bitstream_buffer) {
   DVLOG(1) << "Decode(): input_id=" << bitstream_buffer.id()
            << ", size=" << bitstream_buffer.size();
   DCHECK(io_message_loop_proxy_->BelongsToCurrentThread());
 
   // DecodeTask() will take care of running a DecodeBufferTask().
   decoder_thread_.message_loop()->PostTask(FROM_HERE, base::Bind(
-      &ExynosVideoDecodeAccelerator::DecodeTask, base::Unretained(this),
+      &V4L2VideoDecodeAccelerator::DecodeTask, base::Unretained(this),
       bitstream_buffer));
 }
 
-void ExynosVideoDecodeAccelerator::AssignPictureBuffers(
+void V4L2VideoDecodeAccelerator::AssignPictureBuffers(
     const std::vector<media::PictureBuffer>& buffers) {
   DVLOG(3) << "AssignPictureBuffers(): buffer_count=" << buffers.size();
   DCHECK(child_message_loop_proxy_->BelongsToCurrentThread());
 
   if (buffers.size() != mfc_output_buffer_map_.size()) {
     DLOG(ERROR) << "AssignPictureBuffers(): Failed to provide requested picture"
                    " buffers. (Got " << buffers.size()
                 << ", requested " << mfc_output_buffer_map_.size() << ")";
     NOTIFY_ERROR(INVALID_ARGUMENT);
     return;
@@ skipping 34 matching lines @@
       return;
     }
 
     glBindTexture(GL_TEXTURE_EXTERNAL_OES, buffers[i].texture_id());
     glEGLImageTargetTexture2DOES(GL_TEXTURE_EXTERNAL_OES, egl_image);
     picture_buffers_ref->picture_buffers.push_back(
         PictureBufferArrayRef::PictureBufferRef(egl_image, buffers[i].id()));
   }
   decoder_thread_.message_loop()->PostTask(
       FROM_HERE,
-      base::Bind(&ExynosVideoDecodeAccelerator::AssignPictureBuffersTask,
+      base::Bind(&V4L2VideoDecodeAccelerator::AssignPictureBuffersTask,
                  base::Unretained(this),
                  base::Passed(&picture_buffers_ref)));
 }
 
-void ExynosVideoDecodeAccelerator::ReusePictureBuffer(int32 picture_buffer_id) {
+void V4L2VideoDecodeAccelerator::ReusePictureBuffer(int32 picture_buffer_id) {
   DVLOG(3) << "ReusePictureBuffer(): picture_buffer_id=" << picture_buffer_id;
   // Must be run on child thread, as we'll insert a sync in the EGL context.
   DCHECK(child_message_loop_proxy_->BelongsToCurrentThread());
 
   if (!make_context_current_.Run()) {
     DLOG(ERROR) << "ReusePictureBuffer(): could not make context current";
     NOTIFY_ERROR(PLATFORM_FAILURE);
     return;
   }
 
   EGLSyncKHR egl_sync =
       eglCreateSyncKHR(egl_display_, EGL_SYNC_FENCE_KHR, NULL);
   if (egl_sync == EGL_NO_SYNC_KHR) {
     DLOG(ERROR) << "ReusePictureBuffer(): eglCreateSyncKHR() failed";
     NOTIFY_ERROR(PLATFORM_FAILURE);
     return;
   }
 
   scoped_ptr<EGLSyncKHRRef> egl_sync_ref(new EGLSyncKHRRef(
       egl_display_, egl_sync));
   decoder_thread_.message_loop()->PostTask(FROM_HERE, base::Bind(
-      &ExynosVideoDecodeAccelerator::ReusePictureBufferTask,
+      &V4L2VideoDecodeAccelerator::ReusePictureBufferTask,
       base::Unretained(this), picture_buffer_id, base::Passed(&egl_sync_ref)));
 }
 
-void ExynosVideoDecodeAccelerator::Flush() {
+void V4L2VideoDecodeAccelerator::Flush() {
   DVLOG(3) << "Flush()";
   DCHECK(child_message_loop_proxy_->BelongsToCurrentThread());
   decoder_thread_.message_loop()->PostTask(FROM_HERE, base::Bind(
-      &ExynosVideoDecodeAccelerator::FlushTask, base::Unretained(this)));
+      &V4L2VideoDecodeAccelerator::FlushTask, base::Unretained(this)));
 }
 
-void ExynosVideoDecodeAccelerator::Reset() {
+void V4L2VideoDecodeAccelerator::Reset() {
   DVLOG(3) << "Reset()";
   DCHECK(child_message_loop_proxy_->BelongsToCurrentThread());
   decoder_thread_.message_loop()->PostTask(FROM_HERE, base::Bind(
-      &ExynosVideoDecodeAccelerator::ResetTask, base::Unretained(this)));
+      &V4L2VideoDecodeAccelerator::ResetTask, base::Unretained(this)));
 }
 
-void ExynosVideoDecodeAccelerator::Destroy() {
+void V4L2VideoDecodeAccelerator::Destroy() {
   DVLOG(3) << "Destroy()";
   DCHECK(child_message_loop_proxy_->BelongsToCurrentThread());
 
   // We're destroying; cancel all callbacks.
   client_ptr_factory_.InvalidateWeakPtrs();
 
   // If the decoder thread is running, destroy using posted task.
   if (decoder_thread_.IsRunning()) {
     decoder_thread_.message_loop()->PostTask(FROM_HERE, base::Bind(
-        &ExynosVideoDecodeAccelerator::DestroyTask, base::Unretained(this)));
+        &V4L2VideoDecodeAccelerator::DestroyTask, base::Unretained(this)));
     // DestroyTask() will cause the decoder_thread_ to flush all tasks.
     decoder_thread_.Stop();
   } else {
     // Otherwise, call the destroy task directly.
     DestroyTask();
   }
 
   // Set to kError state just in case.
   SetDecoderState(kError);
 
   delete this;
 }
 
-bool ExynosVideoDecodeAccelerator::CanDecodeOnIOThread() { return true; }
+bool V4L2VideoDecodeAccelerator::CanDecodeOnIOThread() { return true; }
 
-void ExynosVideoDecodeAccelerator::DecodeTask(
+void V4L2VideoDecodeAccelerator::DecodeTask(
     const media::BitstreamBuffer& bitstream_buffer) {
   DVLOG(3) << "DecodeTask(): input_id=" << bitstream_buffer.id();
   DCHECK_EQ(decoder_thread_.message_loop(), base::MessageLoop::current());
   DCHECK_NE(decoder_state_, kUninitialized);
   TRACE_EVENT1("Video Decoder", "EVDA::DecodeTask", "input_id",
                bitstream_buffer.id());
 
   scoped_ptr<BitstreamBufferRef> bitstream_record(new BitstreamBufferRef(
       io_client_, io_message_loop_proxy_,
       new base::SharedMemory(bitstream_buffer.handle(), true),
@@ skipping 17 matching lines @@
     DVLOG(2) << "DecodeTask(): early out: kError state";
     return;
   }
 
   decoder_input_queue_.push(
       linked_ptr<BitstreamBufferRef>(bitstream_record.release()));
   decoder_decode_buffer_tasks_scheduled_++;
   DecodeBufferTask();
 }
 
-void ExynosVideoDecodeAccelerator::DecodeBufferTask() {
+void V4L2VideoDecodeAccelerator::DecodeBufferTask() {
   DVLOG(3) << "DecodeBufferTask()";
   DCHECK_EQ(decoder_thread_.message_loop(), base::MessageLoop::current());
   DCHECK_NE(decoder_state_, kUninitialized);
   TRACE_EVENT0("Video Decoder", "EVDA::DecodeBufferTask");
 
   decoder_decode_buffer_tasks_scheduled_--;
 
   if (decoder_state_ == kResetting) {
     DVLOG(2) << "DecodeBufferTask(): early out: kResetting state";
     return;
@@ skipping 100 matching lines @@
       // Our current bitstream buffer is done; return it.
       int32 input_id = decoder_current_bitstream_buffer_->input_id;
       DVLOG(3) << "DecodeBufferTask(): finished input_id=" << input_id;
       // BitstreamBufferRef destructor calls NotifyEndOfBitstreamBuffer().
       decoder_current_bitstream_buffer_.reset();
     }
     ScheduleDecodeBufferTaskIfNeeded();
   }
 }
 
-bool ExynosVideoDecodeAccelerator::AdvanceFrameFragment(
+bool V4L2VideoDecodeAccelerator::AdvanceFrameFragment(
     const uint8* data,
     size_t size,
     size_t* endpos) {
   if (video_profile_ >= media::H264PROFILE_MIN &&
       video_profile_ <= media::H264PROFILE_MAX) {
     // For H264, we need to feed HW one frame at a time.  This is going to take
     // some parsing of our input stream.
     decoder_h264_parser_->SetStream(data, size);
     content::H264NALU nalu;
     content::H264Parser::Result result;
@@ skipping 59 matching lines @@
     DCHECK_GE(video_profile_, media::VP8PROFILE_MIN);
     DCHECK_LE(video_profile_, media::VP8PROFILE_MAX);
     // For VP8, we can just dump the entire buffer.  No fragmentation needed,
     // and we never return a partial frame.
     *endpos = size;
     decoder_partial_frame_pending_ = false;
     return true;
   }
 }
 
-void ExynosVideoDecodeAccelerator::ScheduleDecodeBufferTaskIfNeeded() {
+void V4L2VideoDecodeAccelerator::ScheduleDecodeBufferTaskIfNeeded() {
   DCHECK_EQ(decoder_thread_.message_loop(), base::MessageLoop::current());
 
   // If we're behind on tasks, schedule another one.
   int buffers_to_decode = decoder_input_queue_.size();
   if (decoder_current_bitstream_buffer_ != NULL)
     buffers_to_decode++;
   if (decoder_decode_buffer_tasks_scheduled_ < buffers_to_decode) {
     decoder_decode_buffer_tasks_scheduled_++;
     decoder_thread_.message_loop()->PostTask(FROM_HERE, base::Bind(
-        &ExynosVideoDecodeAccelerator::DecodeBufferTask,
+        &V4L2VideoDecodeAccelerator::DecodeBufferTask,
         base::Unretained(this)));
   }
 }
 
-bool ExynosVideoDecodeAccelerator::DecodeBufferInitial(
+bool V4L2VideoDecodeAccelerator::DecodeBufferInitial(
     const void* data, size_t size, size_t* endpos) {
   DVLOG(3) << "DecodeBufferInitial(): data=" << data << ", size=" << size;
   DCHECK_EQ(decoder_thread_.message_loop(), base::MessageLoop::current());
   DCHECK_NE(decoder_state_, kUninitialized);
   DCHECK_NE(decoder_state_, kDecoding);
   DCHECK(!device_poll_thread_.IsRunning());
   // Initial decode.  We haven't been able to get output stream format info yet.
   // Get it, and start decoding.
 
   // Copy in and send to HW.
@@ skipping 40 matching lines @@
 
   // StartDevicePoll will raise the error if there is one.
   if (!StartDevicePoll())
     return false;
 
   decoder_state_ = kDecoding;
   ScheduleDecodeBufferTaskIfNeeded();
   return true;
 }
 
-bool ExynosVideoDecodeAccelerator::DecodeBufferContinue(
+bool V4L2VideoDecodeAccelerator::DecodeBufferContinue(
     const void* data, size_t size) {
   DVLOG(3) << "DecodeBufferContinue(): data=" << data << ", size=" << size;
   DCHECK_EQ(decoder_thread_.message_loop(), base::MessageLoop::current());
   DCHECK_EQ(decoder_state_, kDecoding);
 
   // Both of these calls will set kError state if they fail.
   // Only flush the frame if it's complete.
   return (AppendToInputFrame(data, size) &&
           (decoder_partial_frame_pending_ || FlushInputFrame()));
 }
 
-bool ExynosVideoDecodeAccelerator::AppendToInputFrame(
+bool V4L2VideoDecodeAccelerator::AppendToInputFrame(
     const void* data, size_t size) {
   DVLOG(3) << "AppendToInputFrame()";
   DCHECK_EQ(decoder_thread_.message_loop(), base::MessageLoop::current());
   DCHECK_NE(decoder_state_, kUninitialized);
   DCHECK_NE(decoder_state_, kResetting);
   DCHECK_NE(decoder_state_, kError);
   // This routine can handle data == NULL and size == 0, which occurs when
   // we queue an empty buffer for the purposes of flushing the pipe.
 
   // Flush if we're too big
@@ skipping 46 matching lines @@
   }
   memcpy(
       reinterpret_cast<uint8*>(input_record.address) + input_record.bytes_used,
       data,
       size);
   input_record.bytes_used += size;
 
   return true;
 }
 
-bool ExynosVideoDecodeAccelerator::FlushInputFrame() {
+bool V4L2VideoDecodeAccelerator::FlushInputFrame() {
   DVLOG(3) << "FlushInputFrame()";
   DCHECK_EQ(decoder_thread_.message_loop(), base::MessageLoop::current());
   DCHECK_NE(decoder_state_, kUninitialized);
   DCHECK_NE(decoder_state_, kResetting);
   DCHECK_NE(decoder_state_, kError);
 
   if (decoder_current_input_buffer_ == -1)
     return true;
 
   MfcInputRecord& input_record =
@@ skipping 17 matching lines @@
   mfc_input_ready_queue_.push(decoder_current_input_buffer_);
   decoder_current_input_buffer_ = -1;
   DVLOG(3) << "FlushInputFrame(): submitting input_id="
            << input_record.input_id;
   // Kick the MFC once since there's new available input for it.
   EnqueueMfc();
 
   return (decoder_state_ != kError);
 }
 
-void ExynosVideoDecodeAccelerator::AssignPictureBuffersTask(
+void V4L2VideoDecodeAccelerator::AssignPictureBuffersTask(
     scoped_ptr<PictureBufferArrayRef> pic_buffers) {
   DVLOG(3) << "AssignPictureBuffersTask()";
   DCHECK_EQ(decoder_thread_.message_loop(), base::MessageLoop::current());
   DCHECK_NE(decoder_state_, kUninitialized);
   TRACE_EVENT0("Video Decoder", "EVDA::AssignPictureBuffersTask");
 
   // We run AssignPictureBuffersTask even if we're in kResetting.
   if (decoder_state_ == kError) {
     DVLOG(2) << "AssignPictureBuffersTask(): early out: kError state";
     return;
@@ skipping 19 matching lines @@
   }
   pic_buffers->picture_buffers.clear();
 
   // We got buffers!  Kick the MFC.
   EnqueueMfc();
 
   if (decoder_state_ == kChangingResolution)
     ResumeAfterResolutionChange();
 }
 
-void ExynosVideoDecodeAccelerator::ServiceDeviceTask(bool mfc_event_pending) {
+void V4L2VideoDecodeAccelerator::ServiceDeviceTask(bool mfc_event_pending) {
   DVLOG(3) << "ServiceDeviceTask()";
   DCHECK_EQ(decoder_thread_.message_loop(), base::MessageLoop::current());
   DCHECK_NE(decoder_state_, kUninitialized);
   DCHECK_NE(decoder_state_, kInitialized);
   DCHECK_NE(decoder_state_, kAfterReset);
   TRACE_EVENT0("Video Decoder", "EVDA::ServiceDeviceTask");
 
   if (decoder_state_ == kResetting) {
     DVLOG(2) << "ServiceDeviceTask(): early out: kResetting state";
     return;
   } else if (decoder_state_ == kError) {
     DVLOG(2) << "ServiceDeviceTask(): early out: kError state";
     return;
   } else if (decoder_state_ == kChangingResolution) {
     DVLOG(2) << "ServiceDeviceTask(): early out: kChangingResolution state";
     return;
   }
 
   if (mfc_event_pending)
     DequeueMfcEvents();
   DequeueMfc();
   EnqueueMfc();
 
   // Clear the interrupt fd.
-  if (!ClearDevicePollInterrupt())
+  if (!device->ClearDevicePollInterrupt(device_poll_interrupt_fd_)) {
+    NOTIFY_ERROR(PLATFORM_FAILURE);
     return;
+  }
 
   unsigned int poll_fds = 0;
   // Add MFC fd, if we should poll on it.
   // MFC can be polled as soon as either input or output buffers are queued.
   if (mfc_input_buffer_queued_count_ + mfc_output_buffer_queued_count_ > 0)
     poll_fds |= kPollMfc;
 
   // ServiceDeviceTask() should only ever be scheduled from DevicePollTask(),
   // so either:
   // * device_poll_thread_ is running normally
   // * device_poll_thread_ scheduled us, but then a ResetTask() or DestroyTask()
   //   shut it down, in which case we're either in kResetting or kError states
   //   respectively, and we should have early-outed already.
   DCHECK(device_poll_thread_.message_loop());
   // Queue the DevicePollTask() now.
   device_poll_thread_.message_loop()->PostTask(FROM_HERE, base::Bind(
-      &ExynosVideoDecodeAccelerator::DevicePollTask,
+      &V4L2VideoDecodeAccelerator::DevicePollTask,
       base::Unretained(this),
       poll_fds));
 
   DVLOG(1) << "ServiceDeviceTask(): buffer counts: DEC["
            << decoder_input_queue_.size() << "->"
            << mfc_input_ready_queue_.size() << "] => MFC["
            << mfc_free_input_buffers_.size() << "+"
            << mfc_input_buffer_queued_count_ << "/"
            << mfc_input_buffer_map_.size() << "->"
            << mfc_free_output_buffers_.size() << "+"
            << mfc_output_buffer_queued_count_ << "/"
            << mfc_output_buffer_map_.size() << "] => VDA["
            << decoder_frames_at_client_ << "]";
 
   ScheduleDecodeBufferTaskIfNeeded();
   StartResolutionChangeIfNeeded();
 }
 
-void ExynosVideoDecodeAccelerator::EnqueueMfc() {
+void V4L2VideoDecodeAccelerator::EnqueueMfc() {
   DVLOG(3) << "EnqueueMfc()";
   DCHECK_EQ(decoder_thread_.message_loop(), base::MessageLoop::current());
   DCHECK_NE(decoder_state_, kUninitialized);
   TRACE_EVENT0("Video Decoder", "EVDA::EnqueueMfc");
 
   // Drain the pipe of completed decode buffers.
   const int old_mfc_inputs_queued = mfc_input_buffer_queued_count_;
   while (!mfc_input_ready_queue_.empty()) {
     if (!EnqueueMfcInputRecord())
       return;
   }
   if (old_mfc_inputs_queued == 0 && mfc_input_buffer_queued_count_ != 0) {
     // We just started up a previously empty queue.
     // Queue state changed; signal interrupt.
-    if (!SetDevicePollInterrupt())
+    if (!device->SetDevicePollInterrupt(device_poll_interrupt_fd_)) {
+      NOTIFY_ERROR(PLATFORM_FAILURE);
       return;
+    }
     // Start VIDIOC_STREAMON if we haven't yet.
     if (!mfc_input_streamon_) {
       __u32 type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE;
-      IOCTL_OR_ERROR_RETURN(mfc_fd_, VIDIOC_STREAMON, &type);
+      IOCTL_OR_ERROR_RETURN(videodec_fd_, VIDIOC_STREAMON, &type);
       mfc_input_streamon_ = true;
     }
   }
 
   // Enqueue all the MFC outputs we can.
   const int old_mfc_outputs_queued = mfc_output_buffer_queued_count_;
   while (!mfc_free_output_buffers_.empty()) {
     if (!EnqueueMfcOutputRecord())
       return;
   }
   if (old_mfc_outputs_queued == 0 && mfc_output_buffer_queued_count_ != 0) {
     // We just started up a previously empty queue.
     // Queue state changed; signal interrupt.
-    if (!SetDevicePollInterrupt())
+    if (!device->SetDevicePollInterrupt(device_poll_interrupt_fd_)) {
+      NOTIFY_ERROR(PLATFORM_FAILURE);
       return;
+    }
     // Start VIDIOC_STREAMON if we haven't yet.
     if (!mfc_output_streamon_) {
       __u32 type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
-      IOCTL_OR_ERROR_RETURN(mfc_fd_, VIDIOC_STREAMON, &type);
+      IOCTL_OR_ERROR_RETURN(videodec_fd_, VIDIOC_STREAMON, &type);
       mfc_output_streamon_ = true;
     }
   }
 }
 
-void ExynosVideoDecodeAccelerator::DequeueMfcEvents() {
+void V4L2VideoDecodeAccelerator::DequeueMfcEvents() {
   DCHECK_EQ(decoder_thread_.message_loop(), base::MessageLoop::current());
   DCHECK_NE(decoder_state_, kUninitialized);
   DVLOG(3) << "DequeueMfcEvents()";
 
   struct v4l2_event ev;
   memset(&ev, 0, sizeof(ev));
 
-  while (ioctl(mfc_fd_, VIDIOC_DQEVENT, &ev) == 0) {
+  while (device->dev_ioctl(videodec_fd_, VIDIOC_DQEVENT, &ev) == 0) {
     if (ev.type == V4L2_EVENT_RESOLUTION_CHANGE) {
       DVLOG(3) << "DequeueMfcEvents(): got resolution change event.";
       DCHECK(!resolution_change_pending_);
       resolution_change_pending_ = true;
     } else {
       DLOG(FATAL) << "DequeueMfcEvents(): got an event (" << ev.type
                   << ") we haven't subscribed to.";
     }
   }
 }
 
-void ExynosVideoDecodeAccelerator::DequeueMfc() {
+void V4L2VideoDecodeAccelerator::DequeueMfc() {
   DVLOG(3) << "DequeueMfc()";
   DCHECK_EQ(decoder_thread_.message_loop(), base::MessageLoop::current());
   DCHECK_NE(decoder_state_, kUninitialized);
   TRACE_EVENT0("Video Decoder", "EVDA::DequeueMfc");
 
   // Dequeue completed MFC input (VIDEO_OUTPUT) buffers, and recycle to the free
   // list.
   struct v4l2_buffer dqbuf;
   struct v4l2_plane planes[2];
   while (mfc_input_buffer_queued_count_ > 0) {
     DCHECK(mfc_input_streamon_);
     memset(&dqbuf, 0, sizeof(dqbuf));
     memset(planes, 0, sizeof(planes));
     dqbuf.type   = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE;
     dqbuf.memory = V4L2_MEMORY_MMAP;
     dqbuf.m.planes = planes;
     dqbuf.length = 1;
-    if (ioctl(mfc_fd_, VIDIOC_DQBUF, &dqbuf) != 0) {
+    if (device->dev_ioctl(videodec_fd_, VIDIOC_DQBUF, &dqbuf) != 0) {
       if (errno == EAGAIN) {
         // EAGAIN if we're just out of buffers to dequeue.
         break;
       }
       DPLOG(ERROR) << "DequeueMfc(): ioctl() failed: VIDIOC_DQBUF";
       NOTIFY_ERROR(PLATFORM_FAILURE);
       return;
     }
     MfcInputRecord& input_record = mfc_input_buffer_map_[dqbuf.index];
     DCHECK(input_record.at_device);
     mfc_free_input_buffers_.push_back(dqbuf.index);
     input_record.at_device = false;
     input_record.bytes_used = 0;
     input_record.input_id = -1;
     mfc_input_buffer_queued_count_--;
   }
 
   // Dequeue completed MFC output (VIDEO_CAPTURE) buffers, and queue to the
   // completed queue.
   while (mfc_output_buffer_queued_count_ > 0) {
     DCHECK(mfc_output_streamon_);
     memset(&dqbuf, 0, sizeof(dqbuf));
     memset(planes, 0, sizeof(planes));
     dqbuf.type   = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
     dqbuf.memory = V4L2_MEMORY_MMAP;
     dqbuf.m.planes = planes;
     dqbuf.length = 2;
-    if (ioctl(mfc_fd_, VIDIOC_DQBUF, &dqbuf) != 0) {
+    if (device->dev_ioctl(videodec_fd_, VIDIOC_DQBUF, &dqbuf) != 0) {
       if (errno == EAGAIN) {
         // EAGAIN if we're just out of buffers to dequeue.
         break;
       }
       DPLOG(ERROR) << "DequeueMfc(): ioctl() failed: VIDIOC_DQBUF";
       NOTIFY_ERROR(PLATFORM_FAILURE);
       return;
     }
     MfcOutputRecord& output_record = mfc_output_buffer_map_[dqbuf.index];
     DCHECK(output_record.at_device);
@@ skipping 16 matching lines @@
       SendPictureReady();
       output_record.cleared = true;
       decoder_frames_at_client_++;
     }
     mfc_output_buffer_queued_count_--;
   }
 
   NotifyFlushDoneIfNeeded();
 }
 
-bool ExynosVideoDecodeAccelerator::EnqueueMfcInputRecord() {
+bool V4L2VideoDecodeAccelerator::EnqueueMfcInputRecord() {
   DVLOG(3) << "EnqueueMfcInputRecord()";
   DCHECK(!mfc_input_ready_queue_.empty());
 
   // Enqueue a MFC input (VIDEO_OUTPUT) buffer.
   const int buffer = mfc_input_ready_queue_.front();
   MfcInputRecord& input_record = mfc_input_buffer_map_[buffer];
   DCHECK(!input_record.at_device);
   struct v4l2_buffer qbuf;
   struct v4l2_plane qbuf_plane;
   memset(&qbuf, 0, sizeof(qbuf));
   memset(&qbuf_plane, 0, sizeof(qbuf_plane));
   qbuf.index                 = buffer;
   qbuf.type                  = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE;
   qbuf.timestamp.tv_sec      = input_record.input_id;
   qbuf.memory                = V4L2_MEMORY_MMAP;
   qbuf.m.planes              = &qbuf_plane;
   qbuf.m.planes[0].bytesused = input_record.bytes_used;
   qbuf.length                = 1;
-  IOCTL_OR_ERROR_RETURN_FALSE(mfc_fd_, VIDIOC_QBUF, &qbuf);
+  IOCTL_OR_ERROR_RETURN_FALSE(videodec_fd_, VIDIOC_QBUF, &qbuf);
   mfc_input_ready_queue_.pop();
   input_record.at_device = true;
   mfc_input_buffer_queued_count_++;
   DVLOG(3) << "EnqueueMfcInputRecord(): enqueued input_id="
            << input_record.input_id;
   return true;
 }
 
-bool ExynosVideoDecodeAccelerator::EnqueueMfcOutputRecord() {
+bool V4L2VideoDecodeAccelerator::EnqueueMfcOutputRecord() {
   DVLOG(3) << "EnqueueMfcOutputRecord()";
   DCHECK(!mfc_free_output_buffers_.empty());
 
   // Enqueue a MFC output (VIDEO_CAPTURE) buffer.
   const int buffer = mfc_free_output_buffers_.front();
   MfcOutputRecord& output_record = mfc_output_buffer_map_[buffer];
   DCHECK(!output_record.at_device);
   DCHECK(!output_record.at_client);
   DCHECK_NE(output_record.egl_image, EGL_NO_IMAGE_KHR);
   DCHECK_NE(output_record.picture_id, -1);
@@ skipping 10 matching lines @@
   }
   struct v4l2_buffer qbuf;
   struct v4l2_plane qbuf_planes[arraysize(output_record.fds)];
   memset(&qbuf, 0, sizeof(qbuf));
   memset(qbuf_planes, 0, sizeof(qbuf_planes));
   qbuf.index    = buffer;
   qbuf.type     = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
   qbuf.memory   = V4L2_MEMORY_MMAP;
   qbuf.m.planes = qbuf_planes;
   qbuf.length   = arraysize(output_record.fds);
-  IOCTL_OR_ERROR_RETURN_FALSE(mfc_fd_, VIDIOC_QBUF, &qbuf);
+  IOCTL_OR_ERROR_RETURN_FALSE(videodec_fd_, VIDIOC_QBUF, &qbuf);
   mfc_free_output_buffers_.pop();
   output_record.at_device = true;
   mfc_output_buffer_queued_count_++;
   return true;
 }
 
-void ExynosVideoDecodeAccelerator::ReusePictureBufferTask(
+void V4L2VideoDecodeAccelerator::ReusePictureBufferTask(
     int32 picture_buffer_id, scoped_ptr<EGLSyncKHRRef> egl_sync_ref) {
   DVLOG(3) << "ReusePictureBufferTask(): picture_buffer_id="
            << picture_buffer_id;
   DCHECK_EQ(decoder_thread_.message_loop(), base::MessageLoop::current());
   TRACE_EVENT0("Video Decoder", "EVDA::ReusePictureBufferTask");
 
   // We run ReusePictureBufferTask even if we're in kResetting.
   if (decoder_state_ == kError) {
     DVLOG(2) << "ReusePictureBufferTask(): early out: kError state";
     return;
@@ skipping 26 matching lines @@
   output_record.at_client = false;
   output_record.egl_sync = egl_sync_ref->egl_sync;
   mfc_free_output_buffers_.push(index);
   decoder_frames_at_client_--;
   // Take ownership of the EGLSync.
   egl_sync_ref->egl_sync = EGL_NO_SYNC_KHR;
   // We got a buffer back, so kick the MFC.
   EnqueueMfc();
 }
 
-void ExynosVideoDecodeAccelerator::FlushTask() {
+void V4L2VideoDecodeAccelerator::FlushTask() {
   DVLOG(3) << "FlushTask()";
   DCHECK_EQ(decoder_thread_.message_loop(), base::MessageLoop::current());
   TRACE_EVENT0("Video Decoder", "EVDA::FlushTask");
 
   // Flush outstanding buffers.
   if (decoder_state_ == kInitialized || decoder_state_ == kAfterReset) {
     // There's nothing in the pipe, so return done immediately.
     DVLOG(3) << "FlushTask(): returning flush";
     child_message_loop_proxy_->PostTask(
         FROM_HERE, base::Bind(&Client::NotifyFlushDone, client_));
     return;
   } else if (decoder_state_ == kError) {
     DVLOG(2) << "FlushTask(): early out: kError state";
     return;
   }
 
   // We don't support stacked flushing.
   DCHECK(!decoder_flushing_);
 
   // Queue up an empty buffer -- this triggers the flush.
   decoder_input_queue_.push(
       linked_ptr<BitstreamBufferRef>(new BitstreamBufferRef(
           io_client_, io_message_loop_proxy_, NULL, 0, kFlushBufferId)));
   decoder_flushing_ = true;
   SendPictureReady();  // Send all pending PictureReady.
 
   ScheduleDecodeBufferTaskIfNeeded();
 }
 
-void ExynosVideoDecodeAccelerator::NotifyFlushDoneIfNeeded() {
+void V4L2VideoDecodeAccelerator::NotifyFlushDoneIfNeeded() {
   if (!decoder_flushing_)
     return;
 
   // Pipeline is empty when:
   // * Decoder input queue is empty of non-delayed buffers.
   // * There is no currently filling input buffer.
   // * MFC input holding queue is empty.
   // * All MFC input (VIDEO_OUTPUT) buffers are returned.
   if (!decoder_input_queue_.empty()) {
     if (decoder_input_queue_.front()->input_id !=
@@ skipping 23 matching lines @@
   decoder_delay_bitstream_buffer_id_ = -1;
   decoder_flushing_ = false;
   DVLOG(3) << "NotifyFlushDoneIfNeeded(): returning flush";
   child_message_loop_proxy_->PostTask(
       FROM_HERE, base::Bind(&Client::NotifyFlushDone, client_));
 
   // While we were flushing, we early-outed DecodeBufferTask()s.
   ScheduleDecodeBufferTaskIfNeeded();
 }
 
-void ExynosVideoDecodeAccelerator::ResetTask() {
+void V4L2VideoDecodeAccelerator::ResetTask() {
   DVLOG(3) << "ResetTask()";
   DCHECK_EQ(decoder_thread_.message_loop(), base::MessageLoop::current());
   TRACE_EVENT0("Video Decoder", "EVDA::ResetTask");
 
   if (decoder_state_ == kError) {
     DVLOG(2) << "ResetTask(): early out: kError state";
     return;
   }
 
   // If we are in the middle of switching resolutions, postpone reset until
@@ skipping 20 matching lines @@
 
   // If we were flushing, we'll never return any more BitstreamBuffers or
   // PictureBuffers; they have all been dropped and returned by now.
   NotifyFlushDoneIfNeeded();
 
   // Mark that we're resetting, then enqueue a ResetDoneTask().  All intervening
   // jobs will early-out in the kResetting state.
   decoder_state_ = kResetting;
   SendPictureReady();  // Send all pending PictureReady.
   decoder_thread_.message_loop()->PostTask(FROM_HERE, base::Bind(
-      &ExynosVideoDecodeAccelerator::ResetDoneTask, base::Unretained(this)));
+      &V4L2VideoDecodeAccelerator::ResetDoneTask, base::Unretained(this)));
 }
 
-void ExynosVideoDecodeAccelerator::ResetDoneTask() {
+void V4L2VideoDecodeAccelerator::ResetDoneTask() {
   DVLOG(3) << "ResetDoneTask()";
   DCHECK_EQ(decoder_thread_.message_loop(), base::MessageLoop::current());
   TRACE_EVENT0("Video Decoder", "EVDA::ResetDoneTask");
 
   if (decoder_state_ == kError) {
     DVLOG(2) << "ResetDoneTask(): early out: kError state";
     return;
   }
 
   // We might have received a resolution change event while we were waiting
@@ skipping 13 matching lines @@
   decoder_state_ = kAfterReset;
   decoder_partial_frame_pending_ = false;
   decoder_delay_bitstream_buffer_id_ = -1;
   child_message_loop_proxy_->PostTask(FROM_HERE, base::Bind(
       &Client::NotifyResetDone, client_));
 
   // While we were resetting, we early-outed DecodeBufferTask()s.
   ScheduleDecodeBufferTaskIfNeeded();
 }
 
-void ExynosVideoDecodeAccelerator::DestroyTask() {
+void V4L2VideoDecodeAccelerator::DestroyTask() {
   DVLOG(3) << "DestroyTask()";
   TRACE_EVENT0("Video Decoder", "EVDA::DestroyTask");
 
   // DestroyTask() should run regardless of decoder_state_.
 
   // Stop streaming and the device_poll_thread_.
   StopDevicePoll(false);
 
   decoder_current_bitstream_buffer_.reset();
   decoder_current_input_buffer_ = -1;
   decoder_decode_buffer_tasks_scheduled_ = 0;
   decoder_frames_at_client_ = 0;
   while (!decoder_input_queue_.empty())
     decoder_input_queue_.pop();
   decoder_flushing_ = false;
 
   // Set our state to kError.  Just in case.
   decoder_state_ = kError;
 }
 
-bool ExynosVideoDecodeAccelerator::StartDevicePoll() {
+bool V4L2VideoDecodeAccelerator::StartDevicePoll() {
   DVLOG(3) << "StartDevicePoll()";
   DCHECK_EQ(decoder_thread_.message_loop(), base::MessageLoop::current());
   DCHECK(!device_poll_thread_.IsRunning());
 
   // Start up the device poll thread and schedule its first DevicePollTask().
   if (!device_poll_thread_.Start()) {
     DLOG(ERROR) << "StartDevicePoll(): Device thread failed to start";
     NOTIFY_ERROR(PLATFORM_FAILURE);
     return false;
   }
   device_poll_thread_.message_loop()->PostTask(FROM_HERE, base::Bind(
-      &ExynosVideoDecodeAccelerator::DevicePollTask,
+      &V4L2VideoDecodeAccelerator::DevicePollTask,
       base::Unretained(this),
       0));
 
   return true;
 }
 
-bool ExynosVideoDecodeAccelerator::StopDevicePoll(bool keep_mfc_input_state) {
+bool V4L2VideoDecodeAccelerator::StopDevicePoll(bool keep_mfc_input_state) {
   DVLOG(3) << "StopDevicePoll()";
-  DCHECK_EQ(decoder_thread_.message_loop(), base::MessageLoop::current());
+  if (decoder_thread_.IsRunning())
+    DCHECK_EQ(decoder_thread_.message_loop(), base::MessageLoop::current());
 
   // Signal the DevicePollTask() to stop, and stop the device poll thread.
-  if (!SetDevicePollInterrupt())
+  if (!device->SetDevicePollInterrupt(device_poll_interrupt_fd_)) {
+    NOTIFY_ERROR(PLATFORM_FAILURE);
     return false;
+  }
   device_poll_thread_.Stop();
   // Clear the interrupt now, to be sure.
-  if (!ClearDevicePollInterrupt())
+  if (!device->ClearDevicePollInterrupt(device_poll_interrupt_fd_)) {
+    NOTIFY_ERROR(PLATFORM_FAILURE);
     return false;
+  }
 
   // Stop streaming.
   if (!keep_mfc_input_state) {
     if (mfc_input_streamon_) {
       __u32 type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE;
-      IOCTL_OR_ERROR_RETURN_FALSE(mfc_fd_, VIDIOC_STREAMOFF, &type);
+      IOCTL_OR_ERROR_RETURN_FALSE(videodec_fd_, VIDIOC_STREAMOFF, &type);
     }
     mfc_input_streamon_ = false;
   }
   if (mfc_output_streamon_) {
     __u32 type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
-    IOCTL_OR_ERROR_RETURN_FALSE(mfc_fd_, VIDIOC_STREAMOFF, &type);
+    IOCTL_OR_ERROR_RETURN_FALSE(videodec_fd_, VIDIOC_STREAMOFF, &type);
   }
   mfc_output_streamon_ = false;
 
   // Reset all our accounting info.
   if (!keep_mfc_input_state) {
     while (!mfc_input_ready_queue_.empty())
       mfc_input_ready_queue_.pop();
     mfc_free_input_buffers_.clear();
     for (size_t i = 0; i < mfc_input_buffer_map_.size(); ++i) {
       mfc_free_input_buffers_.push_back(i);
@@ skipping 13 matching lines @@
       mfc_free_output_buffers_.push(i);
       mfc_output_buffer_map_[i].at_device = false;
     }
   }
   mfc_output_buffer_queued_count_ = 0;
 
   DVLOG(3) << "StopDevicePoll(): device poll stopped";
   return true;
 }
 
-bool ExynosVideoDecodeAccelerator::SetDevicePollInterrupt() {
+bool V4L2VideoDecodeAccelerator:: ExynosV4L2Device :: SetDevicePollInterrupt(int fd) {

[Pawel Osciak, 2013/12/24 03:45:24]

Please keep methods of one class together (although you should extract to a file
anyway).

   DVLOG(3) << "SetDevicePollInterrupt()";
-  DCHECK_EQ(decoder_thread_.message_loop(), base::MessageLoop::current());
 
   const uint64 buf = 1;
-  if (HANDLE_EINTR(write(device_poll_interrupt_fd_, &buf, sizeof(buf))) == -1) {
+  if (HANDLE_EINTR(write(fd, &buf, sizeof(buf))) == -1) {
     DPLOG(ERROR) << "SetDevicePollInterrupt(): write() failed";
-    NOTIFY_ERROR(PLATFORM_FAILURE);
     return false;
   }
   return true;
 }
 
-bool ExynosVideoDecodeAccelerator::ClearDevicePollInterrupt() {
+bool V4L2VideoDecodeAccelerator:: ExynosV4L2Device :: ClearDevicePollInterrupt(int fd) {
   DVLOG(3) << "ClearDevicePollInterrupt()";
-  DCHECK_EQ(decoder_thread_.message_loop(), base::MessageLoop::current());
 
   uint64 buf;
-  if (HANDLE_EINTR(read(device_poll_interrupt_fd_, &buf, sizeof(buf))) == -1) {
+  if (HANDLE_EINTR(read(fd, &buf, sizeof(buf))) == -1) {
     if (errno == EAGAIN) {
       // No interrupt flag set, and we're reading nonblocking.  Not an error.
       return true;
     } else {
       DPLOG(ERROR) << "ClearDevicePollInterrupt(): read() failed";
-      NOTIFY_ERROR(PLATFORM_FAILURE);
       return false;
     }
   }
   return true;
 }
 
-void ExynosVideoDecodeAccelerator::StartResolutionChangeIfNeeded() {
+void V4L2VideoDecodeAccelerator::StartResolutionChangeIfNeeded() {
   DCHECK_EQ(decoder_thread_.message_loop(), base::MessageLoop::current());
   DCHECK_EQ(decoder_state_, kDecoding);
 
   if (!resolution_change_pending_)
     return;
 
   DVLOG(3) << "No more work, initiate resolution change";
 
   // Keep MFC input queue.
   if (!StopDevicePoll(true))
     return;
 
   decoder_state_ = kChangingResolution;
   DCHECK(resolution_change_pending_);
   resolution_change_pending_ = false;
 
   // Post a task to clean up buffers on child thread. This will also ensure
   // that we won't accept ReusePictureBuffer() anymore after that.
   child_message_loop_proxy_->PostTask(FROM_HERE, base::Bind(
-      &ExynosVideoDecodeAccelerator::ResolutionChangeDestroyBuffers,
+      &V4L2VideoDecodeAccelerator::ResolutionChangeDestroyBuffers,
       weak_this_));
 }
 
-void ExynosVideoDecodeAccelerator::FinishResolutionChange() {
+void V4L2VideoDecodeAccelerator::FinishResolutionChange() {
   DCHECK_EQ(decoder_thread_.message_loop(), base::MessageLoop::current());
   DVLOG(3) << "FinishResolutionChange()";
 
   if (decoder_state_ == kError) {
     DVLOG(2) << "FinishResolutionChange(): early out: kError state";
     return;
   }
 
   struct v4l2_format format;
   bool again;
   bool ret = GetFormatInfo(&format, &again);
   if (!ret || again) {
     DVLOG(3) << "Couldn't get format information after resolution change";
     NOTIFY_ERROR(PLATFORM_FAILURE);
     return;
   }
 
   if (!CreateBuffersForFormat(format)) {
     DVLOG(3) << "Couldn't reallocate buffers after resolution change";
     NOTIFY_ERROR(PLATFORM_FAILURE);
     return;
   }
 
   // From here we stay in kChangingResolution and wait for
   // AssignPictureBuffers() before we can resume.
 }
 
-void ExynosVideoDecodeAccelerator::ResumeAfterResolutionChange() {
+void V4L2VideoDecodeAccelerator::ResumeAfterResolutionChange() {
   DCHECK_EQ(decoder_thread_.message_loop(), base::MessageLoop::current());
   DVLOG(3) << "ResumeAfterResolutionChange()";
 
   decoder_state_ = kDecoding;
 
   if (resolution_change_reset_pending_) {
     resolution_change_reset_pending_ = false;
     ResetTask();
     return;
   }
 
   if (!StartDevicePoll())
     return;
 
   EnqueueMfc();
   ScheduleDecodeBufferTaskIfNeeded();
 }
 
-void ExynosVideoDecodeAccelerator::DevicePollTask(unsigned int poll_fds) {
+void V4L2VideoDecodeAccelerator::DevicePollTask(unsigned int poll_fds) {
   DVLOG(3) << "DevicePollTask()";
   DCHECK_EQ(device_poll_thread_.message_loop(), base::MessageLoop::current());
   TRACE_EVENT0("Video Decoder", "EVDA::DevicePollTask");
 
   // This routine just polls the set of device fds, and schedules a
   // ServiceDeviceTask() on decoder_thread_ when processing needs to occur.
   // Other threads may notify this task to return early by writing to
   // device_poll_interrupt_fd_.
   struct pollfd pollfds[3];
   nfds_t nfds;
   int mfc_pollfd = -1;
 
   // Add device_poll_interrupt_fd_;
   pollfds[0].fd = device_poll_interrupt_fd_;
   pollfds[0].events = POLLIN | POLLERR;
   nfds = 1;
 
   if (poll_fds & kPollMfc) {
     DVLOG(3) << "DevicePollTask(): adding MFC to poll() set";
-    pollfds[nfds].fd = mfc_fd_;
+    pollfds[nfds].fd = videodec_fd_;
     pollfds[nfds].events = POLLIN | POLLOUT | POLLERR | POLLPRI;
     mfc_pollfd = nfds;
     nfds++;
   }
 
   // Poll it!
-  if (HANDLE_EINTR(poll(pollfds, nfds, -1)) == -1) {
+  if (HANDLE_EINTR(device->dev_poll(pollfds, nfds, -1)) == -1) {
     DPLOG(ERROR) << "DevicePollTask(): poll() failed";
     NOTIFY_ERROR(PLATFORM_FAILURE);
     return;
   }
 
   bool mfc_event_pending = (mfc_pollfd != -1 &&
                             pollfds[mfc_pollfd].revents & POLLPRI);
 
   // All processing should happen on ServiceDeviceTask(), since we shouldn't
   // touch decoder state from this thread.
   decoder_thread_.message_loop()->PostTask(FROM_HERE, base::Bind(
-      &ExynosVideoDecodeAccelerator::ServiceDeviceTask,
+      &V4L2VideoDecodeAccelerator::ServiceDeviceTask,
       base::Unretained(this), mfc_event_pending));
 }
 
-void ExynosVideoDecodeAccelerator::NotifyError(Error error) {
+void V4L2VideoDecodeAccelerator::NotifyError(Error error) {
   DVLOG(2) << "NotifyError()";
 
   if (!child_message_loop_proxy_->BelongsToCurrentThread()) {
     child_message_loop_proxy_->PostTask(FROM_HERE, base::Bind(
-        &ExynosVideoDecodeAccelerator::NotifyError, weak_this_, error));
+        &V4L2VideoDecodeAccelerator::NotifyError, weak_this_, error));
     return;
   }
 
   if (client_) {
     client_->NotifyError(error);
     client_ptr_factory_.InvalidateWeakPtrs();
   }
 }
 
-void ExynosVideoDecodeAccelerator::SetDecoderState(State state) {
+void V4L2VideoDecodeAccelerator::SetDecoderState(State state) {
   DVLOG(3) << "SetDecoderState(): state=" << state;
 
   // We can touch decoder_state_ only if this is the decoder thread or the
   // decoder thread isn't running.
   if (decoder_thread_.message_loop() != NULL &&
       decoder_thread_.message_loop() != base::MessageLoop::current()) {
     decoder_thread_.message_loop()->PostTask(FROM_HERE, base::Bind(
-        &ExynosVideoDecodeAccelerator::SetDecoderState,
+        &V4L2VideoDecodeAccelerator::SetDecoderState,
         base::Unretained(this), state));
   } else {
     decoder_state_ = state;
   }
 }
 
-bool ExynosVideoDecodeAccelerator::GetFormatInfo(struct v4l2_format* format,
+bool V4L2VideoDecodeAccelerator::GetFormatInfo(struct v4l2_format* format,
                                                  bool* again) {
   DCHECK_EQ(decoder_thread_.message_loop(), base::MessageLoop::current());
 
   *again = false;
   memset(format, 0, sizeof(*format));
   format->type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
-  if (HANDLE_EINTR(ioctl(mfc_fd_, VIDIOC_G_FMT, format)) != 0) {
+  if (HANDLE_EINTR(device->dev_ioctl(videodec_fd_, VIDIOC_G_FMT, format)) != 0) {
     if (errno == EINVAL) {
       // EINVAL means we haven't seen sufficient stream to decode the format.
       *again = true;
       return true;
     } else {
       DPLOG(ERROR) << "DecodeBufferInitial(): ioctl() failed: VIDIOC_G_FMT";
       NOTIFY_ERROR(PLATFORM_FAILURE);
       return false;
     }
   }
 
   return true;
 }
 
-bool ExynosVideoDecodeAccelerator::CreateBuffersForFormat(
+bool V4L2VideoDecodeAccelerator::CreateBuffersForFormat(
     const struct v4l2_format& format) {
   DCHECK_EQ(decoder_thread_.message_loop(), base::MessageLoop::current());
   CHECK_EQ(format.fmt.pix_mp.num_planes, 2);
   frame_buffer_size_.SetSize(
       format.fmt.pix_mp.width, format.fmt.pix_mp.height);
   mfc_output_buffer_pixelformat_ = format.fmt.pix_mp.pixelformat;
   DCHECK_EQ(mfc_output_buffer_pixelformat_, V4L2_PIX_FMT_NV12M);
   DVLOG(3) << "CreateBuffersForFormat(): new resolution: "
            << frame_buffer_size_.ToString();
 
   if (!CreateMfcOutputBuffers())
     return false;
 
   return true;
 }
 
-bool ExynosVideoDecodeAccelerator::CreateMfcInputBuffers() {
+bool V4L2VideoDecodeAccelerator::CreateMfcInputBuffers() {
   DVLOG(3) << "CreateMfcInputBuffers()";
   // We always run this as we prepare to initialize.
   DCHECK_EQ(decoder_state_, kUninitialized);
   DCHECK(!mfc_input_streamon_);
   DCHECK(mfc_input_buffer_map_.empty());
 
   __u32 pixelformat = 0;
   if (video_profile_ >= media::H264PROFILE_MIN &&
       video_profile_ <= media::H264PROFILE_MAX) {
     pixelformat = V4L2_PIX_FMT_H264;
   } else if (video_profile_ >= media::VP8PROFILE_MIN &&
              video_profile_ <= media::VP8PROFILE_MAX) {
     pixelformat = V4L2_PIX_FMT_VP8;
   } else {
     NOTREACHED();
   }
 
   struct v4l2_format format;
   memset(&format, 0, sizeof(format));
   format.type                              = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE;
   format.fmt.pix_mp.pixelformat            = pixelformat;
   format.fmt.pix_mp.plane_fmt[0].sizeimage = kMfcInputBufferMaxSize;
   format.fmt.pix_mp.num_planes             = 1;
-  IOCTL_OR_ERROR_RETURN_FALSE(mfc_fd_, VIDIOC_S_FMT, &format);
+  IOCTL_OR_ERROR_RETURN_FALSE(videodec_fd_, VIDIOC_S_FMT, &format);
 
   struct v4l2_requestbuffers reqbufs;
   memset(&reqbufs, 0, sizeof(reqbufs));
   reqbufs.count  = kMfcInputBufferCount;
   reqbufs.type   = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE;
   reqbufs.memory = V4L2_MEMORY_MMAP;
-  IOCTL_OR_ERROR_RETURN_FALSE(mfc_fd_, VIDIOC_REQBUFS, &reqbufs);
+  IOCTL_OR_ERROR_RETURN_FALSE(videodec_fd_, VIDIOC_REQBUFS, &reqbufs);
   mfc_input_buffer_map_.resize(reqbufs.count);
   for (size_t i = 0; i < mfc_input_buffer_map_.size(); ++i) {
     mfc_free_input_buffers_.push_back(i);
 
     // Query for the MEMORY_MMAP pointer.
     struct v4l2_plane planes[1];
     struct v4l2_buffer buffer;
     memset(&buffer, 0, sizeof(buffer));
     memset(planes, 0, sizeof(planes));
     buffer.index    = i;
     buffer.type     = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE;
     buffer.memory   = V4L2_MEMORY_MMAP;
     buffer.m.planes = planes;
     buffer.length   = 1;
-    IOCTL_OR_ERROR_RETURN_FALSE(mfc_fd_, VIDIOC_QUERYBUF, &buffer);
-    void* address = mmap(NULL, buffer.m.planes[0].length,
-        PROT_READ | PROT_WRITE, MAP_SHARED, mfc_fd_,
+    IOCTL_OR_ERROR_RETURN_FALSE(videodec_fd_, VIDIOC_QUERYBUF, &buffer);
+    void* address = device->dev_mmap(NULL, buffer.m.planes[0].length,
+        PROT_READ | PROT_WRITE, MAP_SHARED, videodec_fd_,
         buffer.m.planes[0].m.mem_offset);
     if (address == MAP_FAILED) {
       DPLOG(ERROR) << "CreateMfcInputBuffers(): mmap() failed";
       return false;
     }
     mfc_input_buffer_map_[i].address = address;
     mfc_input_buffer_map_[i].length = buffer.m.planes[0].length;
   }
 
   return true;
 }
 
-bool ExynosVideoDecodeAccelerator::CreateMfcOutputBuffers() {
+bool V4L2VideoDecodeAccelerator::CreateMfcOutputBuffers() {
   DVLOG(3) << "CreateMfcOutputBuffers()";
   DCHECK(decoder_state_ == kInitialized ||
          decoder_state_ == kChangingResolution);
   DCHECK(!mfc_output_streamon_);
   DCHECK(mfc_output_buffer_map_.empty());
 
   // Number of MFC output buffers we need.
   struct v4l2_control ctrl;
   memset(&ctrl, 0, sizeof(ctrl));
   ctrl.id = V4L2_CID_MIN_BUFFERS_FOR_CAPTURE;
-  IOCTL_OR_ERROR_RETURN_FALSE(mfc_fd_, VIDIOC_G_CTRL, &ctrl);
+  IOCTL_OR_ERROR_RETURN_FALSE(videodec_fd_, VIDIOC_G_CTRL, &ctrl);
   mfc_output_dpb_size_ = ctrl.value;
 
   // Output format setup in Initialize().
 
   // Allocate the output buffers.
   struct v4l2_requestbuffers reqbufs;
   memset(&reqbufs, 0, sizeof(reqbufs));
   reqbufs.count  = mfc_output_dpb_size_ + kDpbOutputBufferExtraCount;
   reqbufs.type   = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
   reqbufs.memory = V4L2_MEMORY_MMAP;
-  IOCTL_OR_ERROR_RETURN_FALSE(mfc_fd_, VIDIOC_REQBUFS, &reqbufs);
+  IOCTL_OR_ERROR_RETURN_FALSE(videodec_fd_, VIDIOC_REQBUFS, &reqbufs);
 
   // Create DMABUFs from output buffers.
   mfc_output_buffer_map_.resize(reqbufs.count);
   for (size_t i = 0; i < mfc_output_buffer_map_.size(); ++i) {
     MfcOutputRecord& output_record = mfc_output_buffer_map_[i];
     for (size_t j = 0; j < arraysize(output_record.fds); ++j) {
       // Export the DMABUF fd so we can export it as a texture.
       struct v4l2_exportbuffer expbuf;
       memset(&expbuf, 0, sizeof(expbuf));
       expbuf.type  = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
       expbuf.index = i;
       expbuf.plane = j;
       expbuf.flags = O_CLOEXEC;
-      IOCTL_OR_ERROR_RETURN_FALSE(mfc_fd_, VIDIOC_EXPBUF, &expbuf);
+      IOCTL_OR_ERROR_RETURN_FALSE(videodec_fd_, VIDIOC_EXPBUF, &expbuf);
       output_record.fds[j] = expbuf.fd;
     }
   }
 
   DVLOG(3) << "CreateMfcOutputBuffers(): ProvidePictureBuffers(): "
            << "buffer_count=" << mfc_output_buffer_map_.size()
            << ", width=" << frame_buffer_size_.width()
            << ", height=" << frame_buffer_size_.height();
   child_message_loop_proxy_->PostTask(FROM_HERE,
                                       base::Bind(&Client::ProvidePictureBuffers,
                                                  client_,
                                                  mfc_output_buffer_map_.size(),
                                                  frame_buffer_size_,
                                                  GL_TEXTURE_EXTERNAL_OES));
 
   return true;
 }
 
-void ExynosVideoDecodeAccelerator::DestroyMfcInputBuffers() {
+void V4L2VideoDecodeAccelerator::DestroyMfcInputBuffers() {
   DVLOG(3) << "DestroyMfcInputBuffers()";
   DCHECK(child_message_loop_proxy_->BelongsToCurrentThread());
   DCHECK(!mfc_input_streamon_);
 
   for (size_t i = 0; i < mfc_input_buffer_map_.size(); ++i) {
     if (mfc_input_buffer_map_[i].address != NULL) {
-      munmap(mfc_input_buffer_map_[i].address,
+      device->dev_munmap(mfc_input_buffer_map_[i].address,
           mfc_input_buffer_map_[i].length);
     }
   }
 
   struct v4l2_requestbuffers reqbufs;
   memset(&reqbufs, 0, sizeof(reqbufs));
   reqbufs.count = 0;
   reqbufs.type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE;
   reqbufs.memory = V4L2_MEMORY_MMAP;
-  if (ioctl(mfc_fd_, VIDIOC_REQBUFS, &reqbufs) != 0)
+  if (device->dev_ioctl(videodec_fd_, VIDIOC_REQBUFS, &reqbufs) != 0)
     DPLOG(ERROR) << "DestroyMfcInputBuffers(): ioctl() failed: VIDIOC_REQBUFS";
 
   mfc_input_buffer_map_.clear();
   mfc_free_input_buffers_.clear();
 }
 
-void ExynosVideoDecodeAccelerator::DestroyMfcOutputBuffers() {
+void V4L2VideoDecodeAccelerator::DestroyMfcOutputBuffers() {
   DVLOG(3) << "DestroyMfcOutputBuffers()";
   DCHECK(child_message_loop_proxy_->BelongsToCurrentThread());
   DCHECK(!mfc_output_streamon_);
 
   if (mfc_output_buffer_map_.size() != 0) {
+    // TODO(sheu, posciak): Making the context current should not be required
+    // anymore. Remove it and verify (crbug.com/327869).
     if (!make_context_current_.Run()) {
       DLOG(ERROR) << "DestroyMfcOutputBuffers(): "
                   << "could not make context current";
     } else {
       size_t i = 0;
       do {
         MfcOutputRecord& output_record = mfc_output_buffer_map_[i];
         for (size_t j = 0; j < arraysize(output_record.fds); ++j) {
           if (output_record.fds[j] != -1)
-            close(output_record.fds[j]);
+            device->dev_close(output_record.fds[j]);
           if (output_record.egl_image != EGL_NO_IMAGE_KHR)
             eglDestroyImageKHR(egl_display_, output_record.egl_image);
           if (output_record.egl_sync != EGL_NO_SYNC_KHR)
             eglDestroySyncKHR(egl_display_, output_record.egl_sync);
         }
         DVLOG(1) << "DestroyMfcOutputBuffers(): dismissing PictureBuffer id="
                  << output_record.picture_id;
         child_message_loop_proxy_->PostTask(
             FROM_HERE,
             base::Bind(&Client::DismissPictureBuffer,
                        client_,
                        output_record.picture_id));
         i++;
       } while (i < mfc_output_buffer_map_.size());
     }
   }
 
   struct v4l2_requestbuffers reqbufs;
   memset(&reqbufs, 0, sizeof(reqbufs));
   reqbufs.count = 0;
   reqbufs.type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
   reqbufs.memory = V4L2_MEMORY_MMAP;
-  if (ioctl(mfc_fd_, VIDIOC_REQBUFS, &reqbufs) != 0)
+  if (device->dev_ioctl(videodec_fd_, VIDIOC_REQBUFS, &reqbufs) != 0)
     DPLOG(ERROR) << "DestroyMfcOutputBuffers() ioctl() failed: VIDIOC_REQBUFS";
 
   mfc_output_buffer_map_.clear();
   while (!mfc_free_output_buffers_.empty())
     mfc_free_output_buffers_.pop();
 }
 
-void ExynosVideoDecodeAccelerator::ResolutionChangeDestroyBuffers() {
+void V4L2VideoDecodeAccelerator::ResolutionChangeDestroyBuffers() {
   DCHECK(child_message_loop_proxy_->BelongsToCurrentThread());
   DVLOG(3) << "ResolutionChangeDestroyBuffers()";
 
   DestroyMfcOutputBuffers();
 
   // Finish resolution change on decoder thread.
   decoder_thread_.message_loop()->PostTask(FROM_HERE, base::Bind(
-      &ExynosVideoDecodeAccelerator::FinishResolutionChange,
+      &V4L2VideoDecodeAccelerator::FinishResolutionChange,
       base::Unretained(this)));
 }
 
-void ExynosVideoDecodeAccelerator::SendPictureReady() {
+void V4L2VideoDecodeAccelerator::SendPictureReady() {
   DVLOG(3) << "SendPictureReady()";
   DCHECK_EQ(decoder_thread_.message_loop(), base::MessageLoop::current());
   bool resetting_or_flushing =
       (decoder_state_ == kResetting || decoder_flushing_);
   while (pending_picture_ready_.size() > 0) {
     bool cleared = pending_picture_ready_.front().cleared;
     const media::Picture& picture = pending_picture_ready_.front().picture;
     if (cleared && picture_clearing_count_ == 0) {
       // This picture is cleared. Post it to IO thread to reduce latency. This
       // should be the case after all pictures are cleared at the beginning.
       io_message_loop_proxy_->PostTask(
           FROM_HERE, base::Bind(&Client::PictureReady, io_client_, picture));
       pending_picture_ready_.pop();
     } else if (!cleared || resetting_or_flushing) {
       DVLOG(3) << "SendPictureReady()"
                << ". cleared=" << pending_picture_ready_.front().cleared
                << ", decoder_state_=" << decoder_state_
                << ", decoder_flushing_=" << decoder_flushing_
                << ", picture_clearing_count_=" << picture_clearing_count_;
       // If the picture is not cleared, post it to the child thread because it
       // has to be cleared in the child thread. A picture only needs to be
       // cleared once. If the decoder is resetting or flushing, send all
       // pictures to ensure PictureReady arrive before reset or flush done.
       child_message_loop_proxy_->PostTaskAndReply(
           FROM_HERE,
           base::Bind(&Client::PictureReady, client_, picture),
           // Unretained is safe. If Client::PictureReady gets to run, |this| is
           // alive. Destroy() will wait the decode thread to finish.
-          base::Bind(&ExynosVideoDecodeAccelerator::PictureCleared,
+          base::Bind(&V4L2VideoDecodeAccelerator::PictureCleared,
                      base::Unretained(this)));
       picture_clearing_count_++;
       pending_picture_ready_.pop();
     } else {
       // This picture is cleared. But some pictures are about to be cleared on
       // the child thread. To preserve the order, do not send this until those
       // pictures are cleared.
       break;
     }
   }
 }
 
-void ExynosVideoDecodeAccelerator::PictureCleared() {
+void V4L2VideoDecodeAccelerator::PictureCleared() {
   DVLOG(3) << "PictureCleared(). clearing count=" << picture_clearing_count_;
   DCHECK_EQ(decoder_thread_.message_loop(), base::MessageLoop::current());
   DCHECK_GT(picture_clearing_count_, 0);
   picture_clearing_count_--;
   SendPictureReady();
 }
 
 }  // namespace content