From patchwork Thu Apr 10 22:06:42 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sakari Ailus X-Patchwork-Id: 3965041 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B0AE09F336 for ; Thu, 10 Apr 2014 22:07:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C9F6F20831 for ; Thu, 10 Apr 2014 22:07:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E6EB720826 for ; Thu, 10 Apr 2014 22:07:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759193AbaDJWHB (ORCPT ); Thu, 10 Apr 2014 18:07:01 -0400 Received: from nblzone-211-213.nblnetworks.fi ([83.145.211.213]:44118 "EHLO hillosipuli.retiisi.org.uk" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754162AbaDJWGv (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 54765600A9; Fri, 11 Apr 2014 01:06:48 +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 s3AM6nAb030021; Fri, 11 Apr 2014 01:06:49 +0300 Received: (from sakke@localhost) by masiina.localdomain (8.14.4/8.14.4/Submit) id s3AM6mSp030020; Fri, 11 Apr 2014 01:06:48 +0300 From: Sakari Ailus To: linux-media@vger.kernel.org Cc: laurent.pinchart@ideasonboard.com Subject: [PATCH v2 6/9] Timestamp source for output buffers Date: Fri, 11 Apr 2014 01:06:42 +0300 Message-Id: <1397167605-29956-6-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 Signed-off-by: Sakari Ailus --- yavta.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/yavta.c b/yavta.c index 6f80311..a2e0666 100644 --- a/yavta.c +++ b/yavta.c @@ -72,6 +72,7 @@ struct device unsigned int width; unsigned int height; + uint32_t buffer_output_flags; unsigned char num_planes; struct v4l2_plane_pix_format plane_fmt[VIDEO_MAX_PLANES]; @@ -809,6 +810,9 @@ 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) + buf.flags = dev->buffer_output_flags; + if (video_is_mplane(dev)) { buf.m.planes = planes; buf.length = dev->num_planes; @@ -1516,6 +1520,7 @@ static void usage(const char *argv0) printf(" --no-query Don't query capabilities on open\n"); printf(" --offset User pointer buffer offset from page start\n"); printf(" --requeue-last Requeue the last buffers before streamoff\n"); + printf(" --timestamp-source Set timestamp source on output buffers [eof, soe]\n"); printf(" --skip n Skip the first n frames\n"); printf(" --sleep-forever Sleep forever after configuring the device\n"); printf(" --stride value Line stride in bytes\n"); @@ -1530,6 +1535,7 @@ static void usage(const char *argv0) #define OPT_REQUEUE_LAST 262 #define OPT_STRIDE 263 #define OPT_FD 264 +#define OPT_TSTAMP_SRC 265 static struct option opts[] = { {"capture", 2, 0, 'c'}, @@ -1559,6 +1565,7 @@ static struct option opts[] = { {"sleep-forever", 0, 0, OPT_SLEEP_FOREVER}, {"stride", 1, 0, OPT_STRIDE}, {"time-per-frame", 1, 0, 't'}, + {"timestamp-source", 1, 0, OPT_TSTAMP_SRC}, {"userptr", 0, 0, 'u'}, {0, 0, 0, 0} }; @@ -1757,6 +1764,16 @@ int main(int argc, char *argv[]) case OPT_STRIDE: stride = atoi(optarg); break; + case OPT_TSTAMP_SRC: + if (!strcmp(optarg, "eof")) { + dev.buffer_output_flags |= V4L2_BUF_FLAG_TSTAMP_SRC_EOF; + } else if (!strcmp(optarg, "soe")) { + dev.buffer_output_flags |= V4L2_BUF_FLAG_TSTAMP_SRC_SOE; + } else { + printf("Invalid timestamp source %s\n", optarg); + return 1; + } + break; case OPT_USERPTR_OFFSET: userptr_offset = atoi(optarg); break;