| Message ID | 20190816160132.7352-8-ezequiel@collabora.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | media: hantro: Add support for H264 decoding | expand |
Hi, On Fri 16 Aug 19, 13:01, Ezequiel Garcia wrote: > The cedrus VPU is slice-based and expects V4L2_PIX_FMT_H264_SLICE > buffers to contain H264 slices with no start code. For clarification, cedrus does not expect any of the two options we have specified but something in-between that is rather broken (a single frame composed of a single slice only, in the format that our userspace currently fills). So at this point, the uAPI is not yet harmonized across cedrus and hantro although the new controls from this series are exposed on both. This situation makes me realize that perhaps we should have a formal discussion on the roadmap we want to take for stabilizing the API. I see many points that need significant adjustments and the new controls that allow Rockchip support are just one aspect. Having both drivers abide by the API seems like the next logical step (as far as I understood, this is what Hans is expecting now), but I want to stress the fact that it is really not enough to make a proper API and things are still pretty broken all around. Cheers, Paul > Expose this to userspace with the newly added menu control. > > These two controls are specified as mandatory for applications, > but we mark them as non-required on the driver side for > backwards compatibility. > > Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com> > --- > Changes in v7: > * None. > Changes in v6: > * Remove incorrect menu_skip_mask. > Changes in v6: > * Adjust to control renames. > Changes in v5: > * Clarify commit log. > Changes in v4: > * New patch. > --- > drivers/staging/media/sunxi/cedrus/cedrus.c | 18 ++++++++++++++++++ > 1 file changed, 18 insertions(+) > > diff --git a/drivers/staging/media/sunxi/cedrus/cedrus.c b/drivers/staging/media/sunxi/cedrus/cedrus.c > index 7bdc413bf727..2d3ea8b74dfd 100644 > --- a/drivers/staging/media/sunxi/cedrus/cedrus.c > +++ b/drivers/staging/media/sunxi/cedrus/cedrus.c > @@ -77,6 +77,24 @@ static const struct cedrus_control cedrus_controls[] = { > .codec = CEDRUS_CODEC_H264, > .required = true, > }, > + { > + .cfg = { > + .id = V4L2_CID_MPEG_VIDEO_H264_DECODE_MODE, > + .max = V4L2_MPEG_VIDEO_H264_DECODE_MODE_SLICE_BASED, > + .def = V4L2_MPEG_VIDEO_H264_DECODE_MODE_SLICE_BASED, > + }, > + .codec = CEDRUS_CODEC_H264, > + .required = false, > + }, > + { > + .cfg = { > + .id = V4L2_CID_MPEG_VIDEO_H264_START_CODE, > + .max = V4L2_MPEG_VIDEO_H264_START_CODE_NONE, > + .def = V4L2_MPEG_VIDEO_H264_START_CODE_NONE, > + }, > + .codec = CEDRUS_CODEC_H264, > + .required = false, > + }, > }; > > #define CEDRUS_CONTROLS_COUNT ARRAY_SIZE(cedrus_controls) > -- > 2.22.0 >
diff --git a/drivers/staging/media/sunxi/cedrus/cedrus.c b/drivers/staging/media/sunxi/cedrus/cedrus.c index 7bdc413bf727..2d3ea8b74dfd 100644 --- a/drivers/staging/media/sunxi/cedrus/cedrus.c +++ b/drivers/staging/media/sunxi/cedrus/cedrus.c @@ -77,6 +77,24 @@ static const struct cedrus_control cedrus_controls[] = { .codec = CEDRUS_CODEC_H264, .required = true, }, + { + .cfg = { + .id = V4L2_CID_MPEG_VIDEO_H264_DECODE_MODE, + .max = V4L2_MPEG_VIDEO_H264_DECODE_MODE_SLICE_BASED, + .def = V4L2_MPEG_VIDEO_H264_DECODE_MODE_SLICE_BASED, + }, + .codec = CEDRUS_CODEC_H264, + .required = false, + }, + { + .cfg = { + .id = V4L2_CID_MPEG_VIDEO_H264_START_CODE, + .max = V4L2_MPEG_VIDEO_H264_START_CODE_NONE, + .def = V4L2_MPEG_VIDEO_H264_START_CODE_NONE, + }, + .codec = CEDRUS_CODEC_H264, + .required = false, + }, }; #define CEDRUS_CONTROLS_COUNT ARRAY_SIZE(cedrus_controls)
The cedrus VPU is slice-based and expects V4L2_PIX_FMT_H264_SLICE buffers to contain H264 slices with no start code. Expose this to userspace with the newly added menu control. These two controls are specified as mandatory for applications, but we mark them as non-required on the driver side for backwards compatibility. Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com> --- Changes in v7: * None. Changes in v6: * Remove incorrect menu_skip_mask. Changes in v6: * Adjust to control renames. Changes in v5: * Clarify commit log. Changes in v4: * New patch. --- drivers/staging/media/sunxi/cedrus/cedrus.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)