From patchwork Sat Mar 1 16:18:07 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sakari Ailus X-Patchwork-Id: 3747501 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 175AB9F35F for ; Sat, 1 Mar 2014 16:15:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 33933202F8 for ; Sat, 1 Mar 2014 16:15:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4C7C220328 for ; Sat, 1 Mar 2014 16:15:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753079AbaCAQPo (ORCPT ); Sat, 1 Mar 2014 11:15:44 -0500 Received: from nblzone-211-213.nblnetworks.fi ([83.145.211.213]:46250 "EHLO hillosipuli.retiisi.org.uk" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753025AbaCAQPT (ORCPT ); Sat, 1 Mar 2014 11:15:19 -0500 Received: from lanttu.localdomain (salottisipuli.retiisi.org.uk [IPv6:2001:1bc8:102:7fc9::83:2]) by hillosipuli.retiisi.org.uk (Postfix) with ESMTP id 927E96009F; Sat, 1 Mar 2014 18:15:16 +0200 (EET) From: Sakari Ailus To: laurent.pinchart@ideasonboard.com, linux-media@vger.kernel.org Subject: [yavta PATCH 6/9] Timestamp source for output buffers Date: Sat, 1 Mar 2014 18:18:07 +0200 Message-Id: <1393690690-5004-7-git-send-email-sakari.ailus@iki.fi> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1393690690-5004-1-git-send-email-sakari.ailus@iki.fi> References: <1393690690-5004-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=-6.9 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 | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/yavta.c b/yavta.c index a9b192a..71c1477 100644 --- a/yavta.c +++ b/yavta.c @@ -73,6 +73,7 @@ struct device unsigned int height; unsigned int bytesperline; unsigned int imagesize; + uint32_t buffer_output_flags; void *pattern; unsigned int patternsize; @@ -611,6 +612,7 @@ static int video_queue_buffer(struct device *dev, int index, enum buffer_fill_mo buf.m.userptr = (unsigned long)dev->buffers[index].mem; if (dev->type == V4L2_BUF_TYPE_VIDEO_OUTPUT) { + buf.flags = dev->buffer_output_flags; buf.bytesused = dev->patternsize; memcpy(dev->buffers[buf.index].mem, dev->pattern, dev->patternsize); } else { @@ -1255,6 +1257,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"); @@ -1269,6 +1272,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'}, @@ -1298,7 +1302,8 @@ static struct option opts[] = { {"sleep-forever", 0, 0, OPT_SLEEP_FOREVER}, {"stride", 1, 0, OPT_STRIDE}, {"time-per-frame", 1, 0, 't'}, - {"userptr", 0, 0, 'u'}, + {"timestamp-source", 1, 0, OPT_TSTAMP_SRC}, + {"userptr", 1, 0, 'u'}, {0, 0, 0, 0} }; @@ -1487,6 +1492,17 @@ 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; + } + printf("Using %s timestamp source\n", optarg); + break; case OPT_USERPTR_OFFSET: userptr_offset = atoi(optarg); break;