Hi Andrzej,
> From: Andrzej Hajda [mailto:a.ha...@samsung.com]
> Sent: Friday, October 02, 2015 2:10 PM
>
> MFC driver never delivered EOS event to apps feeding constantly its
capture
> buffer with fresh buffers. The patch fixes it by marking last buffers
returned
> by MFC with MFC_BUF_FLAG_EOS flag and firing EOS event on de-queuing
> such buffers.
Checkpatch complains that lines in the description are too long.
WARNING: Possible unwrapped commit description (prefer a maximum 75 chars
per line)
#23:
Best wishes,
--
Kamil Debski
Samsung R&D Institute Poland
>
> Signed-off-by: Andrzej Hajda <a.ha...@samsung.com>
> ---
> Hi,
>
> This version is rebased on latest media_tree branch.
>
> Regards
> Andrzej
> ---
> drivers/media/platform/s5p-mfc/s5p_mfc.c | 1 +
> drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 21 +++++++++++++-------
> -
> 2 files changed, 14 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c
> b/drivers/media/platform/s5p-mfc/s5p_mfc.c
> index 05a31ee..3ffe2ec 100644
> --- a/drivers/media/platform/s5p-mfc/s5p_mfc.c
> +++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c
> @@ -196,6 +196,7 @@ static void
> s5p_mfc_handle_frame_all_extracted(struct s5p_mfc_ctx *ctx)
> vb2_set_plane_payload(&dst_buf->b->vb2_buf, 0, 0);
> vb2_set_plane_payload(&dst_buf->b->vb2_buf, 1, 0);
> list_del(&dst_buf->list);
> + dst_buf->flags |= MFC_BUF_FLAG_EOS;
> ctx->dst_queue_cnt--;
> dst_buf->b->sequence = (ctx->sequence++);
>
> diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
> b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
> index 1734775..8d3d40c 100644
> --- a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
> +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
> @@ -645,17 +645,22 @@ static int vidioc_dqbuf(struct file *file, void
*priv,
> struct v4l2_buffer *buf)
> mfc_err("Call on DQBUF after unrecoverable error\n");
> return -EIO;
> }
> - if (buf->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE)
> - ret = vb2_dqbuf(&ctx->vq_src, buf, file->f_flags &
> O_NONBLOCK);
> - else if (buf->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) {
> +
> + switch (buf->type) {
> + case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:
> + return vb2_dqbuf(&ctx->vq_src, buf, file->f_flags &
> O_NONBLOCK);
> + case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE:
> ret = vb2_dqbuf(&ctx->vq_dst, buf, file->f_flags &
> O_NONBLOCK);
> - if (ret == 0 && ctx->state == MFCINST_FINISHED &&
> - list_empty(&ctx->vq_dst.done_list))
> + if (ret)
> + return ret;
> +
> + if (ctx->state == MFCINST_FINISHED &&
> + (ctx->dst_bufs[buf->index].flags & MFC_BUF_FLAG_EOS))
> v4l2_event_queue_fh(&ctx->fh, &ev);
> - } else {
> - ret = -EINVAL;
> + return 0;
> + default:
> + return -EINVAL;
> }
> - return ret;
> }
>
> /* Export DMA buffer */
> --
> 1.9.1
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
