From patchwork Thu Apr 10 22:06:43 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sakari Ailus X-Patchwork-Id: 3965061 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 08D57BFF02 for ; Thu, 10 Apr 2014 22:08:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2D5DB207FE for ; Thu, 10 Apr 2014 22:07:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 43D09207D5 for ; Thu, 10 Apr 2014 22:07:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965288AbaDJWG7 (ORCPT ); Thu, 10 Apr 2014 18:06:59 -0400 Received: from nblzone-211-213.nblnetworks.fi ([83.145.211.213]:44119 "EHLO hillosipuli.retiisi.org.uk" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753800AbaDJWGv (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 AFCC7600AB; 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 s3AM6ng0030025; Fri, 11 Apr 2014 01:06:49 +0300 Received: (from sakke@localhost) by masiina.localdomain (8.14.4/8.14.4/Submit) id s3AM6nqM030024; Fri, 11 Apr 2014 01:06:49 +0300 From: Sakari Ailus To: linux-media@vger.kernel.org Cc: laurent.pinchart@ideasonboard.com Subject: [PATCH v2 7/9] Print timestamp type and source for dequeued buffers Date: Fri, 11 Apr 2014 01:06:43 +0300 Message-Id: <1397167605-29956-7-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 | 52 ++++++++++++++++++++++++++++++---------------------- 1 file changed, 30 insertions(+), 22 deletions(-) diff --git a/yavta.c b/yavta.c index a2e0666..9810dcf 100644 --- a/yavta.c +++ b/yavta.c @@ -659,6 +659,30 @@ static void video_buffer_fill_userptr(struct device *dev, struct buffer *buffer, v4l2buf->m.planes[i].m.userptr = (unsigned long)buffer->mem[i]; } +static void get_ts_flags(uint32_t flags, const char **ts_type, const char **ts_source) +{ + switch (flags & V4L2_BUF_FLAG_TIMESTAMP_MASK) { + case V4L2_BUF_FLAG_TIMESTAMP_UNKNOWN: + *ts_type = "unknown"; + break; + case V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC: + *ts_type = "monotonic"; + break; + default: + *ts_type = "invalid"; + } + switch (flags & V4L2_BUF_FLAG_TSTAMP_SRC_MASK) { + case V4L2_BUF_FLAG_TSTAMP_SRC_EOF: + *ts_source = "EoF"; + break; + case V4L2_BUF_FLAG_TSTAMP_SRC_SOE: + *ts_source = "SoE"; + break; + default: + *ts_source = "invalid"; + } +} + static int video_alloc_buffers(struct device *dev, int nbufs, unsigned int offset, unsigned int padding) { @@ -706,26 +730,7 @@ static int video_alloc_buffers(struct device *dev, int nbufs, strerror(errno), errno); return ret; } - switch (buf.flags & V4L2_BUF_FLAG_TIMESTAMP_MASK) { - case V4L2_BUF_FLAG_TIMESTAMP_UNKNOWN: - ts_type = "unknown"; - break; - case V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC: - ts_type = "monotonic"; - break; - default: - ts_type = "invalid"; - } - switch (buf.flags & V4L2_BUF_FLAG_TSTAMP_SRC_MASK) { - case V4L2_BUF_FLAG_TSTAMP_SRC_EOF: - ts_source = "EoF"; - break; - case V4L2_BUF_FLAG_TSTAMP_SRC_SOE: - ts_source = "SoE"; - break; - default: - ts_source = "invalid"; - } + get_ts_flags(buf.flags, &ts_type, &ts_source); printf("length: %u offset: %u timestamp type/source: %s/%s\n", buf.length, buf.m.offset, ts_type, ts_source); @@ -1393,6 +1398,7 @@ static int video_do_capture(struct device *dev, unsigned int nframes, last.tv_usec = start.tv_nsec / 1000; for (i = 0; i < nframes; ++i) { + const char *ts_type, *ts_source; /* Dequeue a buffer. */ memset(&buf, 0, sizeof buf); memset(planes, 0, sizeof planes); @@ -1425,10 +1431,12 @@ static int video_do_capture(struct device *dev, unsigned int nframes, fps = fps ? 1000000.0 / fps : 0.0; clock_gettime(CLOCK_MONOTONIC, &ts); - printf("%u (%u) [%c] %u %u bytes %ld.%06ld %ld.%06ld %.3f fps\n", i, buf.index, + get_ts_flags(buf.flags, &ts_type, &ts_source); + printf("%u (%u) [%c] %u %u bytes %ld.%06ld %ld.%06ld %.3f fps tstamp type/src %s/%s\n", i, buf.index, (buf.flags & V4L2_BUF_FLAG_ERROR) ? 'E' : '-', buf.sequence, buf.bytesused, buf.timestamp.tv_sec, - buf.timestamp.tv_usec, ts.tv_sec, ts.tv_nsec/1000, fps); + buf.timestamp.tv_usec, ts.tv_sec, ts.tv_nsec/1000, fps, + ts_type, ts_source); last = buf.timestamp;