Hi,
On Thu, 2018-09-13 at 14:14 +0200, Paul Kocialkowski wrote:
> Hi,
>
> On Wed, 2018-09-05 at 19:00 -0300, Ezequiel Garcia wrote:
> > From: Shunqian Zheng <zhengsq@xxxxxxxxxxxxxx>
> >
> > Add V4L2_CID_JPEG_QUANTIZATION compound control to allow userspace
> > configure the JPEG quantization tables.
> >
> > Signed-off-by: Shunqian Zheng <zhengsq@xxxxxxxxxxxxxx>
> > Signed-off-by: Ezequiel Garcia <ezequiel@xxxxxxxxxxxxx>
> > ---
> > .../media/uapi/v4l/extended-controls.rst | 31 +++++++++++++++++++
> > .../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 9f7312bf3365..1335d27d30f3 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:
>
> I just had a look at how the Allwinner VPU handles JPEG decoding and it
> seems to require the following information (in addition to
> quantization):
>
> * Horizontal and vertical sampling factors for each Y/U/V component:
>
> The number of components and sampling factors are coded separately in
> the bitstream, but it's probably easier to use the already-existing
> V4L2_CID_JPEG_CHROMA_SUBSAMPLING control for specifying that.
>
> However, this is potentially very much related to the destination
> format. If we decide that this format should match the format resulting
> from decompression, we don't need to specify it through an external
> control. On the other hand, it's possible that the VPU has format
> conversion block integrated in its pipeline so it would also make sense
> to consider the destination format as independent.
>
> * Custom Huffman tables (DC and AC), both for luma and chroma
>
> It seems that there is a default table when no Huffman table is provided
> in the bitstream (I'm not too sure how standard that is, just started
> learning about JPEG). We probably need a specific control for that.
>
> * Reset interval
>
> That's extracted from the bitstream as well and there's a
> V4L2_CID_JPEG_RESTART_INTERVAL control already.
>
> In addition to these points, I see that among all the JPEG profiles,
> some have to do with arithmetic coding which will probably require a
> specific control on its own (not sure how it should look at this point
> though).
>
> What do you think?
For clarification: these are required for decoding, not for encoding.
For encoding, it seems that the Allwinner hardware only requires
quantization tables.
Cheers,
Paul
> > +``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 ca9f0edc579e..a0a38e92bf38 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 599c1cbff3b9..305bd7a9b7f1 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 e4ee10ee917d..856b3325052f 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 f9f3ae5b489e..8ace47cb1003 100644
> > --- a/include/uapi/linux/videodev2.h
> > +++ b/include/uapi/linux/videodev2.h
> > @@ -1637,6 +1637,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 */
--
Developer of free digital technology and hardware support.
Website: https://www.paulk.fr/
Coding blog: https://code.paulk.fr/
Git repositories: https://git.paulk.fr/ https://git.code.paulk.fr/
