提交 c76c2e92 编写于 作者: M Ming Qian 提交者: Hans Verkuil

media: imx-jpeg: Don't clear stop state in handling dynamic resolution change

In dynamic resolution change, streamoff and streamon on the capture
queue may be called,
the V4L2_DEC_CMD_STOP cmd may be called before driver parsed the
jpeg header.
don't clear the stop state in streamoff of handling the
dynamic resolution change,
otherwise the drain may not complete.

Fixes: 4911c5ac ("media: imx-jpeg: Implement drain using v4l2-mem2mem helpers")
Signed-off-by: NMing Qian <ming.qian@nxp.com>
Signed-off-by: NHans Verkuil <hverkuil-cisco@xs4all.nl>
上级 2c0a1dea
...@@ -1277,7 +1277,8 @@ static void mxc_jpeg_stop_streaming(struct vb2_queue *q) ...@@ -1277,7 +1277,8 @@ static void mxc_jpeg_stop_streaming(struct vb2_queue *q)
v4l2_m2m_buf_done(vbuf, VB2_BUF_STATE_ERROR); v4l2_m2m_buf_done(vbuf, VB2_BUF_STATE_ERROR);
} }
v4l2_m2m_update_stop_streaming_state(ctx->fh.m2m_ctx, q); if (V4L2_TYPE_IS_OUTPUT(q->type) || !ctx->source_change)
v4l2_m2m_update_stop_streaming_state(ctx->fh.m2m_ctx, q);
if (V4L2_TYPE_IS_OUTPUT(q->type) && if (V4L2_TYPE_IS_OUTPUT(q->type) &&
v4l2_m2m_has_stopped(ctx->fh.m2m_ctx)) { v4l2_m2m_has_stopped(ctx->fh.m2m_ctx)) {
notify_eos(ctx); notify_eos(ctx);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册