mirror of
https://github.com/Fishwaldo/build.git
synced 2025-03-29 18:21:27 +00:00
153 lines
5.7 KiB
Diff
153 lines
5.7 KiB
Diff
From 82da876c36ccc7791d5b20e7ee8b50379f7b19aa Mon Sep 17 00:00:00 2001
|
|
From: Shunqian Zheng <zhengsq@rock-chips.com>
|
|
Date: Wed, 5 Sep 2018 19:00:10 -0300
|
|
Subject: [PATCH 4/6] media: Add controls for JPEG quantization tables
|
|
|
|
Add V4L2_CID_JPEG_QUANTIZATION compound control to allow userspace
|
|
configure the JPEG quantization tables.
|
|
|
|
Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com>
|
|
Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
|
|
---
|
|
Documentation/media/uapi/v4l/extended-controls.rst | 31 ++++++++++++++++++++++
|
|
Documentation/media/videodev2.h.rst.exceptions | 1 +
|
|
drivers/media/v4l2-core/v4l2-ctrls.c | 10 +++++++
|
|
include/uapi/linux/v4l2-controls.h | 12 +++++++++
|
|
include/uapi/linux/videodev2.h | 1 +
|
|
5 files changed, 55 insertions(+)
|
|
|
|
diff --git a/Documentation/media/uapi/v4l/extended-controls.rst b/Documentation/media/uapi/v4l/extended-controls.rst
|
|
index 9f7312bf..1335d27d 100644
|
|
--- a/Documentation/media/uapi/v4l/extended-controls.rst
|
|
+++ b/Documentation/media/uapi/v4l/extended-controls.rst
|
|
@@ -3354,7 +3354,38 @@ JPEG Control IDs
|
|
Specify which JPEG markers are included in compressed stream. This
|
|
control is valid only for encoders.
|
|
|
|
+.. _jpeg-quant-tables-control:
|
|
|
|
+``V4L2_CID_JPEG_QUANTIZATION (struct)``
|
|
+ Specifies the luma and chroma quantization matrices for encoding
|
|
+ or decoding a V4L2_PIX_FMT_JPEG_RAW format buffer. The :ref:`itu-t81`
|
|
+ specification allows 8-bit quantization coefficients for
|
|
+ baseline profile images, and 8-bit or 16-bit for extended profile
|
|
+ images. Supporting or not 16-bit precision coefficients is driver-specific.
|
|
+ Coefficients must be set in JPEG zigzag scan order.
|
|
+
|
|
+
|
|
+.. c:type:: struct v4l2_ctrl_jpeg_quantization
|
|
+
|
|
+.. cssclass:: longtable
|
|
+
|
|
+.. flat-table:: struct v4l2_ctrl_jpeg_quantization
|
|
+ :header-rows: 0
|
|
+ :stub-columns: 0
|
|
+ :widths: 1 1 2
|
|
+
|
|
+ * - __u8
|
|
+ - ``precision``
|
|
+ - Specifies the coefficient precision. User shall set 0
|
|
+ for 8-bit, and 1 for 16-bit.
|
|
+
|
|
+ * - __u16
|
|
+ - ``luma_quantization_matrix[64]``
|
|
+ - Sets the luma quantization table.
|
|
+
|
|
+ * - __u16
|
|
+ - ``chroma_quantization_matrix[64]``
|
|
+ - Sets the chroma quantization table.
|
|
|
|
.. flat-table::
|
|
:header-rows: 0
|
|
diff --git a/Documentation/media/videodev2.h.rst.exceptions b/Documentation/media/videodev2.h.rst.exceptions
|
|
index ca9f0edc..a0a38e92 100644
|
|
--- a/Documentation/media/videodev2.h.rst.exceptions
|
|
+++ b/Documentation/media/videodev2.h.rst.exceptions
|
|
@@ -129,6 +129,7 @@ replace symbol V4L2_CTRL_TYPE_STRING :c:type:`v4l2_ctrl_type`
|
|
replace symbol V4L2_CTRL_TYPE_U16 :c:type:`v4l2_ctrl_type`
|
|
replace symbol V4L2_CTRL_TYPE_U32 :c:type:`v4l2_ctrl_type`
|
|
replace symbol V4L2_CTRL_TYPE_U8 :c:type:`v4l2_ctrl_type`
|
|
+replace symbol V4L2_CTRL_TYPE_JPEG_QUANTIZATION :c:type:`v4l2_ctrl_type`
|
|
|
|
# V4L2 capability defines
|
|
replace define V4L2_CAP_VIDEO_CAPTURE device-capabilities
|
|
diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c
|
|
index 599c1cbf..305bd7a9 100644
|
|
--- a/drivers/media/v4l2-core/v4l2-ctrls.c
|
|
+++ b/drivers/media/v4l2-core/v4l2-ctrls.c
|
|
@@ -999,6 +999,7 @@ const char *v4l2_ctrl_get_name(u32 id)
|
|
case V4L2_CID_JPEG_RESTART_INTERVAL: return "Restart Interval";
|
|
case V4L2_CID_JPEG_COMPRESSION_QUALITY: return "Compression Quality";
|
|
case V4L2_CID_JPEG_ACTIVE_MARKER: return "Active Markers";
|
|
+ case V4L2_CID_JPEG_QUANTIZATION: return "JPEG Quantization Tables";
|
|
|
|
/* Image source controls */
|
|
/* Keep the order of the 'case's the same as in v4l2-controls.h! */
|
|
@@ -1286,6 +1287,9 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type,
|
|
case V4L2_CID_DETECT_MD_REGION_GRID:
|
|
*type = V4L2_CTRL_TYPE_U8;
|
|
break;
|
|
+ case V4L2_CID_JPEG_QUANTIZATION:
|
|
+ *type = V4L2_CTRL_TYPE_JPEG_QUANTIZATION;
|
|
+ break;
|
|
case V4L2_CID_DETECT_MD_THRESHOLD_GRID:
|
|
*type = V4L2_CTRL_TYPE_U16;
|
|
break;
|
|
@@ -1612,6 +1616,9 @@ static int std_validate(const struct v4l2_ctrl *ctrl, u32 idx,
|
|
return -ERANGE;
|
|
return 0;
|
|
|
|
+ case V4L2_CTRL_TYPE_JPEG_QUANTIZATION:
|
|
+ return 0;
|
|
+
|
|
default:
|
|
return -EINVAL;
|
|
}
|
|
@@ -2133,6 +2140,9 @@ static struct v4l2_ctrl *v4l2_ctrl_new(struct v4l2_ctrl_handler *hdl,
|
|
case V4L2_CTRL_TYPE_U32:
|
|
elem_size = sizeof(u32);
|
|
break;
|
|
+ case V4L2_CTRL_TYPE_JPEG_QUANTIZATION:
|
|
+ elem_size = sizeof(struct v4l2_ctrl_jpeg_quantization);
|
|
+ break;
|
|
default:
|
|
if (type < V4L2_CTRL_COMPOUND_TYPES)
|
|
elem_size = sizeof(s32);
|
|
diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h
|
|
index e4ee10ee..856b3325 100644
|
|
--- a/include/uapi/linux/v4l2-controls.h
|
|
+++ b/include/uapi/linux/v4l2-controls.h
|
|
@@ -987,6 +987,18 @@ enum v4l2_jpeg_chroma_subsampling {
|
|
#define V4L2_JPEG_ACTIVE_MARKER_DQT (1 << 17)
|
|
#define V4L2_JPEG_ACTIVE_MARKER_DHT (1 << 18)
|
|
|
|
+#define V4L2_CID_JPEG_QUANTIZATION (V4L2_CID_JPEG_CLASS_BASE + 5)
|
|
+struct v4l2_ctrl_jpeg_quantization {
|
|
+ /* ITU-T.81 specifies two quantization coefficient precisions:
|
|
+ * 8-bit for baseline profile,
|
|
+ * 8-bit or 16-bit for extended profile.
|
|
+ *
|
|
+ * User shall set "precision" to 0 for 8-bit and 1 for 16-bit.
|
|
+ */
|
|
+ __u8 precision;
|
|
+ __u16 luma_quantization_matrix[64];
|
|
+ __u16 chroma_quantization_matrix[64];
|
|
+};
|
|
|
|
/* Image source controls */
|
|
#define V4L2_CID_IMAGE_SOURCE_CLASS_BASE (V4L2_CTRL_CLASS_IMAGE_SOURCE | 0x900)
|
|
diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
|
|
index f271048c..e998d074 100644
|
|
--- a/include/uapi/linux/videodev2.h
|
|
+++ b/include/uapi/linux/videodev2.h
|
|
@@ -1630,6 +1630,7 @@ enum v4l2_ctrl_type {
|
|
V4L2_CTRL_TYPE_U8 = 0x0100,
|
|
V4L2_CTRL_TYPE_U16 = 0x0101,
|
|
V4L2_CTRL_TYPE_U32 = 0x0102,
|
|
+ V4L2_CTRL_TYPE_JPEG_QUANTIZATION = 0x0103,
|
|
};
|
|
|
|
/* Used in the VIDIOC_QUERYCTRL ioctl for querying controls */
|
|
--
|
|
2.16.4
|
|
|