From 640a6391ca5a617196bb250d3378f775fe16b9f8 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Mon, 23 Dec 2013 15:42:21 +0000 Subject: [PATCH 142/196] V4L2: Enable MJPEG encoding Requires GPU firmware update to support MJPEG encoder. Signed-off-by: Dave Stevenson --- drivers/media/platform/bcm2835/bcm2835-camera.c | 7 +++++++ drivers/media/platform/bcm2835/mmal-encodings.h | 1 + 2 files changed, 8 insertions(+) diff --git a/drivers/media/platform/bcm2835/bcm2835-camera.c b/drivers/media/platform/bcm2835/bcm2835-camera.c index 4780107..166039e 100644 --- a/drivers/media/platform/bcm2835/bcm2835-camera.c +++ b/drivers/media/platform/bcm2835/bcm2835-camera.c @@ -100,6 +100,13 @@ static struct mmal_fmt formats[] = { .mmal = MMAL_ENCODING_H264, .depth = 8, .mmal_component = MMAL_COMPONENT_VIDEO_ENCODE, + }, + { + .name = "MJPEG", + .fourcc = V4L2_PIX_FMT_MJPEG, + .mmal = MMAL_ENCODING_MJPEG, + .depth = 8, + .mmal_component = MMAL_COMPONENT_VIDEO_ENCODE, } }; diff --git a/drivers/media/platform/bcm2835/mmal-encodings.h b/drivers/media/platform/bcm2835/mmal-encodings.h index 856e80e..764bb12 100644 --- a/drivers/media/platform/bcm2835/mmal-encodings.h +++ b/drivers/media/platform/bcm2835/mmal-encodings.h @@ -27,6 +27,7 @@ #define MMAL_ENCODING_VP6 MMAL_FOURCC('V', 'P', '6', ' ') #define MMAL_ENCODING_THEORA MMAL_FOURCC('T', 'H', 'E', 'O') #define MMAL_ENCODING_SPARK MMAL_FOURCC('S', 'P', 'R', 'K') +#define MMAL_ENCODING_MJPEG MMAL_FOURCC('M', 'J', 'P', 'G') #define MMAL_ENCODING_JPEG MMAL_FOURCC('J', 'P', 'E', 'G') #define MMAL_ENCODING_GIF MMAL_FOURCC('G', 'I', 'F', ' ') -- 1.9.1