mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-13 14:24:11 +08:00
media: vicodec: allow en/decoder cmd w/o CAPTURE
Vicodec will ignore en/decoder commands if the CAPTURE queue is not
streaming. But this prevents CMD_STOP from being used during a dynamic
resolution change to mark the last source buffer. Since CMD_STOP is
ignored, but doesn’t fail, there is no warning that the command needs to
be resent, and CAPTURE will continue to attempt to dequeue buffers
waiting, futilely, for one with V4L2_BUF_FLAG_LAST.
Fix this problem by carrying out en/decoder commands even if CAPTURE is
not streaming.
Fixes: d17589afa9
vicodec: improve handling of ENC_CMD_STOP/START
Reported by: Nicolas Dufresne <nicolas.dufresne@collabora.com>
Signed-off-by: Deborah Brouwer <deborah.brouwer@collabora.com>
Signed-off-by: Sebastian Fricke <sebastian.fricke@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
This commit is contained in:
parent
a043ea54bb
commit
a9fef294e8
@ -1215,8 +1215,7 @@ static int vicodec_encoder_cmd(struct file *file, void *fh,
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
if (!vb2_is_streaming(&ctx->fh.m2m_ctx->cap_q_ctx.q) ||
|
||||
!vb2_is_streaming(&ctx->fh.m2m_ctx->out_q_ctx.q))
|
||||
if (!vb2_is_streaming(&ctx->fh.m2m_ctx->out_q_ctx.q))
|
||||
return 0;
|
||||
|
||||
ret = v4l2_m2m_ioctl_encoder_cmd(file, fh, ec);
|
||||
@ -1250,8 +1249,7 @@ static int vicodec_decoder_cmd(struct file *file, void *fh,
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
if (!vb2_is_streaming(&ctx->fh.m2m_ctx->cap_q_ctx.q) ||
|
||||
!vb2_is_streaming(&ctx->fh.m2m_ctx->out_q_ctx.q))
|
||||
if (!vb2_is_streaming(&ctx->fh.m2m_ctx->out_q_ctx.q))
|
||||
return 0;
|
||||
|
||||
ret = v4l2_m2m_ioctl_decoder_cmd(file, fh, dc);
|
||||
|
Loading…
Reference in New Issue
Block a user