Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(96)

Unified Diff: media/capture/video/linux/v4l2_capture_delegate_single_plane.cc

Issue 1685713003: Remove V4L2CaptureDelegate{Single,Multi}Plane, VCD::Client::OnIncomingCapturedYuvData() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: perkj@ comments and reverted change to WeakPtr Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/capture/video/linux/v4l2_capture_delegate_single_plane.cc
diff --git a/media/capture/video/linux/v4l2_capture_delegate_single_plane.cc b/media/capture/video/linux/v4l2_capture_delegate_single_plane.cc
deleted file mode 100644
index 722eedcdc319dc05a6b100466774dbc4d7f58d18..0000000000000000000000000000000000000000
--- a/media/capture/video/linux/v4l2_capture_delegate_single_plane.cc
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright 2015 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 "media/capture/video/linux/v4l2_capture_delegate_single_plane.h"
-
-#include <sys/mman.h>
-
-namespace media {
-
-scoped_refptr<V4L2CaptureDelegate::BufferTracker>
-V4L2CaptureDelegateSinglePlane::CreateBufferTracker() const {
- return make_scoped_refptr(new BufferTrackerSPlane());
-}
-
-bool V4L2CaptureDelegateSinglePlane::FillV4L2Format(
- v4l2_format* format,
- uint32_t width,
- uint32_t height,
- uint32_t pixelformat_fourcc) const {
- format->fmt.pix.width = width;
- format->fmt.pix.height = height;
- format->fmt.pix.pixelformat = pixelformat_fourcc;
- return true;
-}
-
-void V4L2CaptureDelegateSinglePlane::FinishFillingV4L2Buffer(
- v4l2_buffer* buffer) const {
- buffer->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-}
-
-void V4L2CaptureDelegateSinglePlane::SetPayloadSize(
- const scoped_refptr<BufferTracker>& buffer_tracker,
- const v4l2_buffer& buffer) const {
- buffer_tracker->SetPlanePayloadSize(0, buffer.bytesused);
-}
-
-void V4L2CaptureDelegateSinglePlane::SendBuffer(
- const scoped_refptr<BufferTracker>& buffer_tracker,
- const v4l2_format& format) const {
- client()->OnIncomingCapturedData(
- buffer_tracker->GetPlaneStart(0), buffer_tracker->GetPlanePayloadSize(0),
- capture_format(), rotation(), base::TimeTicks::Now());
-}
-
-bool V4L2CaptureDelegateSinglePlane::BufferTrackerSPlane::Init(
- int fd,
- const v4l2_buffer& buffer) {
- // Some devices require mmap() to be called with both READ and WRITE.
- // See http://crbug.com/178582.
- void* const start = mmap(NULL, buffer.length, PROT_READ | PROT_WRITE,
- MAP_SHARED, fd, buffer.m.offset);
- if (start == MAP_FAILED) {
- DLOG(ERROR) << "Error mmap()ing a V4L2 buffer into userspace";
- return false;
- }
- AddMmapedPlane(static_cast<uint8_t*>(start), buffer.length);
- return true;
-}
-
-} // namespace media

Powered by Google App Engine
This is Rietveld 408576698