target/linux/brcm2708/patches-3.10/0142-V4L2-Enable-MJPEG-encoding.patch

   1 From 640a6391ca5a617196bb250d3378f775fe16b9f8 Mon Sep 17 00:00:00 2001
   2 From: Dave Stevenson <dsteve@broadcom.com>
   3 Date: Mon, 23 Dec 2013 15:42:21 +0000
   4 Subject: [PATCH 142/196] V4L2: Enable MJPEG encoding
   5
   6 Requires GPU firmware update to support MJPEG encoder.
   7
   8 Signed-off-by: Dave Stevenson <dsteve@broadcom.com>
   9 ---
  10  drivers/media/platform/bcm2835/bcm2835-camera.c | 7 +++++++
  11  drivers/media/platform/bcm2835/mmal-encodings.h | 1 +
  12  2 files changed, 8 insertions(+)
  13
  14 diff --git a/drivers/media/platform/bcm2835/bcm2835-camera.c b/drivers/media/platform/bcm2835/bcm2835-camera.c
  15 index 4780107..166039e 100644
  16 --- a/drivers/media/platform/bcm2835/bcm2835-camera.c
  17 +++ b/drivers/media/platform/bcm2835/bcm2835-camera.c
  18 @@ -100,6 +100,13 @@ static struct mmal_fmt formats[] = {
  19          .mmal = MMAL_ENCODING_H264,
  20          .depth = 8,
  21          .mmal_component = MMAL_COMPONENT_VIDEO_ENCODE,
  22 +        },
  23 +       {
  24 +        .name = "MJPEG",
  25 +        .fourcc = V4L2_PIX_FMT_MJPEG,
  26 +        .mmal = MMAL_ENCODING_MJPEG,
  27 +        .depth = 8,
  28 +        .mmal_component = MMAL_COMPONENT_VIDEO_ENCODE,
  29          }
  30  };
  31
  32 diff --git a/drivers/media/platform/bcm2835/mmal-encodings.h b/drivers/media/platform/bcm2835/mmal-encodings.h
  33 index 856e80e..764bb12 100644
  34 --- a/drivers/media/platform/bcm2835/mmal-encodings.h
  35 +++ b/drivers/media/platform/bcm2835/mmal-encodings.h
  36 @@ -27,6 +27,7 @@
  37  #define MMAL_ENCODING_VP6              MMAL_FOURCC('V', 'P', '6', ' ')
  38  #define MMAL_ENCODING_THEORA           MMAL_FOURCC('T', 'H', 'E', 'O')
  39  #define MMAL_ENCODING_SPARK            MMAL_FOURCC('S', 'P', 'R', 'K')
  40 +#define MMAL_ENCODING_MJPEG            MMAL_FOURCC('M', 'J', 'P', 'G')
  41
  42  #define MMAL_ENCODING_JPEG             MMAL_FOURCC('J', 'P', 'E', 'G')
  43  #define MMAL_ENCODING_GIF              MMAL_FOURCC('G', 'I', 'F', ' ')
  44 --
  45 1.9.1
  46