* [PATCH RFC 0/2] media: stateless MPEG-1 decoding, cedrus support
@ 2026-11-19 16:34 Arun Iyengar via B4 Relay
2026-11-19 16:34 ` [PATCH RFC 1/2] media: uapi: mpeg2: add MPEG-1 flags and the MPEG-1 parsed slice format Arun Iyengar via B4 Relay
2026-11-19 16:34 ` [PATCH RFC 2/2] media: cedrus: mpeg2: decode MPEG-1 as V4L2_PIX_FMT_MPEG1_SLICE Arun Iyengar via B4 Relay
0 siblings, 2 replies; 3+ messages in thread
From: Arun Iyengar via B4 Relay @ 2026-11-19 16:34 UTC (permalink / raw)
To: Hans Verkuil, Nicolas Dufresne, Mauro Carvalho Chehab,
Benjamin Gaignard, Philipp Zabel, Maxime Ripard,
Paul Kocialkowski, Greg Kroah-Hartman, Chen-Yu Tsai,
Jernej Skrabec, Samuel Holland
Cc: Jonas Karlman, linux-media, linux-kernel, linux-rockchip,
linux-staging, linux-arm-kernel, linux-sunxi,
Christian Stefan Kövér-Draxl, Arun Iyengar
Builds on Jernej Skrabec's cedrus work; tested with an FFmpeg hwaccel
on top of Jonas Karlman's V4L2 request API series (FFmpeg PR 20847).
MPEG-1 decoded as MPEG-2 is wrong: the mismatch control differs, and
MPEG-1 has full pel motion vectors and D-pictures. Patch 1 adds
V4L2_PIX_FMT_MPEG1_SLICE, which reuses the MPEG-2 controls with one
sequence flag and two picture flags; hantro rejects the new flags and
D-pictures (compile tested only). Patch 2 implements it in cedrus.
RFC questions:
- Is a separate pixel format the right way to make MPEG-1
discoverable? Christian's Amlogic series decodes MPEG-1 through
V4L2_PIX_FMT_MPEG2_SLICE.
- V4L2_MPEG2_SEQ_FLAG_MPEG1 is redundant with the format. I kept it so
that the controls describe the bitstream on their own; happy to drop
it.
FFmpeg patches (the second corrects D-picture handling of the first):
https://github.com/SomeComputerGuy/orangepizero2/blob/7ed24f39cbf0f4b285cd142c291267c9cfb818f4/patches/ffmpeg/0304-avcodec-add-V4L2-Request-API-MPEG-1-hwaccel.patch
https://github.com/SomeComputerGuy/orangepizero2/blob/7ed24f39cbf0f4b285cd142c291267c9cfb818f4/patches/ffmpeg/0309-avcodec-mpeg12dec-hand-D-pictures-only-to-hwaccels-t.patch
Tested on H616 only, on media-committers next: MPEG-1 (D-pictures
included), MPEG-2, H.264 and H.265 decode bit-exact against FFmpeg
software decoding; v4l2-compliance 49 of 49 with the v4l-utils patch
that teaches it the new format (sent separately).
Developed with Claude (Anthropic) as a coding assistant, which wrote
the code and the commit messages. I reviewed and tested them as
described above.
---
Arun Iyengar (2):
media: uapi: mpeg2: add MPEG-1 flags and the MPEG-1 parsed slice format
media: cedrus: mpeg2: decode MPEG-1 as V4L2_PIX_FMT_MPEG1_SLICE
.../media/v4l/ext-ctrls-codec-stateless.rst | 35 ++++++++++++++++++--
.../userspace-api/media/v4l/pixfmt-compressed.rst | 23 +++++++++++++
drivers/media/platform/verisilicon/hantro_drv.c | 12 +++++++
drivers/media/v4l2-core/v4l2-ctrls-core.c | 1 +
drivers/media/v4l2-core/v4l2-ioctl.c | 1 +
drivers/staging/media/sunxi/cedrus/cedrus.c | 22 +++++++++++++
drivers/staging/media/sunxi/cedrus/cedrus_dec.c | 1 +
drivers/staging/media/sunxi/cedrus/cedrus_hw.c | 1 +
drivers/staging/media/sunxi/cedrus/cedrus_mpeg2.c | 38 +++++++++++++++++++---
drivers/staging/media/sunxi/cedrus/cedrus_video.c | 7 ++++
include/uapi/linux/v4l2-controls.h | 3 ++
include/uapi/linux/videodev2.h | 1 +
12 files changed, 139 insertions(+), 6 deletions(-)
---
base-commit: aa0f4c41d4870a18e65772a1817af16427200371
change-id: 20261114-b4-cedrus-mpeg1-8baae5a2eefe
Best regards,
--
Arun Iyengar <aiyengar1990@gmail.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH RFC 1/2] media: uapi: mpeg2: add MPEG-1 flags and the MPEG-1 parsed slice format
2026-11-19 16:34 [PATCH RFC 0/2] media: stateless MPEG-1 decoding, cedrus support Arun Iyengar via B4 Relay
@ 2026-11-19 16:34 ` Arun Iyengar via B4 Relay
2026-11-19 16:34 ` [PATCH RFC 2/2] media: cedrus: mpeg2: decode MPEG-1 as V4L2_PIX_FMT_MPEG1_SLICE Arun Iyengar via B4 Relay
1 sibling, 0 replies; 3+ messages in thread
From: Arun Iyengar via B4 Relay @ 2026-11-19 16:34 UTC (permalink / raw)
To: Hans Verkuil, Nicolas Dufresne, Mauro Carvalho Chehab,
Benjamin Gaignard, Philipp Zabel, Maxime Ripard,
Paul Kocialkowski, Greg Kroah-Hartman, Chen-Yu Tsai,
Jernej Skrabec, Samuel Holland
Cc: Jonas Karlman, linux-media, linux-kernel, linux-rockchip,
linux-staging, linux-arm-kernel, linux-sunxi,
Christian Stefan Kövér-Draxl, Arun Iyengar
From: Arun Iyengar <aiyengar1990@gmail.com>
Stateless MPEG-2 decoders can decode MPEG-1, but the uAPI cannot say a
stream is MPEG-1, and decoding it as MPEG-2 is wrong: MPEG-1 has its own
inverse quantisation mismatch control, full pel motion vectors and
D-pictures.
Add V4L2_MPEG2_SEQ_FLAG_MPEG1, V4L2_MPEG2_PIC_FLAG_FULL_PEL_FORWARD and
_BACKWARD, and allow V4L2_MPEG2_PIC_CODING_TYPE_D for MPEG-1.
Flags alone are not discoverable (the control framework does not check
compound control flags, and existing drivers would decode such a stream
as MPEG-2), so add V4L2_PIX_FMT_MPEG1_SLICE ('MG1S'). It reuses the
MPEG-2 controls; the MPEG-1 flag is set with this format only. Drivers
that cannot decode D-pictures reject that coding type, also in
VIDIOC_TRY_EXT_CTRLS, so applications can check before decoding.
hantro has no MPEG-1 mode: reject the MPEG-1 flags and D-pictures
there, which it would otherwise decode as MPEG-2 inter pictures.
Signed-off-by: Arun Iyengar <aiyengar1990@gmail.com>
---
.../media/v4l/ext-ctrls-codec-stateless.rst | 35 ++++++++++++++++++++--
.../userspace-api/media/v4l/pixfmt-compressed.rst | 23 ++++++++++++++
drivers/media/platform/verisilicon/hantro_drv.c | 12 ++++++++
drivers/media/v4l2-core/v4l2-ctrls-core.c | 1 +
drivers/media/v4l2-core/v4l2-ioctl.c | 1 +
include/uapi/linux/v4l2-controls.h | 3 ++
include/uapi/linux/videodev2.h | 1 +
7 files changed, 74 insertions(+), 2 deletions(-)
diff --git a/Documentation/userspace-api/media/v4l/ext-ctrls-codec-stateless.rst b/Documentation/userspace-api/media/v4l/ext-ctrls-codec-stateless.rst
index d7a3b8ef03a7..afe57be7cb87 100644
--- a/Documentation/userspace-api/media/v4l/ext-ctrls-codec-stateless.rst
+++ b/Documentation/userspace-api/media/v4l/ext-ctrls-codec-stateless.rst
@@ -1317,6 +1317,23 @@ FWHT Flags
- 0x01
- Indication that all the frames for the sequence are progressive instead
of interlaced.
+ * - ``V4L2_MPEG2_SEQ_FLAG_MPEG1``
+ - 0x02
+ - The sequence is an ISO/IEC 11172-2 (MPEG-1) sequence: the inverse
+ quantisation uses the MPEG-1 mismatch control, motion vectors may be
+ full pel and pictures may be D-pictures. Applications set this flag
+ if and only if the coded format is ``V4L2_PIX_FMT_MPEG1_SLICE``;
+ drivers reject it with ``V4L2_PIX_FMT_MPEG2_SLICE``. MPEG-1 has no
+ sequence or picture extensions: applications set the fields that
+ come from them to chroma_format 1, V4L2_MPEG2_SEQ_FLAG_PROGRESSIVE,
+ frame pictures with V4L2_MPEG2_PIC_FLAG_FRAME_PRED_DCT and
+ V4L2_MPEG2_PIC_FLAG_PROGRESSIVE, intra_dc_precision 0, the flags
+ V4L2_MPEG2_PIC_FLAG_Q_SCALE_TYPE, V4L2_MPEG2_PIC_FLAG_INTRA_VLC,
+ V4L2_MPEG2_PIC_FLAG_ALT_SCAN, V4L2_MPEG2_PIC_FLAG_CONCEALMENT_MV,
+ V4L2_MPEG2_PIC_FLAG_TOP_FIELD_FIRST and
+ V4L2_MPEG2_PIC_FLAG_REPEAT_FIRST cleared, both components of
+ ``f_code[0]`` set to forward_f_code and of ``f_code[1]`` to
+ backward_f_code.
.. raw:: latex
@@ -1366,8 +1383,12 @@ FWHT Flags
* - __u8
- ``picture_coding_type``
- Picture coding type for the frame covered by the current slice
- (V4L2_MPEG2_PIC_CODING_TYPE_I, V4L2_MPEG2_PIC_CODING_TYPE_P or
- V4L2_MPEG2_PIC_CODING_TYPE_B).
+ (V4L2_MPEG2_PIC_CODING_TYPE_I, V4L2_MPEG2_PIC_CODING_TYPE_P,
+ V4L2_MPEG2_PIC_CODING_TYPE_B, or V4L2_MPEG2_PIC_CODING_TYPE_D in MPEG-1
+ sequences). Decoding D-pictures is optional: drivers that cannot
+ decode them reject V4L2_MPEG2_PIC_CODING_TYPE_D, also in
+ ``VIDIOC_TRY_EXT_CTRLS``, which applications can use to find out
+ whether D-pictures are supported.
* - __u8
- ``picture_structure``
- Picture structure (1: interlaced top field, 2: interlaced bottom field,
@@ -1415,6 +1436,16 @@ FWHT Flags
* - ``V4L2_MPEG2_PIC_FLAG_PROGRESSIVE``
- 0x00000080
- Indicates whether the current frame is progressive.
+ * - ``V4L2_MPEG2_PIC_FLAG_FULL_PEL_FORWARD``
+ - 0x00000100
+ - full_pel_forward_vector of an MPEG-1 picture header: the forward
+ motion vectors are in full pel units. Only valid with
+ V4L2_MPEG2_SEQ_FLAG_MPEG1.
+ * - ``V4L2_MPEG2_PIC_FLAG_FULL_PEL_BACKWARD``
+ - 0x00000200
+ - full_pel_backward_vector of an MPEG-1 picture header: the backward
+ motion vectors are in full pel units. Only valid with
+ V4L2_MPEG2_SEQ_FLAG_MPEG1.
.. raw:: latex
diff --git a/Documentation/userspace-api/media/v4l/pixfmt-compressed.rst b/Documentation/userspace-api/media/v4l/pixfmt-compressed.rst
index 235f955d3cd5..898bb5393f9f 100644
--- a/Documentation/userspace-api/media/v4l/pixfmt-compressed.rst
+++ b/Documentation/userspace-api/media/v4l/pixfmt-compressed.rst
@@ -129,6 +129,29 @@ Compressed Formats
this pixel format. The output buffer must contain the appropriate number
of macroblocks to decode a full corresponding frame to the matching
capture buffer.
+ * .. _V4L2-PIX-FMT-MPEG1-SLICE:
+
+ - ``V4L2_PIX_FMT_MPEG1_SLICE``
+ - 'MG1S'
+ - MPEG-1 parsed slice data, as extracted from the MPEG-1
+ (ISO/IEC 11172-2) bitstream. This format is adapted for stateless
+ video decoders that implement a MPEG-1 pipeline with the
+ :ref:`stateless_decoder`. It uses the controls of
+ ``V4L2_PIX_FMT_MPEG2_SLICE``: metadata associated with the frame to
+ decode is required to be passed through the
+ ``V4L2_CID_STATELESS_MPEG2_SEQUENCE`` and
+ ``V4L2_CID_STATELESS_MPEG2_PICTURE`` controls, with
+ ``V4L2_MPEG2_SEQ_FLAG_MPEG1`` set in the sequence control and the
+ fields that come from the MPEG-2 extensions filled as described for
+ that flag. Quantisation matrices can optionally be specified through
+ the ``V4L2_CID_STATELESS_MPEG2_QUANTISATION`` control.
+ See the :ref:`associated Codec Control IDs <v4l2-codec-stateless-mpeg2>`.
+ Exactly one output and one capture buffer must be provided for use with
+ this pixel format. The output buffer must contain the appropriate number
+ of macroblocks to decode a full corresponding frame to the matching
+ capture buffer. Decoders that enumerate this format decode MPEG-1
+ sequences; decoders that only enumerate ``V4L2_PIX_FMT_MPEG2_SLICE``
+ do not.
* .. _V4L2-PIX-FMT-MPEG4:
- ``V4L2_PIX_FMT_MPEG4``
diff --git a/drivers/media/platform/verisilicon/hantro_drv.c b/drivers/media/platform/verisilicon/hantro_drv.c
index 26e5d5547466..c910a69e8e3c 100644
--- a/drivers/media/platform/verisilicon/hantro_drv.c
+++ b/drivers/media/platform/verisilicon/hantro_drv.c
@@ -264,6 +264,16 @@ static int hantro_try_ctrl(struct v4l2_ctrl *ctrl)
if (sps->bit_depth_luma_minus8 != 0 && sps->bit_depth_luma_minus8 != 2)
/* Only 8-bit and 10-bit are supported */
return -EINVAL;
+ } else if (ctrl->id == V4L2_CID_STATELESS_MPEG2_SEQUENCE) {
+ if (ctrl->p_new.p_mpeg2_sequence->flags & V4L2_MPEG2_SEQ_FLAG_MPEG1)
+ return -EINVAL;
+ } else if (ctrl->id == V4L2_CID_STATELESS_MPEG2_PICTURE) {
+ const struct v4l2_ctrl_mpeg2_picture *pic = ctrl->p_new.p_mpeg2_picture;
+
+ if (pic->picture_coding_type == V4L2_MPEG2_PIC_CODING_TYPE_D ||
+ pic->flags & (V4L2_MPEG2_PIC_FLAG_FULL_PEL_FORWARD |
+ V4L2_MPEG2_PIC_FLAG_FULL_PEL_BACKWARD))
+ return -EINVAL;
} else if (ctrl->id == V4L2_CID_STATELESS_VP9_FRAME) {
const struct v4l2_ctrl_vp9_frame *dec_params = ctrl->p_new.p_vp9_frame;
@@ -435,11 +445,13 @@ static const struct hantro_ctrl controls[] = {
.codec = HANTRO_MPEG2_DECODER,
.cfg = {
.id = V4L2_CID_STATELESS_MPEG2_SEQUENCE,
+ .ops = &hantro_ctrl_ops,
},
}, {
.codec = HANTRO_MPEG2_DECODER,
.cfg = {
.id = V4L2_CID_STATELESS_MPEG2_PICTURE,
+ .ops = &hantro_ctrl_ops,
},
}, {
.codec = HANTRO_MPEG2_DECODER,
diff --git a/drivers/media/v4l2-core/v4l2-ctrls-core.c b/drivers/media/v4l2-core/v4l2-ctrls-core.c
index 6e751a043a21..a12359626121 100644
--- a/drivers/media/v4l2-core/v4l2-ctrls-core.c
+++ b/drivers/media/v4l2-core/v4l2-ctrls-core.c
@@ -1049,6 +1049,7 @@ static int std_validate_compound(const struct v4l2_ctrl *ctrl, u32 idx,
case V4L2_MPEG2_PIC_CODING_TYPE_I:
case V4L2_MPEG2_PIC_CODING_TYPE_P:
case V4L2_MPEG2_PIC_CODING_TYPE_B:
+ case V4L2_MPEG2_PIC_CODING_TYPE_D:
break;
default:
return -EINVAL;
diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
index b7d248ab7db2..bbe7a0ae75df 100644
--- a/drivers/media/v4l2-core/v4l2-ioctl.c
+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
@@ -1507,6 +1507,7 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt)
case V4L2_PIX_FMT_H263: descr = "H.263"; break;
case V4L2_PIX_FMT_MPEG1: descr = "MPEG-1 ES"; break;
case V4L2_PIX_FMT_MPEG2: descr = "MPEG-2 ES"; break;
+ case V4L2_PIX_FMT_MPEG1_SLICE: descr = "MPEG-1 Parsed Slice Data"; break;
case V4L2_PIX_FMT_MPEG2_SLICE: descr = "MPEG-2 Parsed Slice Data"; break;
case V4L2_PIX_FMT_MPEG4: descr = "MPEG-4 Part 2 ES"; break;
case V4L2_PIX_FMT_XVID: descr = "Xvid"; break;
diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h
index d17e41d51d2e..e7e6030ac00c 100644
--- a/include/uapi/linux/v4l2-controls.h
+++ b/include/uapi/linux/v4l2-controls.h
@@ -2007,6 +2007,7 @@ struct v4l2_ctrl_vp8_frame {
/* Stateless MPEG-2 controls */
#define V4L2_MPEG2_SEQ_FLAG_PROGRESSIVE 0x01
+#define V4L2_MPEG2_SEQ_FLAG_MPEG1 0x02
#define V4L2_CID_STATELESS_MPEG2_SEQUENCE (V4L2_CID_CODEC_STATELESS_BASE+220)
/**
@@ -2055,6 +2056,8 @@ struct v4l2_ctrl_mpeg2_sequence {
#define V4L2_MPEG2_PIC_FLAG_ALT_SCAN 0x0020
#define V4L2_MPEG2_PIC_FLAG_REPEAT_FIRST 0x0040
#define V4L2_MPEG2_PIC_FLAG_PROGRESSIVE 0x0080
+#define V4L2_MPEG2_PIC_FLAG_FULL_PEL_FORWARD 0x0100
+#define V4L2_MPEG2_PIC_FLAG_FULL_PEL_BACKWARD 0x0200
#define V4L2_CID_STATELESS_MPEG2_PICTURE (V4L2_CID_CODEC_STATELESS_BASE+221)
/**
diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
index 5373dba640fa..c7469c01e83f 100644
--- a/include/uapi/linux/videodev2.h
+++ b/include/uapi/linux/videodev2.h
@@ -761,6 +761,7 @@ struct v4l2_pix_format {
#define V4L2_PIX_FMT_MPEG1 v4l2_fourcc('M', 'P', 'G', '1') /* MPEG-1 ES */
#define V4L2_PIX_FMT_MPEG2 v4l2_fourcc('M', 'P', 'G', '2') /* MPEG-2 ES */
#define V4L2_PIX_FMT_MPEG2_SLICE v4l2_fourcc('M', 'G', '2', 'S') /* MPEG-2 parsed slice data */
+#define V4L2_PIX_FMT_MPEG1_SLICE v4l2_fourcc('M', 'G', '1', 'S') /* MPEG-1 parsed slice data */
#define V4L2_PIX_FMT_MPEG4 v4l2_fourcc('M', 'P', 'G', '4') /* MPEG-4 part 2 ES */
#define V4L2_PIX_FMT_XVID v4l2_fourcc('X', 'V', 'I', 'D') /* Xvid */
#define V4L2_PIX_FMT_VC1_ANNEX_G v4l2_fourcc('V', 'C', '1', 'G') /* SMPTE 421M Annex G compliant stream */
--
2.55.0
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH RFC 2/2] media: cedrus: mpeg2: decode MPEG-1 as V4L2_PIX_FMT_MPEG1_SLICE
2026-11-19 16:34 [PATCH RFC 0/2] media: stateless MPEG-1 decoding, cedrus support Arun Iyengar via B4 Relay
2026-11-19 16:34 ` [PATCH RFC 1/2] media: uapi: mpeg2: add MPEG-1 flags and the MPEG-1 parsed slice format Arun Iyengar via B4 Relay
@ 2026-11-19 16:34 ` Arun Iyengar via B4 Relay
1 sibling, 0 replies; 3+ messages in thread
From: Arun Iyengar via B4 Relay @ 2026-11-19 16:34 UTC (permalink / raw)
To: Hans Verkuil, Nicolas Dufresne, Mauro Carvalho Chehab,
Benjamin Gaignard, Philipp Zabel, Maxime Ripard,
Paul Kocialkowski, Greg Kroah-Hartman, Chen-Yu Tsai,
Jernej Skrabec, Samuel Holland
Cc: Jonas Karlman, linux-media, linux-kernel, linux-rockchip,
linux-staging, linux-arm-kernel, linux-sunxi,
Christian Stefan Kövér-Draxl, Arun Iyengar
From: Arun Iyengar <aiyengar1990@gmail.com>
The engine has an MPEG-1 mode, selected with the MPEG-1 decoder type in
the trigger register, and takes the full pel flags and the picture
coding type (D-pictures included) in the picture header register.
Enumerate V4L2_PIX_FMT_MPEG1_SLICE on every variant with the MPEG-2
decoder (tested on H616 only), with the MPEG-2 limits, and select the
MPEG-1 mode from the coded format. try_ctrl accepts the MPEG-1 flag, the
full pel flags and D-pictures only with the MPEG-1 format. A job whose
sequence control does not match the coded format fails, as do field
pictures in MPEG-1 sequences.
Signed-off-by: Arun Iyengar <aiyengar1990@gmail.com>
---
drivers/staging/media/sunxi/cedrus/cedrus.c | 22 +++++++++++++
drivers/staging/media/sunxi/cedrus/cedrus_dec.c | 1 +
drivers/staging/media/sunxi/cedrus/cedrus_hw.c | 1 +
drivers/staging/media/sunxi/cedrus/cedrus_mpeg2.c | 38 ++++++++++++++++++++---
drivers/staging/media/sunxi/cedrus/cedrus_video.c | 7 +++++
5 files changed, 65 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/media/sunxi/cedrus/cedrus.c b/drivers/staging/media/sunxi/cedrus/cedrus.c
index c3331b4f3f02..60b296032a90 100644
--- a/drivers/staging/media/sunxi/cedrus/cedrus.c
+++ b/drivers/staging/media/sunxi/cedrus/cedrus.c
@@ -77,6 +77,26 @@ static int cedrus_try_ctrl(struct v4l2_ctrl *ctrl)
ctx->bit_depth = bit_depth;
cedrus_reset_cap_format(ctx);
}
+ } else if (ctrl->id == V4L2_CID_STATELESS_MPEG2_SEQUENCE) {
+ const struct v4l2_ctrl_mpeg2_sequence *seq =
+ ctrl->p_new.p_mpeg2_sequence;
+ struct cedrus_ctx *ctx = container_of(ctrl->handler,
+ struct cedrus_ctx, hdl);
+
+ if (seq->flags & V4L2_MPEG2_SEQ_FLAG_MPEG1 &&
+ ctx->src_fmt.pixelformat != V4L2_PIX_FMT_MPEG1_SLICE)
+ return -EINVAL;
+ } else if (ctrl->id == V4L2_CID_STATELESS_MPEG2_PICTURE) {
+ const struct v4l2_ctrl_mpeg2_picture *pic =
+ ctrl->p_new.p_mpeg2_picture;
+ struct cedrus_ctx *ctx = container_of(ctrl->handler,
+ struct cedrus_ctx, hdl);
+
+ if (ctx->src_fmt.pixelformat != V4L2_PIX_FMT_MPEG1_SLICE &&
+ (pic->picture_coding_type == V4L2_MPEG2_PIC_CODING_TYPE_D ||
+ pic->flags & (V4L2_MPEG2_PIC_FLAG_FULL_PEL_FORWARD |
+ V4L2_MPEG2_PIC_FLAG_FULL_PEL_BACKWARD)))
+ return -EINVAL;
}
return 0;
@@ -90,12 +110,14 @@ static const struct cedrus_control cedrus_controls[] = {
{
.cfg = {
.id = V4L2_CID_STATELESS_MPEG2_SEQUENCE,
+ .ops = &cedrus_ctrl_ops,
},
.capabilities = CEDRUS_CAPABILITY_MPEG2_DEC,
},
{
.cfg = {
.id = V4L2_CID_STATELESS_MPEG2_PICTURE,
+ .ops = &cedrus_ctrl_ops,
},
.capabilities = CEDRUS_CAPABILITY_MPEG2_DEC,
},
diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_dec.c b/drivers/staging/media/sunxi/cedrus/cedrus_dec.c
index 9f8b0555b7dc..6657d6060c39 100644
--- a/drivers/staging/media/sunxi/cedrus/cedrus_dec.c
+++ b/drivers/staging/media/sunxi/cedrus/cedrus_dec.c
@@ -41,6 +41,7 @@ void cedrus_device_run(void *priv)
switch (ctx->src_fmt.pixelformat) {
case V4L2_PIX_FMT_MPEG2_SLICE:
+ case V4L2_PIX_FMT_MPEG1_SLICE:
run.mpeg2.sequence = cedrus_find_control_data(ctx,
V4L2_CID_STATELESS_MPEG2_SEQUENCE);
run.mpeg2.picture = cedrus_find_control_data(ctx,
diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_hw.c b/drivers/staging/media/sunxi/cedrus/cedrus_hw.c
index 444fb53878d1..fd3ee8f5e9a5 100644
--- a/drivers/staging/media/sunxi/cedrus/cedrus_hw.c
+++ b/drivers/staging/media/sunxi/cedrus/cedrus_hw.c
@@ -44,6 +44,7 @@ int cedrus_engine_enable(struct cedrus_ctx *ctx)
switch (ctx->src_fmt.pixelformat) {
case V4L2_PIX_FMT_MPEG2_SLICE:
+ case V4L2_PIX_FMT_MPEG1_SLICE:
reg |= VE_MODE_DEC_MPEG;
break;
diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_mpeg2.c b/drivers/staging/media/sunxi/cedrus/cedrus_mpeg2.c
index 10e98f08aafc..18d91b9b1e4a 100644
--- a/drivers/staging/media/sunxi/cedrus/cedrus_mpeg2.c
+++ b/drivers/staging/media/sunxi/cedrus/cedrus_mpeg2.c
@@ -48,6 +48,30 @@ static void cedrus_mpeg2_irq_disable(struct cedrus_ctx *ctx)
cedrus_write(dev, VE_DEC_MPEG_CTRL, reg);
}
+static bool cedrus_mpeg2_is_mpeg1(struct cedrus_ctx *ctx)
+{
+ return ctx->src_fmt.pixelformat == V4L2_PIX_FMT_MPEG1_SLICE;
+}
+
+static bool
+cedrus_mpeg2_format_matches(struct cedrus_ctx *ctx,
+ const struct v4l2_ctrl_mpeg2_sequence *seq,
+ const struct v4l2_ctrl_mpeg2_picture *pic)
+{
+ bool mpeg1 = cedrus_mpeg2_is_mpeg1(ctx);
+
+ /* try_ctrl checked the controls against the format set at that time. */
+ if (mpeg1 != !!(seq->flags & V4L2_MPEG2_SEQ_FLAG_MPEG1))
+ return false;
+
+ if (mpeg1)
+ return pic->picture_structure == V4L2_MPEG2_PIC_FRAME;
+
+ return pic->picture_coding_type != V4L2_MPEG2_PIC_CODING_TYPE_D &&
+ !(pic->flags & (V4L2_MPEG2_PIC_FLAG_FULL_PEL_FORWARD |
+ V4L2_MPEG2_PIC_FLAG_FULL_PEL_BACKWARD));
+}
+
static int cedrus_mpeg2_setup(struct cedrus_ctx *ctx, struct cedrus_run *run)
{
const struct v4l2_ctrl_mpeg2_sequence *seq;
@@ -63,6 +87,9 @@ static int cedrus_mpeg2_setup(struct cedrus_ctx *ctx, struct cedrus_run *run)
seq = run->mpeg2.sequence;
pic = run->mpeg2.picture;
+ if (!cedrus_mpeg2_format_matches(ctx, seq, pic))
+ return -EINVAL;
+
quantisation = run->mpeg2.quantisation;
/* Activate MPEG engine. */
@@ -101,8 +128,10 @@ static int cedrus_mpeg2_setup(struct cedrus_ctx *ctx, struct cedrus_run *run)
reg |= VE_DEC_MPEG_MP12HDR_Q_SCALE_TYPE(pic->flags & V4L2_MPEG2_PIC_FLAG_Q_SCALE_TYPE);
reg |= VE_DEC_MPEG_MP12HDR_INTRA_VLC_FORMAT(pic->flags & V4L2_MPEG2_PIC_FLAG_INTRA_VLC);
reg |= VE_DEC_MPEG_MP12HDR_ALTERNATE_SCAN(pic->flags & V4L2_MPEG2_PIC_FLAG_ALT_SCAN);
- reg |= VE_DEC_MPEG_MP12HDR_FULL_PEL_FORWARD_VECTOR(0);
- reg |= VE_DEC_MPEG_MP12HDR_FULL_PEL_BACKWARD_VECTOR(0);
+ reg |= VE_DEC_MPEG_MP12HDR_FULL_PEL_FORWARD_VECTOR(pic->flags &
+ V4L2_MPEG2_PIC_FLAG_FULL_PEL_FORWARD);
+ reg |= VE_DEC_MPEG_MP12HDR_FULL_PEL_BACKWARD_VECTOR(pic->flags &
+ V4L2_MPEG2_PIC_FLAG_FULL_PEL_BACKWARD);
cedrus_write(dev, VE_DEC_MPEG_MP12HDR, reg);
@@ -183,8 +212,9 @@ static void cedrus_mpeg2_trigger(struct cedrus_ctx *ctx)
u32 reg;
/* Trigger MPEG engine. */
- reg = VE_DEC_MPEG_TRIGGER_HW_MPEG_VLD | VE_DEC_MPEG_TRIGGER_MPEG2 |
- VE_DEC_MPEG_TRIGGER_MB_BOUNDARY;
+ reg = VE_DEC_MPEG_TRIGGER_HW_MPEG_VLD | VE_DEC_MPEG_TRIGGER_MB_BOUNDARY;
+ reg |= cedrus_mpeg2_is_mpeg1(ctx) ? VE_DEC_MPEG_TRIGGER_MPEG1 :
+ VE_DEC_MPEG_TRIGGER_MPEG2;
cedrus_write(dev, VE_DEC_MPEG_TRIGGER, reg);
}
diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_video.c b/drivers/staging/media/sunxi/cedrus/cedrus_video.c
index ad4ec3490775..8979693e9109 100644
--- a/drivers/staging/media/sunxi/cedrus/cedrus_video.c
+++ b/drivers/staging/media/sunxi/cedrus/cedrus_video.c
@@ -40,6 +40,11 @@ static struct cedrus_format cedrus_formats[] = {
.directions = CEDRUS_DECODE_SRC,
.capabilities = CEDRUS_CAPABILITY_MPEG2_DEC,
},
+ {
+ .pixelformat = V4L2_PIX_FMT_MPEG1_SLICE,
+ .directions = CEDRUS_DECODE_SRC,
+ .capabilities = CEDRUS_CAPABILITY_MPEG2_DEC,
+ },
{
.pixelformat = V4L2_PIX_FMT_H264_SLICE,
.directions = CEDRUS_DECODE_SRC,
@@ -125,6 +130,7 @@ void cedrus_prepare_format(struct v4l2_pix_format *pix_fmt)
switch (pix_fmt->pixelformat) {
case V4L2_PIX_FMT_MPEG2_SLICE:
+ case V4L2_PIX_FMT_MPEG1_SLICE:
case V4L2_PIX_FMT_H264_SLICE:
case V4L2_PIX_FMT_HEVC_SLICE:
case V4L2_PIX_FMT_VP8_FRAME:
@@ -352,6 +358,7 @@ static int cedrus_s_fmt_vid_out_p(struct cedrus_ctx *ctx,
switch (ctx->src_fmt.pixelformat) {
case V4L2_PIX_FMT_MPEG2_SLICE:
+ case V4L2_PIX_FMT_MPEG1_SLICE:
ctx->current_codec = &cedrus_dec_ops_mpeg2;
break;
case V4L2_PIX_FMT_H264_SLICE:
--
2.55.0
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2026-11-19 16:34 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-11-19 16:34 [PATCH RFC 0/2] media: stateless MPEG-1 decoding, cedrus support Arun Iyengar via B4 Relay
2026-11-19 16:34 ` [PATCH RFC 1/2] media: uapi: mpeg2: add MPEG-1 flags and the MPEG-1 parsed slice format Arun Iyengar via B4 Relay
2026-11-19 16:34 ` [PATCH RFC 2/2] media: cedrus: mpeg2: decode MPEG-1 as V4L2_PIX_FMT_MPEG1_SLICE Arun Iyengar via B4 Relay
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®