hurricos/openwrt-mirror
1
0
Fork 0
mirror of git://git.openwrt.org/openwrt/openwrt.git synced 2025-11-03 22:44:27 -05:00
Code Issues Projects Releases Wiki Activity
faa79f97b6
openwrt-mirror/target/linux/bcm27xx/patches-5.15/950-0766-bcm2835-codec-dev-video31-as-interface-to-image_enco.patch
Álvaro Fernández Rojas 20ea6adbf1 bcm27xx: add support for linux v5.15 
Build system: x86_64
Build-tested: bcm2708, bcm2709, bcm2710, bcm2711
Run-tested: bcm2708/RPiB+, bcm2709/RPi3B, bcm2710/RPi3B, bcm2711/RPi4B

Signed-off-by: Marty Jones <mj8263788@gmail.com>
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
2022-05-17 15:11:22 +02:00

800 lines
26 KiB
Diff
Raw Blame History

From edd6ba8103e315dea54c1f1bdbf0562590e0acd8 Mon Sep 17 00:00:00 2001
From: Maxim Devaev <mdevaev@gmail.com>
Date: Thu, 3 Mar 2022 23:06:15 +0300
Subject: [PATCH] bcm2835-codec: /dev/video31 as interface to
image_encode JPEG encoder
Signed-off-by: Maxim Devaev <mdevaev@gmail.com>
---
.../bcm2835-codec/bcm2835-v4l2-codec.c | 246 ++++++++++++------
.../vchiq-mmal/mmal-parameters.h | 2 +
2 files changed, 165 insertions(+), 83 deletions(-)
--- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
+++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
@@ -62,6 +62,10 @@ static int deinterlace_video_nr = 18;
module_param(deinterlace_video_nr, int, 0644);
MODULE_PARM_DESC(deinterlace_video_nr, "deinterlace video device number");
+static int encode_image_nr = 31;
+module_param(encode_image_nr, int, 0644);
+MODULE_PARM_DESC(encode_image_nr, "encoder image device number");
+
/*
* Workaround for GStreamer v4l2convert component not considering Bayer formats
* as raw, and therefore not considering a V4L2 device that supports them as
@@ -88,6 +92,7 @@ enum bcm2835_codec_role {
ENCODE,
ISP,
DEINTERLACE,
+ ENCODE_IMAGE,
NUM_ROLES
};
@@ -96,6 +101,7 @@ static const char * const roles[] = {
"encode",
"isp",
"image_fx",
+ "encode_image",
};
static const char * const components[] = {
@@ -103,6 +109,7 @@ static const char * const components[] =
"ril.video_encode",
"ril.isp",
"ril.image_fx",
+ "ril.image_encode",
};
/* Timeout for stop_streaming to allow all buffers to return */
@@ -136,6 +143,8 @@ static const char * const components[] =
*/
#define DEF_COMP_BUF_SIZE_GREATER_720P (768 << 10)
#define DEF_COMP_BUF_SIZE_720P_OR_LESS (512 << 10)
+/* JPEG image can be very large. For paranoid reasons 4MB is used */
+#define DEF_COMP_BUF_SIZE_JPEG (4096 << 10)
/* Flags that indicate a format can be used for capture/output */
#define MEM2MEM_CAPTURE BIT(0)
@@ -158,63 +167,63 @@ static const struct bcm2835_codec_fmt su
/* YUV formats */
.fourcc = V4L2_PIX_FMT_YUV420,
.depth = 8,
- .bytesperline_align = { 32, 64, 64, 32 },
+ .bytesperline_align = { 32, 64, 64, 32, 32 },
.flags = 0,
.mmal_fmt = MMAL_ENCODING_I420,
.size_multiplier_x2 = 3,
}, {
.fourcc = V4L2_PIX_FMT_YVU420,
.depth = 8,
- .bytesperline_align = { 32, 64, 64, 32 },
+ .bytesperline_align = { 32, 64, 64, 32, 32 },
.flags = 0,
.mmal_fmt = MMAL_ENCODING_YV12,
.size_multiplier_x2 = 3,
}, {
.fourcc = V4L2_PIX_FMT_NV12,
.depth = 8,
- .bytesperline_align = { 32, 32, 32, 32 },
+ .bytesperline_align = { 32, 32, 32, 32, 32 },
.flags = 0,
.mmal_fmt = MMAL_ENCODING_NV12,
.size_multiplier_x2 = 3,
}, {
.fourcc = V4L2_PIX_FMT_NV21,
.depth = 8,
- .bytesperline_align = { 32, 32, 32, 32 },
+ .bytesperline_align = { 32, 32, 32, 32, 32 },
.flags = 0,
.mmal_fmt = MMAL_ENCODING_NV21,
.size_multiplier_x2 = 3,
}, {
.fourcc = V4L2_PIX_FMT_RGB565,
.depth = 16,
- .bytesperline_align = { 32, 32, 32, 32 },
+ .bytesperline_align = { 32, 32, 32, 32, 32 },
.flags = 0,
.mmal_fmt = MMAL_ENCODING_RGB16,
.size_multiplier_x2 = 2,
}, {
.fourcc = V4L2_PIX_FMT_YUYV,
.depth = 16,
- .bytesperline_align = { 32, 32, 32, 32 },
+ .bytesperline_align = { 32, 32, 32, 32, 32 },
.flags = 0,
.mmal_fmt = MMAL_ENCODING_YUYV,
.size_multiplier_x2 = 2,
}, {
.fourcc = V4L2_PIX_FMT_UYVY,
.depth = 16,
- .bytesperline_align = { 32, 32, 32, 32 },
+ .bytesperline_align = { 32, 32, 32, 32, 32 },
.flags = 0,
.mmal_fmt = MMAL_ENCODING_UYVY,
.size_multiplier_x2 = 2,
}, {
.fourcc = V4L2_PIX_FMT_YVYU,
.depth = 16,
- .bytesperline_align = { 32, 32, 32, 32 },
+ .bytesperline_align = { 32, 32, 32, 32, 32 },
.flags = 0,
.mmal_fmt = MMAL_ENCODING_YVYU,
.size_multiplier_x2 = 2,
}, {
.fourcc = V4L2_PIX_FMT_VYUY,
.depth = 16,
- .bytesperline_align = { 32, 32, 32, 32 },
+ .bytesperline_align = { 32, 32, 32, 32, 32 },
.flags = 0,
.mmal_fmt = MMAL_ENCODING_VYUY,
.size_multiplier_x2 = 2,
@@ -222,21 +231,21 @@ static const struct bcm2835_codec_fmt su
/* RGB formats */
.fourcc = V4L2_PIX_FMT_RGB24,
.depth = 24,
- .bytesperline_align = { 32, 32, 32, 32 },
+ .bytesperline_align = { 32, 32, 32, 32, 32 },
.flags = 0,
.mmal_fmt = MMAL_ENCODING_RGB24,
.size_multiplier_x2 = 2,
}, {
.fourcc = V4L2_PIX_FMT_BGR24,
.depth = 24,
- .bytesperline_align = { 32, 32, 32, 32 },
+ .bytesperline_align = { 32, 32, 32, 32, 32 },
.flags = 0,
.mmal_fmt = MMAL_ENCODING_BGR24,
.size_multiplier_x2 = 2,
}, {
.fourcc = V4L2_PIX_FMT_BGR32,
.depth = 32,
- .bytesperline_align = { 32, 32, 32, 32 },
+ .bytesperline_align = { 32, 32, 32, 32, 32 },
.flags = 0,
.mmal_fmt = MMAL_ENCODING_BGRA,
.size_multiplier_x2 = 2,
@@ -252,7 +261,7 @@ static const struct bcm2835_codec_fmt su
/* 8 bit */
.fourcc = V4L2_PIX_FMT_SRGGB8,
.depth = 8,
- .bytesperline_align = { 32, 32, 32, 32 },
+ .bytesperline_align = { 32, 32, 32, 32, 32 },
.flags = 0,
.mmal_fmt = MMAL_ENCODING_BAYER_SRGGB8,
.size_multiplier_x2 = 2,
@@ -260,7 +269,7 @@ static const struct bcm2835_codec_fmt su
}, {
.fourcc = V4L2_PIX_FMT_SBGGR8,
.depth = 8,
- .bytesperline_align = { 32, 32, 32, 32 },
+ .bytesperline_align = { 32, 32, 32, 32, 32 },
.flags = 0,
.mmal_fmt = MMAL_ENCODING_BAYER_SBGGR8,
.size_multiplier_x2 = 2,
@@ -268,7 +277,7 @@ static const struct bcm2835_codec_fmt su
}, {
.fourcc = V4L2_PIX_FMT_SGRBG8,
.depth = 8,
- .bytesperline_align = { 32, 32, 32, 32 },
+ .bytesperline_align = { 32, 32, 32, 32, 32 },
.flags = 0,
.mmal_fmt = MMAL_ENCODING_BAYER_SGRBG8,
.size_multiplier_x2 = 2,
@@ -276,7 +285,7 @@ static const struct bcm2835_codec_fmt su
}, {
.fourcc = V4L2_PIX_FMT_SGBRG8,
.depth = 8,
- .bytesperline_align = { 32, 32, 32, 32 },
+ .bytesperline_align = { 32, 32, 32, 32, 32 },
.flags = 0,
.mmal_fmt = MMAL_ENCODING_BAYER_SGBRG8,
.size_multiplier_x2 = 2,
@@ -285,7 +294,7 @@ static const struct bcm2835_codec_fmt su
/* 10 bit */
.fourcc = V4L2_PIX_FMT_SRGGB10P,
.depth = 10,
- .bytesperline_align = { 32, 32, 32, 32 },
+ .bytesperline_align = { 32, 32, 32, 32, 32 },
.flags = 0,
.mmal_fmt = MMAL_ENCODING_BAYER_SRGGB10P,
.size_multiplier_x2 = 2,
@@ -293,7 +302,7 @@ static const struct bcm2835_codec_fmt su
}, {
.fourcc = V4L2_PIX_FMT_SBGGR10P,
.depth = 10,
- .bytesperline_align = { 32, 32, 32, 32 },
+ .bytesperline_align = { 32, 32, 32, 32, 32 },
.flags = 0,
.mmal_fmt = MMAL_ENCODING_BAYER_SBGGR10P,
.size_multiplier_x2 = 2,
@@ -301,7 +310,7 @@ static const struct bcm2835_codec_fmt su
}, {
.fourcc = V4L2_PIX_FMT_SGRBG10P,
.depth = 10,
- .bytesperline_align = { 32, 32, 32, 32 },
+ .bytesperline_align = { 32, 32, 32, 32, 32 },
.flags = 0,
.mmal_fmt = MMAL_ENCODING_BAYER_SGRBG10P,
.size_multiplier_x2 = 2,
@@ -309,7 +318,7 @@ static const struct bcm2835_codec_fmt su
}, {
.fourcc = V4L2_PIX_FMT_SGBRG10P,
.depth = 10,
- .bytesperline_align = { 32, 32, 32, 32 },
+ .bytesperline_align = { 32, 32, 32, 32, 32 },
.flags = 0,
.mmal_fmt = MMAL_ENCODING_BAYER_SGBRG10P,
.size_multiplier_x2 = 2,
@@ -318,7 +327,7 @@ static const struct bcm2835_codec_fmt su
/* 12 bit */
.fourcc = V4L2_PIX_FMT_SRGGB12P,
.depth = 12,
- .bytesperline_align = { 32, 32, 32, 32 },
+ .bytesperline_align = { 32, 32, 32, 32, 32 },
.flags = 0,
.mmal_fmt = MMAL_ENCODING_BAYER_SRGGB12P,
.size_multiplier_x2 = 2,
@@ -326,7 +335,7 @@ static const struct bcm2835_codec_fmt su
}, {
.fourcc = V4L2_PIX_FMT_SBGGR12P,
.depth = 12,
- .bytesperline_align = { 32, 32, 32, 32 },
+ .bytesperline_align = { 32, 32, 32, 32, 32 },
.flags = 0,
.mmal_fmt = MMAL_ENCODING_BAYER_SBGGR12P,
.size_multiplier_x2 = 2,
@@ -334,7 +343,7 @@ static const struct bcm2835_codec_fmt su
}, {
.fourcc = V4L2_PIX_FMT_SGRBG12P,
.depth = 12,
- .bytesperline_align = { 32, 32, 32, 32 },
+ .bytesperline_align = { 32, 32, 32, 32, 32 },
.flags = 0,
.mmal_fmt = MMAL_ENCODING_BAYER_SGRBG12P,
.size_multiplier_x2 = 2,
@@ -342,7 +351,7 @@ static const struct bcm2835_codec_fmt su
}, {
.fourcc = V4L2_PIX_FMT_SGBRG12P,
.depth = 12,
- .bytesperline_align = { 32, 32, 32, 32 },
+ .bytesperline_align = { 32, 32, 32, 32, 32 },
.flags = 0,
.mmal_fmt = MMAL_ENCODING_BAYER_SGBRG12P,
.size_multiplier_x2 = 2,
@@ -351,7 +360,7 @@ static const struct bcm2835_codec_fmt su
/* 14 bit */
.fourcc = V4L2_PIX_FMT_SRGGB14P,
.depth = 14,
- .bytesperline_align = { 32, 32, 32, 32 },
+ .bytesperline_align = { 32, 32, 32, 32, 32 },
.flags = 0,
.mmal_fmt = MMAL_ENCODING_BAYER_SRGGB14P,
.size_multiplier_x2 = 2,
@@ -359,7 +368,7 @@ static const struct bcm2835_codec_fmt su
}, {
.fourcc = V4L2_PIX_FMT_SBGGR14P,
.depth = 14,
- .bytesperline_align = { 32, 32, 32, 32 },
+ .bytesperline_align = { 32, 32, 32, 32, 32 },
.flags = 0,
.mmal_fmt = MMAL_ENCODING_BAYER_SBGGR14P,
.size_multiplier_x2 = 2,
@@ -368,7 +377,7 @@ static const struct bcm2835_codec_fmt su
}, {
.fourcc = V4L2_PIX_FMT_SGRBG14P,
.depth = 14,
- .bytesperline_align = { 32, 32, 32, 32 },
+ .bytesperline_align = { 32, 32, 32, 32, 32 },
.flags = 0,
.mmal_fmt = MMAL_ENCODING_BAYER_SGRBG14P,
.size_multiplier_x2 = 2,
@@ -376,7 +385,7 @@ static const struct bcm2835_codec_fmt su
}, {
.fourcc = V4L2_PIX_FMT_SGBRG14P,
.depth = 14,
- .bytesperline_align = { 32, 32, 32, 32 },
+ .bytesperline_align = { 32, 32, 32, 32, 32 },
.flags = 0,
.mmal_fmt = MMAL_ENCODING_BAYER_SGBRG14P,
.size_multiplier_x2 = 2,
@@ -385,7 +394,7 @@ static const struct bcm2835_codec_fmt su
/* 16 bit */
.fourcc = V4L2_PIX_FMT_SRGGB16,
.depth = 16,
- .bytesperline_align = { 32, 32, 32, 32 },
+ .bytesperline_align = { 32, 32, 32, 32, 32 },
.flags = 0,
.mmal_fmt = MMAL_ENCODING_BAYER_SRGGB16,
.size_multiplier_x2 = 2,
@@ -393,7 +402,7 @@ static const struct bcm2835_codec_fmt su
}, {
.fourcc = V4L2_PIX_FMT_SBGGR16,
.depth = 16,
- .bytesperline_align = { 32, 32, 32, 32 },
+ .bytesperline_align = { 32, 32, 32, 32, 32 },
.flags = 0,
.mmal_fmt = MMAL_ENCODING_BAYER_SBGGR16,
.size_multiplier_x2 = 2,
@@ -401,7 +410,7 @@ static const struct bcm2835_codec_fmt su
}, {
.fourcc = V4L2_PIX_FMT_SGRBG16,
.depth = 16,
- .bytesperline_align = { 32, 32, 32, 32 },
+ .bytesperline_align = { 32, 32, 32, 32, 32 },
.flags = 0,
.mmal_fmt = MMAL_ENCODING_BAYER_SGRBG16,
.size_multiplier_x2 = 2,
@@ -409,7 +418,7 @@ static const struct bcm2835_codec_fmt su
}, {
.fourcc = V4L2_PIX_FMT_SGBRG16,
.depth = 16,
- .bytesperline_align = { 32, 32, 32, 32 },
+ .bytesperline_align = { 32, 32, 32, 32, 32 },
.flags = 0,
.mmal_fmt = MMAL_ENCODING_BAYER_SGBRG16,
.size_multiplier_x2 = 2,
@@ -419,7 +428,7 @@ static const struct bcm2835_codec_fmt su
/* 10 bit */
.fourcc = V4L2_PIX_FMT_SRGGB10,
.depth = 16,
- .bytesperline_align = { 32, 32, 32, 32 },
+ .bytesperline_align = { 32, 32, 32, 32, 32 },
.flags = 0,
.mmal_fmt = MMAL_ENCODING_BAYER_SRGGB10,
.size_multiplier_x2 = 2,
@@ -427,7 +436,7 @@ static const struct bcm2835_codec_fmt su
}, {
.fourcc = V4L2_PIX_FMT_SBGGR10,
.depth = 16,
- .bytesperline_align = { 32, 32, 32, 32 },
+ .bytesperline_align = { 32, 32, 32, 32, 32 },
.flags = 0,
.mmal_fmt = MMAL_ENCODING_BAYER_SBGGR10,
.size_multiplier_x2 = 2,
@@ -435,7 +444,7 @@ static const struct bcm2835_codec_fmt su
}, {
.fourcc = V4L2_PIX_FMT_SGRBG10,
.depth = 16,
- .bytesperline_align = { 32, 32, 32, 32 },
+ .bytesperline_align = { 32, 32, 32, 32, 32 },
.flags = 0,
.mmal_fmt = MMAL_ENCODING_BAYER_SGRBG10,
.size_multiplier_x2 = 2,
@@ -443,7 +452,7 @@ static const struct bcm2835_codec_fmt su
}, {
.fourcc = V4L2_PIX_FMT_SGBRG10,
.depth = 16,
- .bytesperline_align = { 32, 32, 32, 32 },
+ .bytesperline_align = { 32, 32, 32, 32, 32 },
.flags = 0,
.mmal_fmt = MMAL_ENCODING_BAYER_SGBRG10,
.size_multiplier_x2 = 2,
@@ -452,7 +461,7 @@ static const struct bcm2835_codec_fmt su
/* 12 bit */
.fourcc = V4L2_PIX_FMT_SRGGB12,
.depth = 16,
- .bytesperline_align = { 32, 32, 32, 32 },
+ .bytesperline_align = { 32, 32, 32, 32, 32 },
.flags = 0,
.mmal_fmt = MMAL_ENCODING_BAYER_SRGGB12,
.size_multiplier_x2 = 2,
@@ -460,7 +469,7 @@ static const struct bcm2835_codec_fmt su
}, {
.fourcc = V4L2_PIX_FMT_SBGGR12,
.depth = 16,
- .bytesperline_align = { 32, 32, 32, 32 },
+ .bytesperline_align = { 32, 32, 32, 32, 32 },
.flags = 0,
.mmal_fmt = MMAL_ENCODING_BAYER_SBGGR12,
.size_multiplier_x2 = 2,
@@ -468,7 +477,7 @@ static const struct bcm2835_codec_fmt su
}, {
.fourcc = V4L2_PIX_FMT_SGRBG12,
.depth = 16,
- .bytesperline_align = { 32, 32, 32, 32 },
+ .bytesperline_align = { 32, 32, 32, 32, 32 },
.flags = 0,
.mmal_fmt = MMAL_ENCODING_BAYER_SGRBG12,
.size_multiplier_x2 = 2,
@@ -476,7 +485,7 @@ static const struct bcm2835_codec_fmt su
}, {
.fourcc = V4L2_PIX_FMT_SGBRG12,
.depth = 16,
- .bytesperline_align = { 32, 32, 32, 32 },
+ .bytesperline_align = { 32, 32, 32, 32, 32 },
.flags = 0,
.mmal_fmt = MMAL_ENCODING_BAYER_SGBRG12,
.size_multiplier_x2 = 2,
@@ -485,7 +494,7 @@ static const struct bcm2835_codec_fmt su
/* 14 bit */
.fourcc = V4L2_PIX_FMT_SRGGB14,
.depth = 16,
- .bytesperline_align = { 32, 32, 32, 32 },
+ .bytesperline_align = { 32, 32, 32, 32, 32 },
.flags = 0,
.mmal_fmt = MMAL_ENCODING_BAYER_SRGGB14,
.size_multiplier_x2 = 2,
@@ -493,7 +502,7 @@ static const struct bcm2835_codec_fmt su
}, {
.fourcc = V4L2_PIX_FMT_SBGGR14,
.depth = 16,
- .bytesperline_align = { 32, 32, 32, 32 },
+ .bytesperline_align = { 32, 32, 32, 32, 32 },
.flags = 0,
.mmal_fmt = MMAL_ENCODING_BAYER_SBGGR14,
.size_multiplier_x2 = 2,
@@ -501,7 +510,7 @@ static const struct bcm2835_codec_fmt su
}, {
.fourcc = V4L2_PIX_FMT_SGRBG14,
.depth = 16,
- .bytesperline_align = { 32, 32, 32, 32 },
+ .bytesperline_align = { 32, 32, 32, 32, 32 },
.flags = 0,
.mmal_fmt = MMAL_ENCODING_BAYER_SGRBG14,
.size_multiplier_x2 = 2,
@@ -509,7 +518,7 @@ static const struct bcm2835_codec_fmt su
}, {
.fourcc = V4L2_PIX_FMT_SGBRG14,
.depth = 16,
- .bytesperline_align = { 32, 32, 32, 32 },
+ .bytesperline_align = { 32, 32, 32, 32, 32 },
.flags = 0,
.mmal_fmt = MMAL_ENCODING_BAYER_SGBRG14,
.size_multiplier_x2 = 2,
@@ -519,7 +528,7 @@ static const struct bcm2835_codec_fmt su
/* 8 bit */
.fourcc = V4L2_PIX_FMT_GREY,
.depth = 8,
- .bytesperline_align = { 32, 32, 32, 32 },
+ .bytesperline_align = { 32, 32, 32, 32, 32 },
.flags = 0,
.mmal_fmt = MMAL_ENCODING_GREY,
.size_multiplier_x2 = 2,
@@ -527,7 +536,7 @@ static const struct bcm2835_codec_fmt su
/* 10 bit */
.fourcc = V4L2_PIX_FMT_Y10P,
.depth = 10,
- .bytesperline_align = { 32, 32, 32, 32 },
+ .bytesperline_align = { 32, 32, 32, 32, 32 },
.flags = 0,
.mmal_fmt = MMAL_ENCODING_Y10P,
.size_multiplier_x2 = 2,
@@ -535,7 +544,7 @@ static const struct bcm2835_codec_fmt su
/* 12 bit */
.fourcc = V4L2_PIX_FMT_Y12P,
.depth = 12,
- .bytesperline_align = { 32, 32, 32, 32 },
+ .bytesperline_align = { 32, 32, 32, 32, 32 },
.flags = 0,
.mmal_fmt = MMAL_ENCODING_Y12P,
.size_multiplier_x2 = 2,
@@ -543,7 +552,7 @@ static const struct bcm2835_codec_fmt su
/* 14 bit */
.fourcc = V4L2_PIX_FMT_Y14P,
.depth = 14,
- .bytesperline_align = { 32, 32, 32, 32 },
+ .bytesperline_align = { 32, 32, 32, 32, 32 },
.flags = 0,
.mmal_fmt = MMAL_ENCODING_Y14P,
.size_multiplier_x2 = 2,
@@ -551,7 +560,7 @@ static const struct bcm2835_codec_fmt su
/* 16 bit */
.fourcc = V4L2_PIX_FMT_Y16,
.depth = 16,
- .bytesperline_align = { 32, 32, 32, 32 },
+ .bytesperline_align = { 32, 32, 32, 32, 32 },
.flags = 0,
.mmal_fmt = MMAL_ENCODING_Y16,
.size_multiplier_x2 = 2,
@@ -559,7 +568,7 @@ static const struct bcm2835_codec_fmt su
/* 10 bit as 16bpp */
.fourcc = V4L2_PIX_FMT_Y10,
.depth = 16,
- .bytesperline_align = { 32, 32, 32, 32 },
+ .bytesperline_align = { 32, 32, 32, 32, 32 },
.flags = 0,
.mmal_fmt = MMAL_ENCODING_Y10,
.size_multiplier_x2 = 2,
@@ -567,7 +576,7 @@ static const struct bcm2835_codec_fmt su
/* 12 bit as 16bpp */
.fourcc = V4L2_PIX_FMT_Y12,
.depth = 16,
- .bytesperline_align = { 32, 32, 32, 32 },
+ .bytesperline_align = { 32, 32, 32, 32, 32 },
.flags = 0,
.mmal_fmt = MMAL_ENCODING_Y12,
.size_multiplier_x2 = 2,
@@ -575,7 +584,7 @@ static const struct bcm2835_codec_fmt su
/* 14 bit as 16bpp */
.fourcc = V4L2_PIX_FMT_Y14,
.depth = 16,
- .bytesperline_align = { 32, 32, 32, 32 },
+ .bytesperline_align = { 32, 32, 32, 32, 32 },
.flags = 0,
.mmal_fmt = MMAL_ENCODING_Y14,
.size_multiplier_x2 = 2,
@@ -586,6 +595,11 @@ static const struct bcm2835_codec_fmt su
.flags = V4L2_FMT_FLAG_COMPRESSED,
.mmal_fmt = MMAL_ENCODING_H264,
}, {
+ .fourcc = V4L2_PIX_FMT_JPEG,
+ .depth = 0,
+ .flags = V4L2_FMT_FLAG_COMPRESSED,
+ .mmal_fmt = MMAL_ENCODING_JPEG,
+ }, {
.fourcc = V4L2_PIX_FMT_MJPEG,
.depth = 0,
.flags = V4L2_FMT_FLAG_COMPRESSED,
@@ -705,6 +719,7 @@ struct bcm2835_codec_driver {
struct bcm2835_codec_dev *decode;
struct bcm2835_codec_dev *isp;
struct bcm2835_codec_dev *deinterlace;
+ struct bcm2835_codec_dev *encode_image;
};
enum {
@@ -838,6 +853,9 @@ static inline unsigned int get_sizeimage
struct bcm2835_codec_fmt *fmt)
{
if (fmt->flags & V4L2_FMT_FLAG_COMPRESSED) {
+ if (fmt->fourcc == V4L2_PIX_FMT_JPEG)
+ return DEF_COMP_BUF_SIZE_JPEG;
+
if (width * height > 1280 * 720)
return DEF_COMP_BUF_SIZE_GREATER_720P;
else
@@ -1422,12 +1440,12 @@ static int vidioc_try_fmt(struct bcm2835
f->fmt.pix_mp.height = MIN_H;
/*
- * For decoders the buffer must have a vertical alignment of 16
- * lines.
+ * For decoders and image encoders the buffer must have
+ * a vertical alignment of 16 lines.
* The selection will reflect any cropping rectangle when only
* some of the pixels are active.
*/
- if (ctx->dev->role == DECODE)
+ if (ctx->dev->role == DECODE || ctx->dev->role == ENCODE_IMAGE)
f->fmt.pix_mp.height = ALIGN(f->fmt.pix_mp.height, 16);
}
f->fmt.pix_mp.num_planes = 1;
@@ -1573,12 +1591,13 @@ static int vidioc_s_fmt(struct bcm2835_c
v4l2_dbg(1, debug, &ctx->dev->v4l2_dev, "Calculated bpl as %u, size %u\n",
q_data->bytesperline, q_data->sizeimage);
- if (ctx->dev->role == DECODE &&
+ if ((ctx->dev->role == DECODE || ctx->dev->role == ENCODE_IMAGE) &&
q_data->fmt->flags & V4L2_FMT_FLAG_COMPRESSED &&
q_data->crop_width && q_data->height) {
/*
- * On the decoder, if provided with a resolution on the input
- * side, then replicate that to the output side.
+ * On the decoder or image encoder, if provided with
+ * a resolution on the input side, then replicate that
+ * to the output side.
* GStreamer appears not to support V4L2_EVENT_SOURCE_CHANGE,
* nor set up a resolution on the output side, therefore
* we can't decode anything at a resolution other than the
@@ -1719,7 +1738,7 @@ static int vidioc_g_selection(struct fil
switch (s->type) {
case V4L2_BUF_TYPE_VIDEO_CAPTURE:
/* CAPTURE on encoder is not valid. */
- if (ctx->dev->role == ENCODE)
+ if (ctx->dev->role == ENCODE || ctx->dev->role == ENCODE_IMAGE)
return -EINVAL;
q_data = &ctx->q_data[V4L2_M2M_DST];
break;
@@ -1762,6 +1781,7 @@ static int vidioc_g_selection(struct fil
}
break;
case ENCODE:
+ case ENCODE_IMAGE:
switch (s->target) {
case V4L2_SEL_TGT_CROP_DEFAULT:
case V4L2_SEL_TGT_CROP_BOUNDS:
@@ -1846,7 +1866,7 @@ static int vidioc_s_selection(struct fil
switch (s->type) {
case V4L2_BUF_TYPE_VIDEO_CAPTURE:
/* CAPTURE on encoder is not valid. */
- if (ctx->dev->role == ENCODE)
+ if (ctx->dev->role == ENCODE || ctx->dev->role == ENCODE_IMAGE)
return -EINVAL;
q_data = &ctx->q_data[V4L2_M2M_DST];
break;
@@ -1882,6 +1902,7 @@ static int vidioc_s_selection(struct fil
}
break;
case ENCODE:
+ case ENCODE_IMAGE:
switch (s->target) {
case V4L2_SEL_TGT_CROP:
/* Only support crop from (0,0) */
@@ -2266,6 +2287,16 @@ static int bcm2835_codec_s_ctrl(struct v
sizeof(u32_value));
break;
}
+ case V4L2_CID_JPEG_COMPRESSION_QUALITY:
+ if (!ctx->component)
+ break;
+
+ ret = vchiq_mmal_port_parameter_set(ctx->dev->instance,
+ &ctx->component->output[0],
+ MMAL_PARAMETER_JPEG_Q_FACTOR,
+ &ctrl->val,
+ sizeof(ctrl->val));
+ break;
default:
v4l2_err(&ctx->dev->v4l2_dev, "Invalid control\n");
@@ -2364,7 +2395,7 @@ static int vidioc_try_encoder_cmd(struct
{
struct bcm2835_codec_ctx *ctx = file2ctx(file);
- if (ctx->dev->role != ENCODE)
+ if (ctx->dev->role != ENCODE && ctx->dev->role != ENCODE_IMAGE)
return -EINVAL;
switch (cmd->cmd) {
@@ -2567,6 +2598,20 @@ static int bcm2835_codec_create_componen
MMAL_PARAMETER_IMAGE_EFFECT_PARAMETERS,
&params,
sizeof(params));
+
+ } else if (dev->role == ENCODE_IMAGE) {
+ enable = 0;
+ vchiq_mmal_port_parameter_set(dev->instance,
+ &ctx->component->control,
+ MMAL_PARAMETER_EXIF_DISABLE,
+ &enable,
+ sizeof(enable));
+ enable = 1;
+ vchiq_mmal_port_parameter_set(dev->instance,
+ &ctx->component->output[0],
+ MMAL_PARAMETER_JPEG_IJG_SCALING,
+ &enable,
+ sizeof(enable));
}
setup_mmal_port_format(ctx, &ctx->q_data[V4L2_M2M_SRC],
@@ -2595,7 +2640,7 @@ static int bcm2835_codec_create_componen
goto destroy_component;
}
- if (dev->role == ENCODE) {
+ if (dev->role == ENCODE || dev->role == ENCODE_IMAGE) {
u32 param = 1;
if (ctx->q_data[V4L2_M2M_SRC].sizeimage <
@@ -2604,27 +2649,29 @@ static int bcm2835_codec_create_componen
ctx->q_data[V4L2_M2M_SRC].sizeimage,
ctx->component->output[0].minimum_buffer.size);
- /* Enable SPS Timing header so framerate information is encoded
- * in the H264 header.
- */
- vchiq_mmal_port_parameter_set(ctx->dev->instance,
- &ctx->component->output[0],
- MMAL_PARAMETER_VIDEO_ENCODE_SPS_TIMING,
- &param, sizeof(param));
-
- /* Enable inserting headers into the first frame */
- vchiq_mmal_port_parameter_set(ctx->dev->instance,
- &ctx->component->control,
- MMAL_PARAMETER_VIDEO_ENCODE_HEADERS_WITH_FRAME,
- &param, sizeof(param));
- /*
- * Avoid fragmenting the buffers over multiple frames (unless
- * the frame is bigger than the whole buffer)
- */
- vchiq_mmal_port_parameter_set(ctx->dev->instance,
- &ctx->component->control,
- MMAL_PARAMETER_MINIMISE_FRAGMENTATION,
- &param, sizeof(param));
+ if (dev->role == ENCODE) {
+ /* Enable SPS Timing header so framerate information is encoded
+ * in the H264 header.
+ */
+ vchiq_mmal_port_parameter_set(ctx->dev->instance,
+ &ctx->component->output[0],
+ MMAL_PARAMETER_VIDEO_ENCODE_SPS_TIMING,
+ &param, sizeof(param));
+
+ /* Enable inserting headers into the first frame */
+ vchiq_mmal_port_parameter_set(ctx->dev->instance,
+ &ctx->component->control,
+ MMAL_PARAMETER_VIDEO_ENCODE_HEADERS_WITH_FRAME,
+ &param, sizeof(param));
+ /*
+ * Avoid fragmenting the buffers over multiple frames (unless
+ * the frame is bigger than the whole buffer)
+ */
+ vchiq_mmal_port_parameter_set(ctx->dev->instance,
+ &ctx->component->control,
+ MMAL_PARAMETER_MINIMISE_FRAGMENTATION,
+ &param, sizeof(param));
+ }
} else {
if (ctx->q_data[V4L2_M2M_DST].sizeimage <
ctx->component->output[0].minimum_buffer.size)
@@ -3248,6 +3295,23 @@ static int bcm2835_codec_open(struct fil
v4l2_ctrl_handler_init(hdl, 0);
}
break;
+ case ENCODE_IMAGE:
+ {
+ /* Encode image controls */
+ v4l2_ctrl_handler_init(hdl, 1);
+
+ v4l2_ctrl_new_std(hdl, &bcm2835_codec_ctrl_ops,
+ V4L2_CID_JPEG_COMPRESSION_QUALITY,
+ 1, 100,
+ 1, 80);
+ if (hdl->error) {
+ rc = hdl->error;
+ goto free_ctrl_handler;
+ }
+ ctx->fh.ctrl_handler = hdl;
+ v4l2_ctrl_handler_setup(hdl);
+ }
+ break;
case NUM_ROLES:
break;
}
@@ -3527,6 +3591,12 @@ static int bcm2835_codec_create(struct b
function = MEDIA_ENT_F_PROC_VIDEO_PIXEL_FORMATTER;
video_nr = deinterlace_video_nr;
break;
+ case ENCODE_IMAGE:
+ v4l2_disable_ioctl(vfd, VIDIOC_DECODER_CMD);
+ v4l2_disable_ioctl(vfd, VIDIOC_TRY_DECODER_CMD);
+ function = MEDIA_ENT_F_PROC_VIDEO_ENCODER;
+ video_nr = encode_image_nr;
+ break;
default:
ret = -EINVAL;
goto unreg_dev;
@@ -3626,6 +3696,10 @@ static int bcm2835_codec_probe(struct pl
if (ret)
goto out;
+ ret = bcm2835_codec_create(drv, &drv->encode_image, ENCODE_IMAGE);
+ if (ret)
+ goto out;
+
/* Register the media device node */
if (media_device_register(mdev) < 0)
goto out;
@@ -3635,6 +3709,10 @@ static int bcm2835_codec_probe(struct pl
return 0;
out:
+ if (drv->encode_image) {
+ bcm2835_codec_destroy(drv->encode_image);
+ drv->encode_image = NULL;
+ }
if (drv->deinterlace) {
bcm2835_codec_destroy(drv->deinterlace);
drv->deinterlace = NULL;
@@ -3660,6 +3738,8 @@ static int bcm2835_codec_remove(struct p
media_device_unregister(&drv->mdev);
+ bcm2835_codec_destroy(drv->encode_image);
+
bcm2835_codec_destroy(drv->deinterlace);
bcm2835_codec_destroy(drv->isp);
--- a/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
+++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
@@ -279,6 +279,8 @@ enum mmal_parameter_camera_type {
MMAL_PARAMETER_GAMMA,
/**< Takes a @ref MMAL_PARAMETER_CDN_T */
MMAL_PARAMETER_CDN,
+ /**< Takes a @ref MMAL_PARAMETER_BOOLEAN_T */
+ MMAL_PARAMETER_JPEG_IJG_SCALING,
};
struct mmal_parameter_rational {
Reference in New Issue View Git Blame Copy Permalink