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

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

Issue 2398463003: 16 bit capture and GPU&CPU memory buffer support.
Patch Set: fixes. Created 4 years, 2 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.cc
diff --git a/media/capture/video/linux/v4l2_capture_delegate.cc b/media/capture/video/linux/v4l2_capture_delegate.cc
index 4090a5f5673b405e74c269d59e8f91947bbf9e67..4a26966a9c7ab9cd4d85b6b2f4e91e6f38bf5649 100644
--- a/media/capture/video/linux/v4l2_capture_delegate.cc
+++ b/media/capture/video/linux/v4l2_capture_delegate.cc
@@ -16,8 +16,18 @@
#include "base/strings/stringprintf.h"
#include "build/build_config.h"
#include "media/base/bind_to_current_loop.h"
-#include "media/capture/video/blob_utils.h"
#include "media/capture/video/linux/video_capture_device_linux.h"
+#include "media/capture/video/video_capture_utils.h"
+
+// TODO(astojilj): Remove V4L2_PIX_FMT_Z16/INVZ when videodev2.h gets updated.
+#ifndef V4L2_PIX_FMT_Z16
+// 16 bit depth, Realsense F200.
+#define V4L2_PIX_FMT_Z16 v4l2_fourcc('Z', '1', '6', ' ')
+#endif
+#ifndef V4L2_PIX_FMT_INVZ
+// 16 bit depth, Realsense SR300.
+#define V4L2_PIX_FMT_INVZ v4l2_fourcc('I', 'N', 'V', 'Z')
+#endif
namespace media {
@@ -50,6 +60,9 @@ static struct {
size_t num_planes;
} const kSupportedFormatsAndPlanarity[] = {
{V4L2_PIX_FMT_YUV420, PIXEL_FORMAT_I420, 1},
+ {V4L2_PIX_FMT_Y16, PIXEL_FORMAT_Y16, 1},
+ {V4L2_PIX_FMT_Z16, PIXEL_FORMAT_Y16, 1},
+ {V4L2_PIX_FMT_INVZ, PIXEL_FORMAT_Y16, 1},
{V4L2_PIX_FMT_YUYV, PIXEL_FORMAT_YUY2, 1},
{V4L2_PIX_FMT_UYVY, PIXEL_FORMAT_UYVY, 1},
{V4L2_PIX_FMT_RGB24, PIXEL_FORMAT_RGB24, 1},
@@ -533,9 +546,16 @@ void V4L2CaptureDelegate::DoCapture() {
base::TimeDelta timestamp =
base::TimeDelta::FromSeconds(buffer.timestamp.tv_sec) +
base::TimeDelta::FromMicroseconds(buffer.timestamp.tv_usec);
- client_->OnIncomingCapturedData(
- buffer_tracker->start(), buffer_tracker->payload_size(),
- capture_format_, rotation_, base::TimeTicks::Now(), timestamp);
+#ifdef V4L2_BUF_FLAG_ERROR
+ if (buffer.flags & V4L2_BUF_FLAG_ERROR) {
+ LOG(ERROR) << "Dequeued v4l2 buffer contains corrupted data ("
+ << buffer.bytesused << " bytes).";
+ buffer.bytesused = 0;
+ } else
+#endif
+ client_->OnIncomingCapturedData(
+ buffer_tracker->start(), buffer_tracker->payload_size(),
+ capture_format_, rotation_, base::TimeTicks::Now(), timestamp);
while (!take_photo_callbacks_.empty()) {
VideoCaptureDevice::TakePhotoCallback cb =
« no previous file with comments | « media/capture/video/fake_video_capture_device_unittest.cc ('k') | media/capture/video/video_capture_device_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698