generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add supporting to V4L2_PIX_FMT_JPEG since it works same as MJPEG.

Browse Source 
ISSUE=529
TEST=unittest
Review URL: https://webrtc-codereview.appspot.com/1120006

git-svn-id: http://webrtc.googlecode.com/svn/trunk@3580 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
braveyao@webrtc.org 2013-02-28 10:08:02 +00:00
parent 9e254133ad
commit 6b6eb44cca
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
webrtc/modules/video_capture/linux/video_capture_linux.cc
View File

@ -153,16 +153,18 @@ WebRtc_Word32 VideoCaptureModuleV4L2::StartCapture(
// Supported video formats in preferred order. // Supported video formats in preferred order.
// If the requested resolution is larger than VGA, we prefer MJPEG. Go for // If the requested resolution is larger than VGA, we prefer MJPEG. Go for
// I420 otherwise. // I420 otherwise.
const int nFormats = 3; const int nFormats = 4;
unsigned int fmts[nFormats]; unsigned int fmts[nFormats];
if (capability.width > 640 || capability.height > 480) { if (capability.width > 640 || capability.height > 480) {
fmts[0] = V4L2_PIX_FMT_MJPEG; fmts[0] = V4L2_PIX_FMT_MJPEG;
fmts[1] = V4L2_PIX_FMT_YUV420; fmts[1] = V4L2_PIX_FMT_YUV420;
fmts[2] = V4L2_PIX_FMT_YUYV; fmts[2] = V4L2_PIX_FMT_YUYV;
fmts[3] = V4L2_PIX_FMT_JPEG;
} else { } else {
fmts[0] = V4L2_PIX_FMT_YUV420; fmts[0] = V4L2_PIX_FMT_YUV420;
fmts[1] = V4L2_PIX_FMT_YUYV; fmts[1] = V4L2_PIX_FMT_YUYV;
fmts[2] = V4L2_PIX_FMT_MJPEG; fmts[2] = V4L2_PIX_FMT_MJPEG;
fmts[3] = V4L2_PIX_FMT_JPEG;
} }
// Enumerate image formats. // Enumerate image formats.
@ -212,7 +214,8 @@ WebRtc_Word32 VideoCaptureModuleV4L2::StartCapture(
_captureVideoType = kVideoYUY2; _captureVideoType = kVideoYUY2;
else if (video_fmt.fmt.pix.pixelformat == V4L2_PIX_FMT_YUV420) else if (video_fmt.fmt.pix.pixelformat == V4L2_PIX_FMT_YUV420)
_captureVideoType = kVideoI420; _captureVideoType = kVideoI420;
else if (video_fmt.fmt.pix.pixelformat == V4L2_PIX_FMT_MJPEG) else if (video_fmt.fmt.pix.pixelformat == V4L2_PIX_FMT_MJPEG ||
video_fmt.fmt.pix.pixelformat == V4L2_PIX_FMT_JPEG)
_captureVideoType = kVideoMJPEG; _captureVideoType = kVideoMJPEG;
//set format and frame size now //set format and frame size now