media: iris: set default size when S_FMT is called with zero size
Subsystems (4)
PATCH 1/1 media: iris: set default size when S_FMT is called with zero size
According to 4.5.1.5 of the M2M stateful decoder UAPI documentation, providing the width and the height is "required only if it cannot be parsed from the stream", otherwise zero can be passed.
The iris driver would only set the state fields to DEFAULT_WIDTH/HEIGHT once upon init, but they would get overwritten with zeroes from one S_FMT call and the next S_FMT call would already see zeroes in place of the defaults. For clients that used that sequence and did not pass a size, such as rpi-ffmpeg, this would then result in REQBUFS failing due to the zero size remembered in the state.
Fix by explicitly falling back to the defaults in S_FMT.
---
Somehow Venus didn't have this issue and didn't explicitly handle this..
I'm not familiar with this code so if there's a better way to comply with the UAPI requirements by just not even getting to overwrite the state with the provided 0 size, I could not figure it out.
Still, let's get this fixed one way or another.
Thanks,
~val
--- drivers/media/platform/qcom/iris/iris_vdec.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/media/platform/qcom/iris/iris_vdec.c +5 -0
@@ -196,6 +196,11 @@ int iris_vdec_s_fmt(struct iris_inst *inst, struct v4l2_format *f)if (vb2_is_busy (q))return -EBUSY ; +if (f->fmt.pix_mp.width ==0 && f->fmt.pix_mp.height ==0 ) { + f->fmt.pix_mp.width =DEFAULT_WIDTH ; + f->fmt.pix_mp.height =DEFAULT_HEIGHT ; + } +iris_vdec_try_fmt (inst, f);switch (f->type) {
Signature · 1 line
2.51.0
Quoted 11 lines · Val Packett
According to 4.5.1.5 of the M2M stateful decoder UAPI documentation, providing the width and the height is "required only if it cannot be parsed from the stream", otherwise zero can be passed.
The iris driver would only set the state fields to DEFAULT_WIDTH/HEIGHT once upon init, but they would get overwritten with zeroes from one
S_FMTcall and the nextS_FMTcall would already see zeroes in place of the defaults. For clients that used that sequence and did not pass a size, such as rpi-ffmpeg, this would then result in REQBUFS failing due to the zero size remembered in the state.
Quoted 7 lines
Fix by explicitly falling back to the defaults in
S_FMT.Fixes b530b95de22c ("media: iris: implement s_fmt, g_fmt and try_fmt ioctls")Signed-off-by Val Packett <[email protected]>---
Somehow Venus didn't have this issue and didn't explicitly handle this..
In venus driver, try_fmt is clamping the resolution between min and max supported which might be handling this case.
Quoted 18 lines
I'm not familiar with this code so if there's a better way to comply with the UAPI requirements by just not even getting to overwrite the state with the provided 0 size, I could not figure it out.
Still, let's get this fixed one way or another.
Thanks,
~val--- drivers/media/platform/qcom/iris/iris_vdec.c | 5 +++++ 1 file changed, 5 insertions(+)drivers/media/platform/qcom/iris/iris_vdec.c +0
-0
drivers/media/platform/qcom/iris/iris_vdec.c int iris_vdec_s_fmt(struct iris_inst *inst, struct v4l2_format *f) · line 198
Quoted 3 lines
drivers/media/platform/qcom/iris/iris_vdec.c +0
-0@@ -196,6 +196,11 @@ int iris_vdec_s_fmt(struct iris_inst *inst, struct v4l2_format *f)if (vb2_is_busy (q))return -EBUSY ;
Can you pls add a small comment here.
with that,
Quoted 8 lines
drivers/media/platform/qcom/iris/iris_vdec.c +5
-0+if (f->fmt.pix_mp.width ==0 && f->fmt.pix_mp.height ==0 ) { + f->fmt.pix_mp.width =DEFAULT_WIDTH ; + f->fmt.pix_mp.height =DEFAULT_HEIGHT ; + } +iris_vdec_try_fmt (inst, f);switch (f->type) {
Bryan O'Donoghue
maintainerQuoted 10 lines · Val Packett
drivers/media/platform/qcom/iris/iris_vdec.c | 5 +++++ 1 file changed, 5 insertions(+)drivers/media/platform/qcom/iris/iris_vdec.c +0
-0@@ -196,6 +196,11 @@ int iris_vdec_s_fmt(struct iris_inst *inst, struct v4l2_format *f)if (vb2_is_busy (q))return -EBUSY ;
drivers/media/platform/qcom/iris/iris_vdec.c int iris_vdec_s_fmt(struct iris_inst *inst, struct v4l2_format *f)
Quoted 10 lines
drivers/media/platform/qcom/iris/iris_vdec.c +5
-1+if (f->fmt.pix_mp.width ==0 && f->fmt.pix_mp.height ==0 ) { + f->fmt.pix_mp.width =DEFAULT_WIDTH ; + f->fmt.pix_mp.height =DEFAULT_HEIGHT ; + } +iris_vdec_try_fmt (inst, f);switch (f->type) { --
Doesn't venus do
orig_pixmap = *pixmap;
try_fmt();
format.fmt.pix_mp.width = orig_pixmp.width;
format.fmt.pix_mp.height = orig_pixmp.height;
should you fall back to DEFAULT_WIDTH/HEIGHT or to orig_pixmp.width/height ?
---
bod
Quoted 25 lines · Bryan O'Donoghue
Quoted 19 lines · Val Packett
drivers/media/platform/qcom/iris/iris_vdec.c| 5 +++++1 file changed, 5 insertions(+)drivers/media/platform/qcom/iris/iris_vdec.c +5
-0@@ -196,6 +196,11 @@ int iris_vdec_s_fmt(struct iris_inst *inst, struct v4l2_format *f) if (vb2_is_busy(q)) return -EBUSY; + if (f->fmt.pix_mp.width == 0 && f->fmt.pix_mp.height == 0) { + f->fmt.pix_mp.width = DEFAULT_WIDTH; + f->fmt.pix_mp.height = DEFAULT_HEIGHT; + } + iris_vdec_try_fmt(inst, f);Quoted 2 lines
switch (
f->type) {Doesn't venus do
Quoted 8 lines
orig_pixmap= *pixmap;
try_fmt();format.fmt.pix_mp.width = orig_pixmp.width;
format.fmt.pix_mp.height = orig_pixmp.height;should you fall back to DEFAULT_WIDTH/HEIGHT or to orig_pixmp.width/height ?
Hi– sorry for the late reply and happy holidays :)
The patch does the fallback *before* try_fmt().
I have just retested everything, even with yesterday's new "misc fixes" patchset (https://lore.kernel.org/all/[email protected]/). The issue is still present, the 0x0 size is what iris_vdec_s_fmt gets before try_fmt().
What the rpi-ffmpeg developer said (https://github.com/jc-kynesim/rpi-ffmpeg/issues/103) is:
- V4L2 very clearly says that you should be able to pass anything into S_FMT and it should set the returned values to something valid
- S_FMT should not only not complain, it should return valid values in the structure passed to it which will then be used in the REQBUFS
- the buffers being allocated are for the coded bitstream (remember in V4L2 speak OUTPUT=source, CAPTURE=destination); width/height doesn't really mean a lot here but buffer size does
- https://www.kernel.org/doc/html/latest/userspace-api/media/v4l/dev-decoder.html 4.5.1.5 states "width, height: coded resolution of the stream; required only if it cannot be parsed from the stream for the given coded format; otherwise the decoder will use this resolution as a placeholder resolution that will likely change as soon as it can parse the actual coded resolution from the stream"
So since this is a deliberate zero request, and V4L2 requires returning a valid placeholder resolution, it should be DEFAULT indeed.
I'll resend with a comment as requested by Dikshita.
~val