From f3811194a5782c829bc5e8415bd6173b9bf848fe Mon Sep 17 00:00:00 2001
From: "mflodman@webrtc.org"
 <mflodman@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>
Date: Mon, 27 Feb 2012 08:10:17 +0000
Subject: [PATCH] Enable mjpg capture for Linux.

BUG=306
TEST=ViE Loopback test using resolution larger than 640x480.

Review URL: https://webrtc-codereview.appspot.com/411001

git-svn-id: http://webrtc.googlecode.com/svn/trunk@1768 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 .../video_capture/main/source/Linux/video_capture_linux.cc | 7 -------
 .../video_capture/main/source/video_capture_impl.cc        | 2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/modules/video_capture/main/source/Linux/video_capture_linux.cc b/src/modules/video_capture/main/source/Linux/video_capture_linux.cc
index 8468d49c92..6b47f24bdc 100644
--- a/src/modules/video_capture/main/source/Linux/video_capture_linux.cc
+++ b/src/modules/video_capture/main/source/Linux/video_capture_linux.cc
@@ -27,8 +27,6 @@
 #include "critical_section_wrapper.h"
 #include "video_capture_linux.h"
 
-// #define WEBRTC_MJPEG
-
 namespace webrtc
 {
 namespace videocapturemodule
@@ -153,10 +151,6 @@ WebRtc_Word32 VideoCaptureModuleV4L2::StartCapture(
     }
 
     // Supported video formats in preferred order.
-#ifndef WEBRTC_MJPEG
-    const int nFormats = 2;
-    unsigned int fmts[nFormats] = { V4L2_PIX_FMT_YUV420, V4L2_PIX_FMT_YUYV };
-#else
     // If the requested resolution is larger than VGA, we prefer MJPEG. Go for
     // I420 otherwise.
     const int nFormats = 3;
@@ -170,7 +164,6 @@ WebRtc_Word32 VideoCaptureModuleV4L2::StartCapture(
         fmts[1] = V4L2_PIX_FMT_YUYV;
         fmts[2] = V4L2_PIX_FMT_MJPEG;
     }
-#endif
 
     struct v4l2_format video_fmt;
     memset(&video_fmt, 0, sizeof(struct v4l2_format));
diff --git a/src/modules/video_capture/main/source/video_capture_impl.cc b/src/modules/video_capture/main/source/video_capture_impl.cc
index 59b0dac470..f976d10f53 100644
--- a/src/modules/video_capture/main/source/video_capture_impl.cc
+++ b/src/modules/video_capture/main/source/video_capture_impl.cc
@@ -295,7 +295,7 @@ WebRtc_Word32 VideoCaptureImpl::IncomingFrame(
                                                    videoFrame,
                                                    0, 0,  // No cropping
                                                    width, height,
-                                                   0,  // Ignored for non-JPG.
+                                                   videoFrameLength,
                                                    width, height, dstStride,
                                                    _rotateFrame,
                                                    _captureFrame.Buffer());