From: Sensoray Linux Development <linux-dev@sensoray.com>
Date: Mon, 4 Apr 2011 18:16:26 +0000 (-0300)
Subject: [media] s2255drv: adding MJPEG format
X-Git-Tag: v3.0-rc1~47^2~166
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d0ef8540f211ba7cde748ef4f0272cd49bfdb520;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

[media] s2255drv: adding MJPEG format

adding MJPEG format

Signed-off-by: Dean Anderson <linux-dev@sensoray.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---

diff --git a/drivers/media/video/s2255drv.c b/drivers/media/video/s2255drv.c
index 01a98c0..46506d8 100644
--- a/drivers/media/video/s2255drv.c
+++ b/drivers/media/video/s2255drv.c
@@ -433,6 +433,10 @@ static const struct s2255_fmt formats[] = {
 		.fourcc = V4L2_PIX_FMT_JPEG,
 		.depth = 24
 	}, {
+		.name = "MJPG",
+		.fourcc = V4L2_PIX_FMT_MJPEG,
+		.depth = 24
+	}, {
 		.name = "8bpp GREY",
 		.fourcc = V4L2_PIX_FMT_GREY,
 		.depth = 8
@@ -653,6 +657,7 @@ static void s2255_fillbuff(struct s2255_channel *channel,
 			memcpy(vbuf, tmpbuf, buf->vb.width * buf->vb.height);
 			break;
 		case V4L2_PIX_FMT_JPEG:
+		case V4L2_PIX_FMT_MJPEG:
 			buf->vb.size = jpgsize;
 			memcpy(vbuf, tmpbuf, buf->vb.size);
 			break;
@@ -1037,6 +1042,7 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
 		mode.color |= COLOR_Y8;
 		break;
 	case V4L2_PIX_FMT_JPEG:
+	case V4L2_PIX_FMT_MJPEG:
 		mode.color &= ~MASK_COLOR;
 		mode.color |= COLOR_JPG;
 		mode.color |= (channel->jc.quality << 8);