From patchwork Thu Apr 25 09:49:49 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kamil Debski X-Patchwork-Id: 2487791 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id D710D40106 for ; Thu, 25 Apr 2013 09:51:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932090Ab3DYJvV (ORCPT ); Thu, 25 Apr 2013 05:51:21 -0400 Received: from mailout4.samsung.com ([203.254.224.34]:41946 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932134Ab3DYJvN (ORCPT ); Thu, 25 Apr 2013 05:51:13 -0400 Received: from epcpsbgm1.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout4.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MLT00JTK20XNNL0@mailout4.samsung.com> for linux-media@vger.kernel.org; Thu, 25 Apr 2013 18:51:02 +0900 (KST) X-AuditID: cbfee61a-b7fd56d0000022fd-66-5178fc85ca67 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 5D.6E.08957.58CF8715; Thu, 25 Apr 2013 18:51:01 +0900 (KST) Received: from amdc1342.digital.local ([106.116.147.39]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MLT0096R1Z5TD00@mmp1.samsung.com>; Thu, 25 Apr 2013 18:51:01 +0900 (KST) From: Kamil Debski To: linux-media@vger.kernel.org Cc: Kamil Debski , Kyungmin Park , Javier Martin Subject: [PATCH 5/7] exynos-gsc: Add copy time stamp handling Date: Thu, 25 Apr 2013 11:49:49 +0200 Message-id: <1366883390-12890-7-git-send-email-k.debski@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1366883390-12890-1-git-send-email-k.debski@samsung.com> References: <1366883390-12890-1-git-send-email-k.debski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrBJMWRmVeSWpSXmKPExsVy+t9jAd3WPxWBBp8fmFgcn7qP0eLH6wts Fmeb3rBb9GzYyurA4tG3ZRWjx+dNch4Hb7axBTBHcdmkpOZklqUW6dslcGV83KpcsIC3YvLZ ogbGU9xdjJwcEgImEm+WfmaDsMUkLtxbD2RzcQgJLGKUuPFwOwuE08Ekcf9VD2MXIwcHm4Cm xKp7HiANIgLyEk96b4A1MAu0M0rc23WYESQhLGArceHEVSYQm0VAVaLr4CNmEJtXwEVi3o5l bCBzJAQUJOZMsgEJcwq4Slz+3QzWKgRUsujsLZYJjLwLGBlWMYqmFiQXFCel5xrqFSfmFpfm pesl5+duYgSHxzOpHYwrGywOMQpwMCrx8Aq8Kg8UYk0sK67MPcQowcGsJMLL/KMiUIg3JbGy KrUoP76oNCe1+BCjNAeLkjjvgVbrQCGB9MSS1OzU1ILUIpgsEwenVAPj7P/HIwtWqi+bMHOT 57sJLmLvnh7fm89TFzax1VFKxNOFZYH/VvepDRd6pnw8rvD14K+p6wXUzoSE87bvj7JMnycc dIKzVixMZ2Ems2RFmwrTrvq9i/XOGSZbXD9Zui7NV1blwsb3QRe8Hs5v/c60ReTWfMmHkxRv 9p50Xm6WUKIk7pT77GObEktxRqKhFnNRcSIAD5nmtAsCAAA= Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Signed-off-by: Kamil Debski Signed-off-by: Kyungmin Park Cc: Javier Martin --- drivers/media/platform/m2m-deinterlace.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/media/platform/m2m-deinterlace.c b/drivers/media/platform/m2m-deinterlace.c index 6c4db9b..7585646 100644 --- a/drivers/media/platform/m2m-deinterlace.c +++ b/drivers/media/platform/m2m-deinterlace.c @@ -207,6 +207,9 @@ 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; + v4l2_m2m_buf_done(src_vb, VB2_BUF_STATE_DONE); v4l2_m2m_buf_done(dst_vb, VB2_BUF_STATE_DONE); @@ -866,6 +869,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq, src_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer); src_vq->ops = &deinterlace_qops; src_vq->mem_ops = &vb2_dma_contig_memops; + src_vq->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY; q_data[V4L2_M2M_SRC].fmt = &formats[0]; q_data[V4L2_M2M_SRC].width = 640; q_data[V4L2_M2M_SRC].height = 480; @@ -882,6 +886,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq, dst_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer); dst_vq->ops = &deinterlace_qops; dst_vq->mem_ops = &vb2_dma_contig_memops; + dst_vq->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY; q_data[V4L2_M2M_DST].fmt = &formats[0]; q_data[V4L2_M2M_DST].width = 640; q_data[V4L2_M2M_DST].height = 480;