20ea6adbf1
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>
155 lines
5.8 KiB
Diff
155 lines
5.8 KiB
Diff
From 49bdb5120b45a6c92e6f10d1d2db85f9d88ba1e3 Mon Sep 17 00:00:00 2001
|
|
From: Jernej Skrabec <jernej.skrabec@siol.net>
|
|
Date: Fri, 13 Dec 2019 17:04:25 +0100
|
|
Subject: [PATCH] media: uapi: hevc: Add scaling matrix control
|
|
|
|
Taken from https://patchwork.linuxtv.org/patch/60728/
|
|
Changes (mainly documentation) have been requested.
|
|
|
|
HEVC has a scaling matrix concept. Add support for it.
|
|
|
|
Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
|
|
---
|
|
.../media/v4l/ext-ctrls-codec.rst | 41 +++++++++++++++++++
|
|
.../media/v4l/pixfmt-compressed.rst | 5 ++-
|
|
drivers/media/v4l2-core/v4l2-ctrls.c | 10 +++++
|
|
include/media/hevc-ctrls.h | 11 +++++
|
|
4 files changed, 65 insertions(+), 2 deletions(-)
|
|
|
|
--- a/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst
|
|
+++ b/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst
|
|
@@ -3181,6 +3181,47 @@ enum v4l2_mpeg_video_hevc_size_of_length
|
|
|
|
\normalsize
|
|
|
|
+``V4L2_CID_MPEG_VIDEO_HEVC_SCALING_MATRIX (struct)``
|
|
+ Specifies the scaling matrix (as extracted from the bitstream) for
|
|
+ the associated HEVC slice data. The bitstream parameters are
|
|
+ defined according to :ref:`hevc`, section 7.4.5 "Scaling list
|
|
+ data semantics". For further documentation, refer to the above
|
|
+ specification, unless there is an explicit comment stating
|
|
+ otherwise.
|
|
+
|
|
+ .. note::
|
|
+
|
|
+ This compound control is not yet part of the public kernel API and
|
|
+ it is expected to change.
|
|
+
|
|
+.. c:type:: v4l2_ctrl_hevc_scaling_matrix
|
|
+
|
|
+.. cssclass:: longtable
|
|
+
|
|
+.. flat-table:: struct v4l2_ctrl_hevc_scaling_matrix
|
|
+ :header-rows: 0
|
|
+ :stub-columns: 0
|
|
+ :widths: 1 1 2
|
|
+
|
|
+ * - __u8
|
|
+ - ``scaling_list_4x4[6][16]``
|
|
+ -
|
|
+ * - __u8
|
|
+ - ``scaling_list_8x8[6][64]``
|
|
+ -
|
|
+ * - __u8
|
|
+ - ``scaling_list_16x16[6][64]``
|
|
+ -
|
|
+ * - __u8
|
|
+ - ``scaling_list_32x32[2][64]``
|
|
+ -
|
|
+ * - __u8
|
|
+ - ``scaling_list_dc_coef_16x16[6]``
|
|
+ -
|
|
+ * - __u8
|
|
+ - ``scaling_list_dc_coef_32x32[2]``
|
|
+ -
|
|
+
|
|
``V4L2_CID_MPEG_VIDEO_HEVC_DECODE_MODE (enum)``
|
|
Specifies the decoding mode to use. Currently exposes slice-based and
|
|
frame-based decoding but new modes might be added later on.
|
|
--- a/Documentation/userspace-api/media/v4l/pixfmt-compressed.rst
|
|
+++ b/Documentation/userspace-api/media/v4l/pixfmt-compressed.rst
|
|
@@ -195,8 +195,9 @@ Compressed Formats
|
|
Metadata associated with the frame to decode is required to be passed
|
|
through the following controls:
|
|
``V4L2_CID_MPEG_VIDEO_HEVC_SPS``,
|
|
- ``V4L2_CID_MPEG_VIDEO_HEVC_PPS``, and
|
|
- ``V4L2_CID_MPEG_VIDEO_HEVC_SLICE_PARAMS``.
|
|
+ ``V4L2_CID_MPEG_VIDEO_HEVC_PPS``,
|
|
+ ``V4L2_CID_MPEG_VIDEO_HEVC_SLICE_PARAMS``, and
|
|
+ ``V4L2_CID_MPEG_VIDEO_HEVC_SCALING_MATRIX``.
|
|
See the :ref:`associated Codec Control IDs <v4l2-mpeg-hevc>`.
|
|
Buffers associated with this pixel format must contain the appropriate
|
|
number of macroblocks to decode a full corresponding frame.
|
|
--- a/drivers/media/v4l2-core/v4l2-ctrls.c
|
|
+++ b/drivers/media/v4l2-core/v4l2-ctrls.c
|
|
@@ -1042,6 +1042,7 @@ const char *v4l2_ctrl_get_name(u32 id)
|
|
case V4L2_CID_MPEG_VIDEO_HEVC_SPS: return "HEVC Sequence Parameter Set";
|
|
case V4L2_CID_MPEG_VIDEO_HEVC_PPS: return "HEVC Picture Parameter Set";
|
|
case V4L2_CID_MPEG_VIDEO_HEVC_SLICE_PARAMS: return "HEVC Slice Parameters";
|
|
+ case V4L2_CID_MPEG_VIDEO_HEVC_SCALING_MATRIX: return "HEVC Scaling Matrix";
|
|
case V4L2_CID_MPEG_VIDEO_HEVC_DECODE_MODE: return "HEVC Decode Mode";
|
|
case V4L2_CID_MPEG_VIDEO_HEVC_START_CODE: return "HEVC Start Code";
|
|
|
|
@@ -1527,6 +1528,9 @@ void v4l2_ctrl_fill(u32 id, const char *
|
|
case V4L2_CID_MPEG_VIDEO_HEVC_SLICE_PARAMS:
|
|
*type = V4L2_CTRL_TYPE_HEVC_SLICE_PARAMS;
|
|
break;
|
|
+ case V4L2_CID_MPEG_VIDEO_HEVC_SCALING_MATRIX:
|
|
+ *type = V4L2_CTRL_TYPE_HEVC_SCALING_MATRIX;
|
|
+ break;
|
|
case V4L2_CID_UNIT_CELL_SIZE:
|
|
*type = V4L2_CTRL_TYPE_AREA;
|
|
*flags |= V4L2_CTRL_FLAG_READ_ONLY;
|
|
@@ -2238,6 +2242,9 @@ static int std_validate_compound(const s
|
|
|
|
break;
|
|
|
|
+ case V4L2_CTRL_TYPE_HEVC_SCALING_MATRIX:
|
|
+ break;
|
|
+
|
|
case V4L2_CTRL_TYPE_AREA:
|
|
area = p;
|
|
if (!area->width || !area->height)
|
|
@@ -2954,6 +2961,9 @@ static struct v4l2_ctrl *v4l2_ctrl_new(s
|
|
case V4L2_CTRL_TYPE_HDR10_MASTERING_DISPLAY:
|
|
elem_size = sizeof(struct v4l2_ctrl_hdr10_mastering_display);
|
|
break;
|
|
+ case V4L2_CTRL_TYPE_HEVC_SCALING_MATRIX:
|
|
+ elem_size = sizeof(struct v4l2_ctrl_hevc_scaling_matrix);
|
|
+ break;
|
|
case V4L2_CTRL_TYPE_AREA:
|
|
elem_size = sizeof(struct v4l2_area);
|
|
break;
|
|
--- a/include/media/hevc-ctrls.h
|
|
+++ b/include/media/hevc-ctrls.h
|
|
@@ -19,6 +19,7 @@
|
|
#define V4L2_CID_MPEG_VIDEO_HEVC_SPS (V4L2_CID_CODEC_BASE + 1008)
|
|
#define V4L2_CID_MPEG_VIDEO_HEVC_PPS (V4L2_CID_CODEC_BASE + 1009)
|
|
#define V4L2_CID_MPEG_VIDEO_HEVC_SLICE_PARAMS (V4L2_CID_CODEC_BASE + 1010)
|
|
+#define V4L2_CID_MPEG_VIDEO_HEVC_SCALING_MATRIX (V4L2_CID_CODEC_BASE + 1011)
|
|
#define V4L2_CID_MPEG_VIDEO_HEVC_DECODE_PARAMS (V4L2_CID_CODEC_BASE + 1012)
|
|
#define V4L2_CID_MPEG_VIDEO_HEVC_DECODE_MODE (V4L2_CID_CODEC_BASE + 1015)
|
|
#define V4L2_CID_MPEG_VIDEO_HEVC_START_CODE (V4L2_CID_CODEC_BASE + 1016)
|
|
@@ -27,6 +28,7 @@
|
|
#define V4L2_CTRL_TYPE_HEVC_SPS 0x0120
|
|
#define V4L2_CTRL_TYPE_HEVC_PPS 0x0121
|
|
#define V4L2_CTRL_TYPE_HEVC_SLICE_PARAMS 0x0122
|
|
+#define V4L2_CTRL_TYPE_HEVC_SCALING_MATRIX 0x0123
|
|
#define V4L2_CTRL_TYPE_HEVC_DECODE_PARAMS 0x0124
|
|
|
|
enum v4l2_mpeg_video_hevc_decode_mode {
|
|
@@ -238,4 +240,13 @@ struct v4l2_ctrl_hevc_decode_params {
|
|
*/
|
|
#define V4L2_CID_HANTRO_HEVC_SLICE_HEADER_SKIP (V4L2_CID_CODEC_HANTRO_BASE + 0)
|
|
|
|
+struct v4l2_ctrl_hevc_scaling_matrix {
|
|
+ __u8 scaling_list_4x4[6][16];
|
|
+ __u8 scaling_list_8x8[6][64];
|
|
+ __u8 scaling_list_16x16[6][64];
|
|
+ __u8 scaling_list_32x32[2][64];
|
|
+ __u8 scaling_list_dc_coef_16x16[6];
|
|
+ __u8 scaling_list_dc_coef_32x32[2];
|
|
+};
|
|
+
|
|
#endif
|