From patchwork Sat Mar 9 10:53:01 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Frank Schaefer X-Patchwork-Id: 17188 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1UEHO7-00087z-B1; Sat, 09 Mar 2013 11:52:27 +0100 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.75/mailfrontend-4) with esmtp id 1UEHO6-0005Ab-Bz; Sat, 09 Mar 2013 11:52:27 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758254Ab3CIKwW (ORCPT + 1 other); Sat, 9 Mar 2013 05:52:22 -0500 Received: from mail-ee0-f54.google.com ([74.125.83.54]:60967 "EHLO mail-ee0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757768Ab3CIKwV (ORCPT ); Sat, 9 Mar 2013 05:52:21 -0500 Received: by mail-ee0-f54.google.com with SMTP id c41so1433841eek.27 for ; Sat, 09 Mar 2013 02:52:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:mime-version :content-type:content-transfer-encoding; bh=fgHsdn/yApUfo+cwk88PfbvsLc88GUnDzQjQojJCTso=; b=Ss+X0qsMg/yt9Dg0GRcIkkJ9/nIXw7XHo9M7MylIpjv3YnA+MB0C+p/C1Tt5xgvGmp +Et/1x8I9uA90AogsO0MI1nFzKw3sZqkfm4btDRiVy5m9cHgc4QiaYUWi5y7ZJxEC6IB T1Ke6Ka7TuXTfUOz0W3iLoJG9JpNQyEbdco8v+GOhlTD/vtIFNtciQ/Ksa6QrKdVD5Lk 64iIZNeukeRbOUFrzXTE+BJ6VUR0quldfGmzcjs7rRLut/Mv1YoD5S43dZ+8GVDULeyM nSUZAhqIjAMA4ty362iaXuwazRexyoEu+kFFqjIEcACHFql1YmYr5XrGGC2mw3vVan5q 30GA== X-Received: by 10.14.223.69 with SMTP id u45mr4142110eep.23.1362826340285; Sat, 09 Mar 2013 02:52:20 -0800 (PST) Received: from Athlon64X2-5000.site (ip-178-201-83-54.unitymediagroup.de. [178.201.83.54]) by mx.google.com with ESMTPS id 44sm12680989eek.5.2013.03.09.02.52.19 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 09 Mar 2013 02:52:19 -0800 (PST) From: =?UTF-8?q?Frank=20Sch=C3=A4fer?= To: mchehab@redhat.com Cc: linux-media@vger.kernel.org, =?UTF-8?q?Frank=20Sch=C3=A4fer?= Subject: [PATCH] em28xx: set the timestamp type for video and vbi vb2_queues Date: Sat, 9 Mar 2013 11:53:01 +0100 Message-Id: <1362826381-4460-1-git-send-email-fschaefer.oss@googlemail.com> X-Mailer: git-send-email 1.7.10.4 MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2013.3.9.104215 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1500_1599 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, CT_TEXT_PLAIN_UTF8_CAPS 0, DKIM_SIGNATURE 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_MEDIA_BODY 0, __CP_URI_IN_BODY 0, __CT 0, __CTE 0, __CT_TEXT_PLAIN 0, __FRAUD_BODY_WEBMAIL 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __MULTIPLE_RCPTS_CC_X2 0, __PHISH_SPEAR_STRUCTURE_1 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' The em28xx driver obtains the timestamps using function v4l2_get_timestamp(), which produces a montonic timestamp. Fixes the warnings appearing in the system log since commit 6aa69f99 "[media] vb2: Add support for non monotonic timestamps" Signed-off-by: Frank Schäfer Acked-by: Hans Verkuil --- drivers/media/usb/em28xx/em28xx-video.c | 2 ++ 1 Datei geändert, 2 Zeilen hinzugefügt(+) diff --git a/drivers/media/usb/em28xx/em28xx-video.c b/drivers/media/usb/em28xx/em28xx-video.c index 93fc620..d585c19 100644 --- a/drivers/media/usb/em28xx/em28xx-video.c +++ b/drivers/media/usb/em28xx/em28xx-video.c @@ -700,6 +700,7 @@ int em28xx_vb2_setup(struct em28xx *dev) q = &dev->vb_vidq; q->type = V4L2_BUF_TYPE_VIDEO_CAPTURE; q->io_modes = VB2_READ | VB2_MMAP | VB2_USERPTR | VB2_DMABUF; + q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; q->drv_priv = dev; q->buf_struct_size = sizeof(struct em28xx_buffer); q->ops = &em28xx_video_qops; @@ -713,6 +714,7 @@ int em28xx_vb2_setup(struct em28xx *dev) q = &dev->vb_vbiq; q->type = V4L2_BUF_TYPE_VBI_CAPTURE; q->io_modes = VB2_READ | VB2_MMAP | VB2_USERPTR; + q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; q->drv_priv = dev; q->buf_struct_size = sizeof(struct em28xx_buffer); q->ops = &em28xx_vbi_qops;