From patchwork Thu Apr 10 22:06:45 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sakari Ailus X-Patchwork-Id: 3965011 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id BDE0FBFF02 for ; Thu, 10 Apr 2014 22:07:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DEEA720829 for ; Thu, 10 Apr 2014 22:07:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 06ABB20826 for ; Thu, 10 Apr 2014 22:07:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934898AbaDJWG6 (ORCPT ); Thu, 10 Apr 2014 18:06:58 -0400 Received: from nblzone-211-213.nblnetworks.fi ([83.145.211.213]:44122 "EHLO hillosipuli.retiisi.org.uk" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1758938AbaDJWGv (ORCPT ); Thu, 10 Apr 2014 18:06:51 -0400 Received: from masiina.localdomain (masiina.retiisi.org.uk [IPv6:2001:1bc8:102:7fc9::c0:2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by hillosipuli.retiisi.org.uk (Postfix) with ESMTPS id A3CBF600B0; Fri, 11 Apr 2014 01:06:49 +0300 (EEST) Received: from masiina.localdomain (localhost [127.0.0.1]) by masiina.localdomain (8.14.4/8.14.4/Debian-4) with ESMTP id s3AM6oX4030033; Fri, 11 Apr 2014 01:06:50 +0300 Received: (from sakke@localhost) by masiina.localdomain (8.14.4/8.14.4/Submit) id s3AM6o0M030032; Fri, 11 Apr 2014 01:06:50 +0300 From: Sakari Ailus To: linux-media@vger.kernel.org Cc: laurent.pinchart@ideasonboard.com Subject: [PATCH v2 9/9] Set timestamp for output buffers if the timestamp type is copy Date: Fri, 11 Apr 2014 01:06:45 +0300 Message-Id: <1397167605-29956-9-git-send-email-sakari.ailus@iki.fi> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1397167605-29956-1-git-send-email-sakari.ailus@iki.fi> References: <1397167605-29956-1-git-send-email-sakari.ailus@iki.fi> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Copy timestamp type will mean the timestamp is be copied from the source to the destination buffer on mem-to-mem devices. Signed-off-by: Sakari Ailus --- yavta.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/yavta.c b/yavta.c index 124dd1d..251fe40 100644 --- a/yavta.c +++ b/yavta.c @@ -73,6 +73,7 @@ struct device unsigned int width; unsigned int height; uint32_t buffer_output_flags; + uint32_t timestamp_type; unsigned char num_planes; struct v4l2_plane_pix_format plane_fmt[VIDEO_MAX_PLANES]; @@ -756,6 +757,7 @@ static int video_alloc_buffers(struct device *dev, int nbufs, return ret; } + dev->timestamp_type = buf.flags & V4L2_BUF_FLAG_TIMESTAMP_MASK; dev->buffers = buffers; dev->nbufs = rb.count; return 0; @@ -818,8 +820,16 @@ static int video_queue_buffer(struct device *dev, int index, enum buffer_fill_mo buf.type = dev->type; buf.memory = dev->memtype; - if (dev->type == V4L2_BUF_TYPE_VIDEO_OUTPUT) + if (dev->type == V4L2_BUF_TYPE_VIDEO_OUTPUT) { buf.flags = dev->buffer_output_flags; + if (dev->timestamp_type == V4L2_BUF_FLAG_TIMESTAMP_COPY) { + struct timespec ts; + + clock_gettime(CLOCK_MONOTONIC, &ts); + buf.timestamp.tv_sec = ts.tv_sec; + buf.timestamp.tv_usec = ts.tv_nsec / 1000; + } + } if (video_is_mplane(dev)) { buf.m.planes = planes;