* [PATCH 1/2][media] s2255drv: adding MJPEG format
@ 2011-04-04 18:16 Sensoray Linux Development
2011-05-02 16:36 ` Mauro Carvalho Chehab
0 siblings, 1 reply; 2+ messages in thread
From: Sensoray Linux Development @ 2011-04-04 18:16 UTC (permalink / raw)
To: Linux Media Mailing List
adding MJPEG format
Signed-off-by: Dean Anderson <linux-dev@sensoray.com>
---
drivers/media/video/s2255drv.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/drivers/media/video/s2255drv.c b/drivers/media/video/s2255drv.c
index b12e28e..38e5c4b 100644
--- a/drivers/media/video/s2255drv.c
+++ b/drivers/media/video/s2255drv.c
@@ -428,6 +428,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
@@ -648,6 +652,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;
@@ -1032,6 +1037,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);
--
1.7.0.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 1/2][media] s2255drv: adding MJPEG format
2011-04-04 18:16 [PATCH 1/2][media] s2255drv: adding MJPEG format Sensoray Linux Development
@ 2011-05-02 16:36 ` Mauro Carvalho Chehab
0 siblings, 0 replies; 2+ messages in thread
From: Mauro Carvalho Chehab @ 2011-05-02 16:36 UTC (permalink / raw)
To: Sensoray Linux Development; +Cc: Linux Media Mailing List
Em 04-04-2011 15:16, Sensoray Linux Development escreveu:
> adding MJPEG format
>
Please be careful when sending patches. I had to manually apply the hunks,
as whitespaces were completely wrong on this patchset.
> Signed-off-by: Dean Anderson <linux-dev@sensoray.com>
> ---
> drivers/media/video/s2255drv.c | 6 ++++++
> 1 files changed, 6 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/media/video/s2255drv.c b/drivers/media/video/s2255drv.c
> index b12e28e..38e5c4b 100644
> --- a/drivers/media/video/s2255drv.c
> +++ b/drivers/media/video/s2255drv.c
> @@ -428,6 +428,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
> @@ -648,6 +652,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;
> @@ -1032,6 +1037,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);
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-05-02 16:36 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-04-04 18:16 [PATCH 1/2][media] s2255drv: adding MJPEG format Sensoray Linux Development
2011-05-02 16:36 ` Mauro Carvalho Chehab
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox