From patchwork Wed Aug 28 15:24:55 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sakari Ailus X-Patchwork-Id: 2850849 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 EC6F0BF546 for ; Wed, 28 Aug 2013 15:18:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 22DE320547 for ; Wed, 28 Aug 2013 15:18:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8B7B220544 for ; Wed, 28 Aug 2013 15:18:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753464Ab3H1PSb (ORCPT ); Wed, 28 Aug 2013 11:18:31 -0400 Received: from nblzone-211-213.nblnetworks.fi ([83.145.211.213]:33583 "EHLO hillosipuli.retiisi.org.uk" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754199Ab3H1PSa (ORCPT ); Wed, 28 Aug 2013 11:18:30 -0400 Received: from localhost.localdomain (salottisipuli.retiisi.org.uk [IPv6:2001:1bc8:102:7fc9::83:2]) by hillosipuli.retiisi.org.uk (Postfix) with ESMTP id EF98260093; Wed, 28 Aug 2013 18:18:28 +0300 (EEST) From: Sakari Ailus To: linux-media@vger.kernel.org Cc: hverkuil@xs4all.nl, laurent.pinchart@ideasonboard.com, k.debski@samsung.com Subject: [PATCH v4.1 3/3] v4l: Add V4L2_BUF_FLAG_TIMESTAMP_SOF and use it Date: Wed, 28 Aug 2013 18:24:55 +0300 Message-Id: <1377703495-21112-1-git-send-email-sakari.ailus@iki.fi> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <201308281419.52009.hverkuil@xs4all.nl> References: <201308281419.52009.hverkuil@xs4all.nl> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-9.4 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 Some devices such as the uvc produce timestamps at the beginning of the frame rather than at the end of it. Add a buffer flag (V4L2_BUF_FLAG_TIMESTAMP_SOF) to tell about this. Also document timestamp_type in struct vb2_queue, and make the uvc set the buffer flag. Signed-off-by: Sakari Ailus Acked-by: Hans Verkuil Acked-by: Laurent Pinchart --- since v4: - Fixes according to Hans's comments. - Note in comment the uvc driver will set the SOF flag from now on. - Change comment of vb2_queue timestamp_type field: this is timestamp flags rather than just type. I stopped short of renaming the field. Documentation/DocBook/media/v4l/io.xml | 19 ++++++++++++++----- drivers/media/usb/uvc/uvc_queue.c | 3 ++- include/media/videobuf2-core.h | 1 + include/uapi/linux/videodev2.h | 10 ++++++++++ 4 files changed, 27 insertions(+), 6 deletions(-) diff --git a/Documentation/DocBook/media/v4l/io.xml b/Documentation/DocBook/media/v4l/io.xml index 2c155cc..3aee210 100644 --- a/Documentation/DocBook/media/v4l/io.xml +++ b/Documentation/DocBook/media/v4l/io.xml @@ -654,11 +654,12 @@ plane, are stored in struct v4l2_plane instead. In that case, struct v4l2_buffer contains an array of plane structures. - For timestamp types that are sampled from the system clock -(V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC) it is guaranteed that the timestamp is -taken after the complete frame has been received (or transmitted in -case of video output devices). For other kinds of -timestamps this may vary depending on the driver. + The timestamp is taken once the complete frame has been +received (or transmitted for output devices) unless +V4L2_BUF_FLAG_TIMESTAMP_SOF buffer flag is set. +If V4L2_BUF_FLAG_TIMESTAMP_SOF is set, the +timestamp is taken when the first pixel of the frame is received +(or transmitted). struct <structname>v4l2_buffer</structname> @@ -1120,6 +1121,14 @@ in which case caches have not been used.The CAPTURE buffer timestamp has been taken from the corresponding OUTPUT buffer. This flag applies only to mem2mem devices. + + V4L2_BUF_FLAG_TIMESTAMP_SOF + 0x00010000 + The buffer timestamp has been taken when the first + pixel is received (or transmitted for output devices). If + this flag is not set, the timestamp is taken when the + entire frame has been received (or transmitted). +
diff --git a/drivers/media/usb/uvc/uvc_queue.c b/drivers/media/usb/uvc/uvc_queue.c index cd962be..0d80512 100644 --- a/drivers/media/usb/uvc/uvc_queue.c +++ b/drivers/media/usb/uvc/uvc_queue.c @@ -149,7 +149,8 @@ int uvc_queue_init(struct uvc_video_queue *queue, enum v4l2_buf_type type, queue->queue.buf_struct_size = sizeof(struct uvc_buffer); queue->queue.ops = &uvc_queue_qops; queue->queue.mem_ops = &vb2_vmalloc_memops; - queue->queue.timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; + queue->queue.timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC + | V4L2_BUF_FLAG_TIMESTAMP_SOF; ret = vb2_queue_init(&queue->queue); if (ret) return ret; diff --git a/include/media/videobuf2-core.h b/include/media/videobuf2-core.h index 6781258..033efc7 100644 --- a/include/media/videobuf2-core.h +++ b/include/media/videobuf2-core.h @@ -307,6 +307,7 @@ struct v4l2_fh; * @buf_struct_size: size of the driver-specific buffer structure; * "0" indicates the driver doesn't want to use a custom buffer * structure type, so sizeof(struct vb2_buffer) will is used + * @timestamp_type: Timestamp flags; V4L2_BUF_FLAGS_TIMESTAMP_* * @gfp_flags: additional gfp flags used when allocating the buffers. * Typically this is 0, but it may be e.g. GFP_DMA or __GFP_DMA32 * to force the buffer allocation to a specific memory zone. diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h index 691077d..c57765e 100644 --- a/include/uapi/linux/videodev2.h +++ b/include/uapi/linux/videodev2.h @@ -695,6 +695,16 @@ struct v4l2_buffer { #define V4L2_BUF_FLAG_TIMESTAMP_UNKNOWN 0x00000000 #define V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC 0x00002000 #define V4L2_BUF_FLAG_TIMESTAMP_COPY 0x00004000 +/* + * Timestamp taken once the first pixel is received (or transmitted). + * If the flag is not set the buffer timestamp is taken at the end of + * the frame. This is not a timestamp type. + * + * In general drivers should not use this flag if the end-of-frame + * timestamps is as good quality as the start-of-frame one; the + * V4L2_EVENT_FRAME_SYNC event should be used in that case instead. + */ +#define V4L2_BUF_FLAG_TIMESTAMP_SOF 0x00010000 /** * struct v4l2_exportbuffer - export of video buffer as DMABUF file descriptor