diff options
| author | Florian Fainelli <florian@openwrt.org> | 2014-02-28 20:30:08 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2014-02-28 20:30:08 +0000 |
| commit | 800930b924c19a56b3a6e94ad351cd0715fb410d (patch) | |
| tree | 70158d97f68604d69da8da779507469cf930bf07 /target/linux/brcm2708/patches-3.10/0142-V4L2-Enable-MJPEG-encoding.patch | |
| parent | 68c939ba0b0a0dda84e7a2ae370155be9a5593bc (diff) | |
| download | upstream-800930b924c19a56b3a6e94ad351cd0715fb410d.tar.gz upstream-800930b924c19a56b3a6e94ad351cd0715fb410d.tar.bz2 upstream-800930b924c19a56b3a6e94ad351cd0715fb410d.zip | |
brcm2708: update against latest rpi-3.10.y branch
Update our copies of the brcm2708 patches to the latest rpi-3.10-y
rebased against linux-3.10.y stable (3.10.32). This should hopefully
make it easier for us in the future to leverage the raspberry/rpi-*
branches.
Signed-off-by: Florian Fainelli <florian@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39770 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm2708/patches-3.10/0142-V4L2-Enable-MJPEG-encoding.patch')
| -rw-r--r-- | target/linux/brcm2708/patches-3.10/0142-V4L2-Enable-MJPEG-encoding.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/target/linux/brcm2708/patches-3.10/0142-V4L2-Enable-MJPEG-encoding.patch b/target/linux/brcm2708/patches-3.10/0142-V4L2-Enable-MJPEG-encoding.patch new file mode 100644 index 0000000000..556919ced6 --- /dev/null +++ b/target/linux/brcm2708/patches-3.10/0142-V4L2-Enable-MJPEG-encoding.patch @@ -0,0 +1,39 @@ +From 9878725ea0cedbc79d962e0ac041acdc1135d79c Mon Sep 17 00:00:00 2001 +From: Dave Stevenson <dsteve@broadcom.com> +Date: Mon, 23 Dec 2013 15:42:21 +0000 +Subject: [PATCH 142/174] V4L2: Enable MJPEG encoding + +Requires GPU firmware update to support MJPEG encoder. + +Signed-off-by: Dave Stevenson <dsteve@broadcom.com> +--- + drivers/media/platform/bcm2835/bcm2835-camera.c | 7 +++++++ + drivers/media/platform/bcm2835/mmal-encodings.h | 1 + + 2 files changed, 8 insertions(+) + +--- 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, + } + }; + +--- 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', ' ') |