tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[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>

authored by

Sensoray Linux Development and committed by
Mauro Carvalho Chehab d0ef8540 b01ff500

+6
+6
drivers/media/video/s2255drv.c
··· 433 433 .fourcc = V4L2_PIX_FMT_JPEG, 434 434 .depth = 24 435 435 }, { 436 + .name = "MJPG", 437 + .fourcc = V4L2_PIX_FMT_MJPEG, 438 + .depth = 24 439 + }, { 436 440 .name = "8bpp GREY", 437 441 .fourcc = V4L2_PIX_FMT_GREY, 438 442 .depth = 8 ··· 657 653 memcpy(vbuf, tmpbuf, buf->vb.width * buf->vb.height); 658 654 break; 659 655 case V4L2_PIX_FMT_JPEG: 656 + case V4L2_PIX_FMT_MJPEG: 660 657 buf->vb.size = jpgsize; 661 658 memcpy(vbuf, tmpbuf, buf->vb.size); 662 659 break; ··· 1042 1037 mode.color |= COLOR_Y8; 1043 1038 break; 1044 1039 case V4L2_PIX_FMT_JPEG: 1040 + case V4L2_PIX_FMT_MJPEG: 1045 1041 mode.color &= ~MASK_COLOR; 1046 1042 mode.color |= COLOR_JPG; 1047 1043 mode.color |= (channel->jc.quality << 8);