| Message ID | 4D9A0AFA.7090202@sensoray.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
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); -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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);
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(-)