From patchwork Thu Apr 25 11:36:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kamil Debski X-Patchwork-Id: 2488091 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 0E86F40106 for ; Thu, 25 Apr 2013 11:37:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758260Ab3DYLha (ORCPT ); Thu, 25 Apr 2013 07:37:30 -0400 Received: from mailout4.samsung.com ([203.254.224.34]:55913 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756264Ab3DYLh2 (ORCPT ); Thu, 25 Apr 2013 07:37:28 -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 <0MLT00JWJ6YCNNP0@mailout4.samsung.com> for linux-media@vger.kernel.org; Thu, 25 Apr 2013 20:37:28 +0900 (KST) X-AuditID: cbfee61a-b7fd56d0000022fd-1d-517915773d2e Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 46.83.08957.77519715; Thu, 25 Apr 2013 20:37:28 +0900 (KST) Received: from amdc1342.digital.local ([106.116.147.39]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MLT00D0J6WA8D40@mmp2.samsung.com>; Thu, 25 Apr 2013 20:37:27 +0900 (KST) From: Kamil Debski To: linux-media@vger.kernel.org Cc: Kamil Debski , Kyungmin Park , Philipp Zabel , Javier Martin , Fabio Estevam Subject: [PATCH 4/7 v2] coda: Add copy time stamp handling Date: Thu, 25 Apr 2013 13:36:05 +0200 Message-id: <1366889768-16677-5-git-send-email-k.debski@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1366889768-16677-1-git-send-email-k.debski@samsung.com> References: <1366889768-16677-1-git-send-email-k.debski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFuphluLIzCtJLcpLzFFi42I5/e+xoG6FaGWgwYrdzBazunQtjk/dx2jx 4/UFNouzTW/YLXo2bGW1uHvvBIsDm8e/w/1MHv1/DTz6tqxi9Pi8Sc7j4M02tgDWKC6blNSc zLLUIn27BK6Mt+uXMBYc5a3YOKGDuYHxAncXIyeHhICJxIR3JxkhbDGJC/fWs3UxcnEICUxn lFjz9TI7hNPBJDF/wQymLkYODjYBTYlV9zxAGkQE5CWe9N4Aa2AWeMAoMbGlAWySsICVxNuV 81hAbBYBVYkdBw4wg9i8Ai4SC5e8ZAOZIyGgIDFnkg1ImFPAVeL28ZmsILYQUMne6WdYJjDy LmBkWMUomlqQXFCclJ5rqFecmFtcmpeul5yfu4kRHEbPpHYwrmywOMQowMGoxMMr8Ko8UIg1 say4MvcQowQHs5IIL/OPikAh3pTEyqrUovz4otKc1OJDjNIcLErivAdarQOFBNITS1KzU1ML UotgskwcnFINjBfLyvuur5xXZP13rmmMtWA+40uD1WUP6+uONdmuLvguo5m12vJcEjvnOcHd QlcOH2ifz1ZjvmKJlHD01leHxU7NNcyO4Dx4Qqhg1vRvPtWu2jpilcrKOsFrnjp6z6xS+mS5 /dfG1uhOx+QrX6v1RFs/PVJSf8e9IX6GvE8qv1znAe68y3EblFiKMxINtZiLihMBQBayDR8C AAA= Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Since the introduction of the timestamp_type field, it is necessary that the driver chooses which type it will use. This patch adds support for the timestamp_type. Signed-off-by: Kamil Debski Signed-off-by: Kyungmin Park Cc: Philipp Zabel Cc: Javier Martin Cc: Fabio Estevam Tested-by: Philipp Zabel --- drivers/media/platform/coda.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/media/platform/coda.c b/drivers/media/platform/coda.c index 20827ba..5612329 100644 --- a/drivers/media/platform/coda.c +++ b/drivers/media/platform/coda.c @@ -1422,6 +1422,7 @@ static int coda_queue_init(void *priv, struct vb2_queue *src_vq, src_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer); src_vq->ops = &coda_qops; src_vq->mem_ops = &vb2_dma_contig_memops; + src_vq->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY; ret = vb2_queue_init(src_vq); if (ret) @@ -1433,6 +1434,7 @@ static int coda_queue_init(void *priv, struct vb2_queue *src_vq, dst_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer); dst_vq->ops = &coda_qops; dst_vq->mem_ops = &vb2_dma_contig_memops; + dst_vq->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY; return vb2_queue_init(dst_vq); } @@ -1628,6 +1630,9 @@ static irqreturn_t coda_irq_handler(int irq, void *data) dst_buf->v4l2_buf.flags &= ~V4L2_BUF_FLAG_KEYFRAME; } + dst_buf->v4l2_buf.timestamp = src_buf->v4l2_buf.timestamp; + dst_buf->v4l2_buf.timecode = src_buf->v4l2_buf.timecode; + v4l2_m2m_buf_done(src_buf, VB2_BUF_STATE_DONE); v4l2_m2m_buf_done(dst_buf, VB2_BUF_STATE_DONE);