Commit 4980721c authored by Val Packett's avatar Val Packett Committed by Hans Verkuil
Browse files

media: iris: use fallback size when S_FMT is called without width/height 

According to 4.5.1.5 of the M2M stateful decoder UAPI documentation,
providing the width and the height to S_FMT is "required only if it
cannot be parsed from the stream", otherwise they can be left as 0
and the S_FMT implementation is expected to return a valid placeholder
resolution that would let REQBUFS succeed.

iris was missing the fallback, so clients like rpi-ffmpeg wouldn't work.
Fix by adding an explicit fallback to defaults.

Fixes: b530b95d ("media: iris: implement s_fmt, g_fmt and try_fmt ioctls")
Link: https://github.com/jc-kynesim/rpi-ffmpeg/issues/103


Reviewed-by: default avatarDikshita Agarwal <dikshita.agarwal@oss.qualcomm.com>
Signed-off-by: default avatarVal Packett <val@packett.cool>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarBryan O'Donoghue <bod@kernel.org>
Signed-off-by: default avatarHans Verkuil <hverkuil+cisco@kernel.org>
parent 71fe8036

drivers/media/platform/qcom/iris/iris_vdec.c

+8 −0
Original line number Diff line number Diff line
@@ -216,6 +216,14 @@ int iris_vdec_s_fmt(struct iris_inst *inst, struct v4l2_format *f) 
	if (vb2_is_busy(q))

		return -EBUSY;



	/* Width and height are optional, so fall back to a valid placeholder

	 * resolution until the real one is decoded from the bitstream.

	 */

	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) {