Hi Sakari,
> From: Sakari Ailus [mailto:sakari.ai...@iki.fi]
> Sent: Saturday, February 15, 2014 9:53 PM
>
> The timestamp and timecode fields were copied from destination to
> source, not the other way around as they should. Fix it.
>
> Signed-off-by: Sakari Ailus <sakari.ai...@iki.fi>
Acked-by: Kamil Debski <k.deb...@samsung.com>
> ---
> drivers/media/platform/exynos-gsc/gsc-m2m.c | 4 ++--
> drivers/media/platform/m2m-deinterlace.c | 4 ++--
> drivers/media/platform/mx2_emmaprp.c | 4 ++--
> 3 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/media/platform/exynos-gsc/gsc-m2m.c
> b/drivers/media/platform/exynos-gsc/gsc-m2m.c
> index 810c3e1..62c84d5 100644
> --- a/drivers/media/platform/exynos-gsc/gsc-m2m.c
> +++ b/drivers/media/platform/exynos-gsc/gsc-m2m.c
> @@ -88,8 +88,8 @@ void gsc_m2m_job_finish(struct gsc_ctx *ctx, int
> vb_state)
> dst_vb = v4l2_m2m_dst_buf_remove(ctx->m2m_ctx);
>
> if (src_vb && dst_vb) {
> - src_vb->v4l2_buf.timestamp = dst_vb->v4l2_buf.timestamp;
> - src_vb->v4l2_buf.timecode = dst_vb->v4l2_buf.timecode;
> + dst_vb->v4l2_buf.timestamp = src_vb->v4l2_buf.timestamp;
> + dst_vb->v4l2_buf.timecode = src_vb->v4l2_buf.timecode;
It is such a silly mistake that I had to think for a while why
could it be copied the other way. I suppose this happens when
coding in a hurry :( Thank you for spotting this.
>
> v4l2_m2m_buf_done(src_vb, vb_state);
> v4l2_m2m_buf_done(dst_vb, vb_state);
> diff --git a/drivers/media/platform/m2m-deinterlace.c
> b/drivers/media/platform/m2m-deinterlace.c
> index 6bb86b5..1f272d3 100644
> --- a/drivers/media/platform/m2m-deinterlace.c
> +++ b/drivers/media/platform/m2m-deinterlace.c
> @@ -207,8 +207,8 @@ static void dma_callback(void *data)
> src_vb = v4l2_m2m_src_buf_remove(curr_ctx->m2m_ctx);
> dst_vb = v4l2_m2m_dst_buf_remove(curr_ctx->m2m_ctx);
>
> - src_vb->v4l2_buf.timestamp = dst_vb->v4l2_buf.timestamp;
> - src_vb->v4l2_buf.timecode = dst_vb->v4l2_buf.timecode;
> + dst_vb->v4l2_buf.timestamp = src_vb->v4l2_buf.timestamp;
> + dst_vb->v4l2_buf.timecode = src_vb->v4l2_buf.timecode;
>
> v4l2_m2m_buf_done(src_vb, VB2_BUF_STATE_DONE);
> v4l2_m2m_buf_done(dst_vb, VB2_BUF_STATE_DONE); diff --git
> a/drivers/media/platform/mx2_emmaprp.c
> b/drivers/media/platform/mx2_emmaprp.c
> index c690435..91056ac0 100644
> --- a/drivers/media/platform/mx2_emmaprp.c
> +++ b/drivers/media/platform/mx2_emmaprp.c
> @@ -377,8 +377,8 @@ static irqreturn_t emmaprp_irq(int irq_emma, void
> *data)
> src_vb = v4l2_m2m_src_buf_remove(curr_ctx->m2m_ctx);
> dst_vb = v4l2_m2m_dst_buf_remove(curr_ctx->m2m_ctx);
>
> - src_vb->v4l2_buf.timestamp = dst_vb-
> >v4l2_buf.timestamp;
> - src_vb->v4l2_buf.timecode = dst_vb-
> >v4l2_buf.timecode;
> + dst_vb->v4l2_buf.timestamp = src_vb-
> >v4l2_buf.timestamp;
> + dst_vb->v4l2_buf.timecode = src_vb-
> >v4l2_buf.timecode;
>
> spin_lock_irqsave(&pcdev->irqlock, flags);
> v4l2_m2m_buf_done(src_vb, VB2_BUF_STATE_DONE);
> --
> 1.7.10.4
Best wishes,
--
Kamil Debski
Samsung R&D Institute Poland
--
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
