From ce824a56750b490919571196c610a064f2e17ecb Mon Sep 17 00:00:00 2001 From: magjed Date: Wed, 3 Sep 2014 11:46:53 -0700 Subject: Add support for pixel format UYVY in Linux video capture BUG=410202 TEST=Use Kinect camera on Linux. Go to page https://src.chromium.org/svn/trunk/src/chrome/test/data/webrtc/manual/peerconnection.html. Press button "Get devices". An entry "Microsoft Kinect Camera" should show up in the "Video source" list. Press button "Request GetUserMedia". You should get a stream with size 640x480 in the preview. Review URL: https://codereview.chromium.org/539443003 Cr-Commit-Position: refs/heads/master@{#293178} --- media/video/capture/linux/video_capture_device_linux.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/media/video/capture/linux/video_capture_device_linux.cc b/media/video/capture/linux/video_capture_device_linux.cc index 33a91c4..0192daba 100644 --- a/media/video/capture/linux/video_capture_device_linux.cc +++ b/media/video/capture/linux/video_capture_device_linux.cc @@ -43,7 +43,8 @@ enum { kTypicalFramerate = 30 }; // V4L2 color formats VideoCaptureDeviceLinux support. static const int32 kV4l2RawFmts[] = { V4L2_PIX_FMT_YUV420, - V4L2_PIX_FMT_YUYV + V4L2_PIX_FMT_YUYV, + V4L2_PIX_FMT_UYVY }; // USB VID and PID are both 4 bytes long. @@ -82,6 +83,9 @@ VideoPixelFormat VideoCaptureDeviceLinux::V4l2ColorToVideoCaptureColorFormat( case V4L2_PIX_FMT_YUYV: result = PIXEL_FORMAT_YUY2; break; + case V4L2_PIX_FMT_UYVY: + result = PIXEL_FORMAT_UYVY; + break; case V4L2_PIX_FMT_MJPEG: case V4L2_PIX_FMT_JPEG: result = PIXEL_FORMAT_MJPEG; -- cgit v1.1