From d0ef8540f211ba7cde748ef4f0272cd49bfdb520 Mon Sep 17 00:00:00 2001
From: Sensoray Linux Development <linux-dev@sensoray.com>
Date: Mon, 4 Apr 2011 15:16:26 -0300
Subject: [PATCH] [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>
---
drivers/media/video/s2255drv.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/drivers/media/video/s2255drv.c b/drivers/media/video/s2255drv.c
index 01a98c0d3950..46506d8381a2 100644
--- a/drivers/media/video/s2255drv.c
+++ b/drivers/media/video/s2255drv.c
@@ -432,6 +432,10 @@ static const struct s2255_fmt formats[] = {
.name = "JPG",
.fourcc = V4L2_PIX_FMT_JPEG,
.depth = 24
+ }, {
+ .name = "MJPG",
+ .fourcc = V4L2_PIX_FMT_MJPEG,
+ .depth = 24
}, {
.name = "8bpp GREY",
.fourcc = V4L2_PIX_FMT_GREY,
@@ -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);
--
GitLab