diff options
| author | Stephan Lachowsky <stephan.lachowsky@maxim-ic.com> | 2011-01-28 20:38:58 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-09-24 01:07:59 +0200 |
| commit | 25ad8a8ddeeb26c77728c806a5f66608c9baa986 (patch) | |
| tree | 6a5970b2aa120ffee6ac47dad9a7f6deb228742b /drivers/media/video/uvc | |
| parent | [media] media: Fix a UVC performance problem on systems with non-coherent DMA (diff) | |
| download | linux-25ad8a8ddeeb26c77728c806a5f66608c9baa986.tar.xz linux-25ad8a8ddeeb26c77728c806a5f66608c9baa986.zip | |
[media] uvcvideo: Add a mapping for H.264 payloads
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/uvc')
| -rw-r--r-- | drivers/media/video/uvc/uvc_driver.c | 5 | ||||
| -rw-r--r-- | drivers/media/video/uvc/uvcvideo.h | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/drivers/media/video/uvc/uvc_driver.c b/drivers/media/video/uvc/uvc_driver.c index a3c24dd875fc..656d4c9e3b9f 100644 --- a/drivers/media/video/uvc/uvc_driver.c +++ b/drivers/media/video/uvc/uvc_driver.c @@ -114,6 +114,11 @@ static struct uvc_format_desc uvc_fmts[] = { .guid = UVC_GUID_FORMAT_RGBP, .fcc = V4L2_PIX_FMT_RGB565, }, + { + .name = "H.264", + .guid = UVC_GUID_FORMAT_H264, + .fcc = V4L2_PIX_FMT_H264, + }, }; /* ------------------------------------------------------------------------ diff --git a/drivers/media/video/uvc/uvcvideo.h b/drivers/media/video/uvc/uvcvideo.h index e3aec87eaa53..4c1392ebcd4b 100644 --- a/drivers/media/video/uvc/uvcvideo.h +++ b/drivers/media/video/uvc/uvcvideo.h @@ -89,6 +89,10 @@ { 'M', '4', '2', '0', 0x00, 0x00, 0x10, 0x00, \ 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} +#define UVC_GUID_FORMAT_H264 \ + { 'H', '2', '6', '4', 0x00, 0x00, 0x10, 0x00, \ + 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} + /* ------------------------------------------------------------------------ * Driver specific constants. */ |