From patchwork Wed Mar 8 22:45:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 66494 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp623383wrd; Wed, 8 Mar 2023 15:03:08 -0800 (PST) X-Google-Smtp-Source: AK7set8MTQzoJaVdlu+b7CjNzQeEuoPDylUGgyRTyFJrqW5Oi5GeIhaEUngHZ2aO9eZfwejCe6nD X-Received: by 2002:a05:6a20:8ba2:b0:bc:f0d2:e268 with SMTP id m34-20020a056a208ba200b000bcf0d2e268mr17582122pzh.29.1678316588271; Wed, 08 Mar 2023 15:03:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678316588; cv=none; d=google.com; s=arc-20160816; b=pTRhgdhdrxhJUy52pjSk4Y+mm7NUVkfquh3AJLFg+q8TUpXpfNesYy8Dg8xxnkhamc 4Xu6INucbzW9vS7bwGj6DD+RStfEr0Y+uuwrAOljT6cPZEeI3lLEaIeBuQ3+ENmGY6kq GNWxLcX5WhH0CsSkbRzG3PRfHE4xAgoLUffiRPBsdl/W3YkmDeiiGmRycCueEnIHhzoP RxFeuiT51FMkERrvrj4pIoAtWaFaNYgdLp3Hcl4QU0zEzK4RlQNJAItEp8+bZpMUIQDA 3S2qZRPyoxporeTqenBvbFai+Gs5nSwV5g72IvIi+uj8tt3PYj+aQcfSgyUXuG78k4rY y9Tg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=pTSyQnL+DX5vQdXg5c4PiHio+TOgApxxG8f6MJvLPiI=; b=bZYWj7zTrWpE8CCr8Gmf2oHhB3BgFPbLVt6upLvlCG71IggY6BNe5Bt69FHZvp55df U2b2SRqeQvf0XM6EjwAOF2Vh19k+HAIk55OlPXAm89MQU03pUdNRayhmHGoFjKLKHEDR GWBsi6KHuZZiU8RDad2IkMmMRxW7CXD1RUu5RQ8/m6C1zR3OZnyXQnk1frdf/J5v3bTm 5GQ4ZhHOEWFM97jSP+K2MZNDZpgiQ79ATO/Ls2ECIDr7Qw+9LO8ZFEn0pUxsSbteG342 N8cjb8/NsPR+AojGGerndcId/6TDBx4SwY2jqAMkCMdcarZdt+o66ALZH7B8TX/S7TZE XeXg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=aHKYUKLu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n127-20020a632785000000b0050017092042si16119301pgn.383.2023.03.08.15.02.44; Wed, 08 Mar 2023 15:03:08 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=aHKYUKLu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229897AbjCHWp5 (ORCPT + 99 others); Wed, 8 Mar 2023 17:45:57 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44950 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229963AbjCHWps (ORCPT ); Wed, 8 Mar 2023 17:45:48 -0500 Received: from mail-ed1-x52e.google.com (mail-ed1-x52e.google.com [IPv6:2a00:1450:4864:20::52e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0586596C3F for ; Wed, 8 Mar 2023 14:45:46 -0800 (PST) Received: by mail-ed1-x52e.google.com with SMTP id u9so72029954edd.2 for ; Wed, 08 Mar 2023 14:45:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1678315544; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=pTSyQnL+DX5vQdXg5c4PiHio+TOgApxxG8f6MJvLPiI=; b=aHKYUKLuXlMzrYdGCOz61J90qL9YTceNNG5eun+9B2avxyk3WhtGZMGsj9MFWclpNj hU14Nm2eiSl6L7UVCQGDNPps89tyH2VO4TLrCn/i8HcOEneL9+xBTe8/UdLiXErvNWni 5J9UmjHjSU4wwcqkiH66SVdyTi8cYpRmFMfmo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678315544; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pTSyQnL+DX5vQdXg5c4PiHio+TOgApxxG8f6MJvLPiI=; b=2ZdXjAuaGIjxfVxZpojAOMyuhGAY+iwRfNX0quCuQSG4Sj8P2EvGQTNC/UY+1WFP7R SMHmgeAslx4+j4A42CESEjF1n9HXthzOPu7wVVC4mIDazYeGCfx5Yu++2JwDpe2IWo43 9gzi7vvKsWAFOKAe6DRbOrnthfF7A0x/x8lidjQZKAay7TswWSltgMSHHfWxGHMxyEb3 O3ugXvZYqTklPQcwjh0OYuuKIegCeCj1mv315u6qX1BYeGHSPS7kMTdXFtajFpZxOpFv jA2dEDoagnWjZuYoNSgmAXa0oZpfrVgr+WtxwzMSA6l7U1GyeZzOH78L0ZrIfWndHhio BLhw== X-Gm-Message-State: AO0yUKV2DWgVGad8HLKxEXxUSh4OVn08jFmzIJSYdREWiiZKJJcsPLuZ R9so3TswpKDFcVk+z+XPBO70Co7YK+EfEX+OPMufuQ== X-Received: by 2002:aa7:d615:0:b0:4ef:4c08:ee9c with SMTP id c21-20020aa7d615000000b004ef4c08ee9cmr6894197edr.16.1678315544539; Wed, 08 Mar 2023 14:45:44 -0800 (PST) Received: from alco.roam.corp.google.com (80.71.134.83.ipv4.parknet.dk. [80.71.134.83]) by smtp.gmail.com with ESMTPSA id ot18-20020a170906ccd200b008e40853a712sm8040167ejb.97.2023.03.08.14.45.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Mar 2023 14:45:44 -0800 (PST) From: Ricardo Ribalda Date: Wed, 08 Mar 2023 23:45:32 +0100 Subject: [PATCH RESEND v5 1/5] media: uvc: Ignore empty TS packets MIME-Version: 1.0 Message-Id: <20220920-resend-hwtimestamp-v5-1-139d1a144614@chromium.org> References: <20220920-resend-hwtimestamp-v5-0-139d1a144614@chromium.org> In-Reply-To: <20220920-resend-hwtimestamp-v5-0-139d1a144614@chromium.org> To: Laurent Pinchart , Mauro Carvalho Chehab Cc: "hn.chen" , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, Ricardo Ribalda X-Mailer: b4 0.11.0-dev-696ae X-Developer-Signature: v=1; a=openpgp-sha256; l=3560; i=ribalda@chromium.org; h=from:subject:message-id; bh=G1+fubIW/BdICDCrRg9jYl6ay0jxDPYdKiwuTQ04Efg=; b=owEBbQKS/ZANAwAKAdE30T7POsSIAcsmYgBkCRAPK9i7+2Di2bgdLI2+yNG/beqTk3HJgXqu4Ktw sJhiwg6JAjMEAAEKAB0WIQREDzjr+/4oCDLSsx7RN9E+zzrEiAUCZAkQDwAKCRDRN9E+zzrEiPheD/ 0WvCdIkF9ILtv8vYaPC/KqHsiBh9KBOxyPVKicUUrKgjf06qw6+UqlX/Nlhhrb/GV2i8S0m9wy7wrF QKlC1PpzryKM5jTpfgLde3JXgYO6zOSVOpzJdAC2BbKxzGTAtzKRTVk/ZMhqV44KUXdcsDwZf/gdC8 tdvrB6nAha0DCxsZwoe8UAqnlTa0h19wj0Fi13avfvL89CLnANxxD0xLdzCGGejRrFvtCd7MJZ5xQD 7qRzuw3C3QU+5vmNMy4cynl8sWXHeDIUh+1ZdOViocu86a0uCNh0Qqh9VzsKJzH1lbxJkRNsCq5l2w Rd90s2fXtoAsKfvigL5YuzTEEy53mY0tgS+oYr0xTKqvs9O/bs3kKoOIBEs2N+ptDyYWo7UgMkjqeL rQqGhojFw4B17MmieJkCAquSCbxl9PIUtNBlMvAHWLYrUINJReqg66Ert4MTq+qp1VNBA0fFYYHmlz fgTl6ibUGuqLX9cXwBgOCZ6cKl3xKmcbd/tMYxo9QfhpQJ2B27oNed1LP+5io8o/mbsOCcuTq5kKko scq5UgiUsXPivemvkLGWZ/VVwsyAdXstXNc5tx+PkUOuuX+HIjxEwCPpIJ9DTAXvUtK47F9+mEht92 cIZqm7/soaiuXreg4ZG3TBuNSsp4jfaJNV2fuccxwBWSKlg9jm5JhgWt879A== X-Developer-Key: i=ribalda@chromium.org; a=openpgp; fpr=9EC3BB66E2FC129A6F90B39556A0D81F9F782DA9 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759842494983889287?= X-GMAIL-MSGID: =?utf-8?q?1759842494983889287?= Some SunplusIT cameras took a borderline interpretation of the UVC 1.5 standard, and fill the PTS and SCR fields with invalid data if the package does not contain data. "STC must be captured when the first video data of a video frame is put on the USB bus." Eg: buffer: 0xa7755c00 len 000012 header:0x8c stc 00000000 sof 0000 pts 00000000 buffer: 0xa7755c00 len 000012 header:0x8c stc 00000000 sof 0000 pts 00000000 buffer: 0xa7755c00 len 000668 header:0x8c stc 73779dba sof 070c pts 7376d37a This borderline/buggy interpretation has been implemented in a variety of devices, from directly SunplusIT and from other OEMs that rebrand SunplusIT products. So quirking based on VID:PID will be problematic. All the affected modules have the following extension unit: VideoControl Interface Descriptor: guidExtensionCode {82066163-7050-ab49-b8cc-b3855e8d221d} But the vendor plans to use that GUID in the future and fix the bug, this means that we should use heuristic to figure out the broken packets. This patch takes care of this. lsusb of one of the affected cameras: Bus 001 Device 003: ID 1bcf:2a01 Sunplus Innovation Technology Inc. Device Descriptor: bLength 18 bDescriptorType 1 bcdUSB 2.01 bDeviceClass 239 Miscellaneous Device bDeviceSubClass 2 ? bDeviceProtocol 1 Interface Association bMaxPacketSize0 64 idVendor 0x1bcf Sunplus Innovation Technology Inc. idProduct 0x2a01 bcdDevice 0.02 iManufacturer 1 SunplusIT Inc iProduct 2 HanChen Wise Camera iSerial 3 01.00.00 bNumConfigurations 1 Tested-by: HungNien Chen Signed-off-by: Ricardo Ribalda --- drivers/media/usb/uvc/uvc_video.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c index d4b023d4de7c..488c58bc9919 100644 --- a/drivers/media/usb/uvc/uvc_video.c +++ b/drivers/media/usb/uvc/uvc_video.c @@ -478,6 +478,7 @@ uvc_video_clock_decode(struct uvc_streaming *stream, struct uvc_buffer *buf, ktime_t time; u16 host_sof; u16 dev_sof; + u32 dev_stc; switch (data[1] & (UVC_STREAM_PTS | UVC_STREAM_SCR)) { case UVC_STREAM_PTS | UVC_STREAM_SCR: @@ -526,6 +527,18 @@ uvc_video_clock_decode(struct uvc_streaming *stream, struct uvc_buffer *buf, if (dev_sof == stream->clock.last_sof) return; + dev_stc = get_unaligned_le32(&data[header_size - 6]); + + /* + * Some devices make a borderline interpretation of the UVC 1.5 standard + * and sends packets with no data contain undefined timestamps. Ignore + * such packages to avoid interfering with the clock interpolation + * algorithm. + */ + if (buf && buf->bytesused == 0 && len == header_size && + dev_stc == 0 && dev_sof == 0) + return; + stream->clock.last_sof = dev_sof; host_sof = usb_get_current_frame_number(stream->dev->udev); @@ -564,7 +577,7 @@ uvc_video_clock_decode(struct uvc_streaming *stream, struct uvc_buffer *buf, spin_lock_irqsave(&stream->clock.lock, flags); sample = &stream->clock.samples[stream->clock.head]; - sample->dev_stc = get_unaligned_le32(&data[header_size - 6]); + sample->dev_stc = dev_stc; sample->dev_sof = dev_sof; sample->host_sof = host_sof; sample->host_time = time; From patchwork Wed Mar 8 22:45:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 66491 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp622041wrd; Wed, 8 Mar 2023 15:00:54 -0800 (PST) X-Google-Smtp-Source: AK7set9CZ+Krmp3UL+g/FUbC3UikoOYVjJLIoDw3RzZhV/fZ/4g4+r2Anpe4d+uNhwiRzX7VaT0I X-Received: by 2002:a17:903:2452:b0:19d:1c6e:d31e with SMTP id l18-20020a170903245200b0019d1c6ed31emr21058693pls.60.1678316454562; Wed, 08 Mar 2023 15:00:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678316454; cv=none; d=google.com; s=arc-20160816; b=NVSV+6EmNWJqwNTz3+mH7M4+wjRXz7+RwQ5Cm7ffQGEsQo+4RCf6TF/qB7l7YvAgkZ uY6ykPi6mEPA43dUMF9eOsF6fJttIj77N7SV3TLarFr8f/ZKp/HDlqOaDbfZMQ/Mis+m oq61OyGc4tMaQL79nysAOejuNyFnYk3rzBmfBQM30Iq+jBixVXh+B6rbXdI1QbOkevQR ytyvOZUzlyrFVEyDJk2jZLXEx/RGS8V0e8NYQ9Uc4MAZPaC2PgmRrsPvzLMcfaJ6mqcC FZADb/HFuEdsVG90z8K5WAUeIb2qi9ftVwn9jUm1syocIkvqM/dtQenQwXriHrAyEOsX 7CHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=V6VjwHdOuGql5ezgQLsLwwzSf/aEf2U+vKcsdfzTDiY=; b=m0Fv+nFI5WPxnd2CqGIOy0FEpAR7wJPDrsYs0lG93LPlY5p0iWunOB8QCvPVw8LQXW XdiVDsT8pqj3ZvnIc4GEJJTos2PUhIGsOv/8oCo0w7boeF4vQlVQ3uwo9++1cs2AbdBO 9CeJbu/7i6pDoiYMG8z4n20udrq9qhm1EfCjp03hkIprcrZsde2d7xleggMRGDrjGH/3 pNJr6ZyVp1Di8Pbmg5KHZT5x7KUF5bUggh9vmmWOabYaY0PVNjcVqENXwJJUguNGsaj5 jrD96T7wfdm8FFE/EAe8h3p8qk7zsRvxGcvXP7/V8JLLFprTwmjGUSpJj+8puIuA5J2o 206w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=VrXoYlQp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ik9-20020a170902ab0900b0019aaf311eaesi14672805plb.267.2023.03.08.15.00.14; Wed, 08 Mar 2023 15:00:54 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=VrXoYlQp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229844AbjCHWqG (ORCPT + 99 others); Wed, 8 Mar 2023 17:46:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44980 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229994AbjCHWpt (ORCPT ); Wed, 8 Mar 2023 17:45:49 -0500 Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com [IPv6:2a00:1450:4864:20::534]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AE81BCF0C9 for ; Wed, 8 Mar 2023 14:45:46 -0800 (PST) Received: by mail-ed1-x534.google.com with SMTP id u9so72030037edd.2 for ; Wed, 08 Mar 2023 14:45:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1678315545; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=V6VjwHdOuGql5ezgQLsLwwzSf/aEf2U+vKcsdfzTDiY=; b=VrXoYlQp6ATF36g5gniyRXPT8ngc6BrdLdXwh/puwzg1HTf4DGSeJmKoYppeByuNT5 qeqLm+RIozb9sHOodcp6OpScZ5+Bq2Tip0h3yzkBZrdUixFFw0R64blDL+FwAKynERlR R9oePfbuASWKuC0Q0hr1A1BdcoOgZK9gZdjzs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678315545; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=V6VjwHdOuGql5ezgQLsLwwzSf/aEf2U+vKcsdfzTDiY=; b=pC5HCcO1WKIFyxyh9DeBvYpbB/9uq/yhrg0EpAKGSEMUCu6eglYFklSajMn0B2pFk5 KvbKIAiC6fcZ09kpm4H8HOnFStYICGALQD/v/uDA3HpIjn4XOQr45CLJBAlWaXpQzgnY Csr08IHWacG7y3R97h9p3ch9GSrgIH0c9HDX4VQJe6JC59WvihkMJ0PYFX7x6g6CQPfm 35fSvS9yDpaFeqTrcJwCgovYfThy/VfPoNnYI68dON346CMoLvPa/I/E6hrOCtzdgYS4 39IDKy7UfQZPt5XubuE/glb2/EGa+4inTqVY6FpNZP/WPZymS3M1bTBewsltBfVi6H4t 3Vew== X-Gm-Message-State: AO0yUKVNOd/hXkKgxVzIowRI5yRRhjy5Yz49sIqLyzzq4nycu+vo/lOZ StnSvKL5WxYWWbXuc25VmuJjHQ== X-Received: by 2002:a17:906:d9c8:b0:8e1:cc38:6ab0 with SMTP id qk8-20020a170906d9c800b008e1cc386ab0mr17630864ejb.16.1678315545101; Wed, 08 Mar 2023 14:45:45 -0800 (PST) Received: from alco.roam.corp.google.com (80.71.134.83.ipv4.parknet.dk. [80.71.134.83]) by smtp.gmail.com with ESMTPSA id ot18-20020a170906ccd200b008e40853a712sm8040167ejb.97.2023.03.08.14.45.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Mar 2023 14:45:44 -0800 (PST) From: Ricardo Ribalda Date: Wed, 08 Mar 2023 23:45:33 +0100 Subject: [PATCH RESEND v5 2/5] media: uvcvideo: Quirk for invalid dev_sof in Logitech C922 MIME-Version: 1.0 Message-Id: <20220920-resend-hwtimestamp-v5-2-139d1a144614@chromium.org> References: <20220920-resend-hwtimestamp-v5-0-139d1a144614@chromium.org> In-Reply-To: <20220920-resend-hwtimestamp-v5-0-139d1a144614@chromium.org> To: Laurent Pinchart , Mauro Carvalho Chehab Cc: "hn.chen" , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, Ricardo Ribalda X-Mailer: b4 0.11.0-dev-696ae X-Developer-Signature: v=1; a=openpgp-sha256; l=5228; i=ribalda@chromium.org; h=from:subject:message-id; bh=9d83K9VEn5BR8bzm9yb8kPpgmV29vXBGj2CJMG3gKUQ=; b=owEBbQKS/ZANAwAKAdE30T7POsSIAcsmYgBkCRAQxNj++KUZcM4H+69gz2NIx/W+XgLjafjtG49n VB+dDA+JAjMEAAEKAB0WIQREDzjr+/4oCDLSsx7RN9E+zzrEiAUCZAkQEAAKCRDRN9E+zzrEiM3gD/ 0bqfO++Qt1wc2nXVF6swkS9BT9t8uYJs5wDwl7JLpq8Tndrw+m8M8dyfCGtfdiqoGTOSIfzl1FDdbM MgIn7Nf57duW3IzTaJE2h95kAG0Unfa4nQe4OOvIKRIYBuc/+FynyNsQvV2qxr6CAFVR1VqHetQLMX hNVb+TjvTabGOk/bAm6X24nLN9qGIHCiLkJfKhf3rZwQcb+0+kmIeq2nOB0ky5ryRcILJnVFuZ6btW R5UCS9Euph5kw3pwa0IKV+dDZ+4ytyqAiPcZZBxFir14xymzn7avlSe+jLoFG7PAtFFJyXoIDp/CbY 1vTfSfPKpylxtMfWXm7ZeOUfE6aTnfXPFjU2Dhizfgt4c+GOrUfse/gXpgsZkLqig92why7T8/ucEh r/PPUTzwD4BSnTy2N8wiK+yy+BLMej/ZgLyMccO1PJ9K7p9+0OJ30M0U2mVoVBaFMbt38MDQEIlaOH T5uO8VxPjOnhCAFDBN+ssZhX9zhCpRqs6HokJoJfHhDpklSAyt9bE5YNpeJIVhdO9fAY9+xsuY73zc 9vYr41etLTF0BRJFTAzT5ACcnQn0nzu4Et/8V8ZqRELv36Aw0Nfl8Gv9gVEdHZ+vAIV3+uNsm5PyzR pHyOGTxnMzcGXdWBSt7ShSrI38oZEW2koGou/BXyjpvP8jQVaq+z0VvmkY7g== X-Developer-Key: i=ribalda@chromium.org; a=openpgp; fpr=9EC3BB66E2FC129A6F90B39556A0D81F9F782DA9 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759842355017882973?= X-GMAIL-MSGID: =?utf-8?q?1759842355017882973?= Logitech C922 internal SOF does not increases at a stable rate of 1kHz. This causes that the device_sof and the host_sof run at different rates, breaking the clock domain conversion algorithm. Eg: 30 (6) [-] none 30 614400 B 21.245557 21.395214 34.133 fps ts mono/SoE 31 (7) [-] none 31 614400 B 21.275327 21.427246 33.591 fps ts mono/SoE 32 (0) [-] none 32 614400 B 21.304739 21.459256 34.000 fps ts mono/SoE 33 (1) [-] none 33 614400 B 21.334324 21.495274 33.801 fps ts mono/SoE * 34 (2) [-] none 34 614400 B 21.529237 21.527297 5.130 fps ts mono/SoE * 35 (3) [-] none 35 614400 B 21.649416 21.559306 8.321 fps ts mono/SoE 36 (4) [-] none 36 614400 B 21.678789 21.595320 34.045 fps ts mono/SoE ... 99 (3) [-] none 99 614400 B 23.542226 23.696352 33.541 fps ts mono/SoE 100 (4) [-] none 100 614400 B 23.571578 23.728404 34.069 fps ts mono/SoE 101 (5) [-] none 101 614400 B 23.601425 23.760420 33.504 fps ts mono/SoE * 102 (6) [-] none 102 614400 B 23.798324 23.796428 5.079 fps ts mono/SoE * 103 (7) [-] none 103 614400 B 23.916271 23.828450 8.478 fps ts mono/SoE 104 (0) [-] none 104 614400 B 23.945720 23.860479 33.957 fps ts mono/SoE Instead of disabling completely the hardware timestamping for such hardware we take the assumption that the packet handling jitter is under 2ms and use the host_sof as dev_sof. We can think of the UVC hardware clock as a system with a coarse clock (the SOF) and a fine clock (the PTS). The coarse clock can be replaced with a clock on the same frequency, if the jitter of such clock is smaller than its sampling rate. That way we can save some of the precision of the fine clock. To probe this point we have run three experiments on the Logitech C922. On that experiment we run the camera at 33fps and we analyse the difference in msec between a frame and its predecessor. If we display the histogram of that value, a thinner histogram will mean a better meassurement. The results for: - original hw timestamp: https://ibb.co/D1HJJ4x - pure software timestamp: https://ibb.co/QC9MgVK - modified hw timestamp: https://ibb.co/8s9dBdk This bug in the camera firmware has been confirmed by the vendor. lsusb -v Bus 001 Device 044: ID 046d:085c Logitech, Inc. C922 Pro Stream Webcam Device Descriptor: bLength 18 bDescriptorType 1 bcdUSB 2.00 bDeviceClass 239 Miscellaneous Device bDeviceSubClass 2 bDeviceProtocol 1 Interface Association bMaxPacketSize0 64 idVendor 0x046d Logitech, Inc. idProduct 0x085c C922 Pro Stream Webcam bcdDevice 0.16 iManufacturer 0 iProduct 2 C922 Pro Stream Webcam iSerial 1 80B912DF bNumConfigurations 1 Signed-off-by: Ricardo Ribalda --- drivers/media/usb/uvc/uvc_driver.c | 9 +++++++++ drivers/media/usb/uvc/uvc_video.c | 8 +++++++- drivers/media/usb/uvc/uvcvideo.h | 1 + 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c index c1e3c1fab976..eae88d0f420e 100644 --- a/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c @@ -2569,6 +2569,15 @@ static const struct usb_device_id uvc_ids[] = { .bInterfaceSubClass = 1, .bInterfaceProtocol = 0, .driver_info = UVC_INFO_QUIRK(UVC_QUIRK_RESTORE_CTRLS_ON_INIT) }, + /* Logitech HD Pro Webcam C922 */ + { .match_flags = USB_DEVICE_ID_MATCH_DEVICE + | USB_DEVICE_ID_MATCH_INT_INFO, + .idVendor = 0x046d, + .idProduct = 0x085c, + .bInterfaceClass = USB_CLASS_VIDEO, + .bInterfaceSubClass = 1, + .bInterfaceProtocol = 0, + .driver_info = UVC_INFO_QUIRK(UVC_QUIRK_INVALID_DEVICE_SOF) }, /* Chicony CNF7129 (Asus EEE 100HE) */ { .match_flags = USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c index 488c58bc9919..f4470f6df45c 100644 --- a/drivers/media/usb/uvc/uvc_video.c +++ b/drivers/media/usb/uvc/uvc_video.c @@ -541,7 +541,13 @@ uvc_video_clock_decode(struct uvc_streaming *stream, struct uvc_buffer *buf, stream->clock.last_sof = dev_sof; - host_sof = usb_get_current_frame_number(stream->dev->udev); + /* + * On some devices, like the Logitech C922, the device SOF does not run + * at a stable rate of 1kHz. For those devices use the host SOF instead. + */ + if (stream->dev->quirks & UVC_QUIRK_INVALID_DEVICE_SOF) + dev_sof = usb_get_current_frame_number(stream->dev->udev); + time = uvc_video_get_time(); /* diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h index 22656755a801..699c33bc24ed 100644 --- a/drivers/media/usb/uvc/uvcvideo.h +++ b/drivers/media/usb/uvc/uvcvideo.h @@ -73,6 +73,7 @@ #define UVC_QUIRK_FORCE_Y8 0x00000800 #define UVC_QUIRK_FORCE_BPP 0x00001000 #define UVC_QUIRK_WAKE_AUTOSUSPEND 0x00002000 +#define UVC_QUIRK_INVALID_DEVICE_SOF 0x00004000 /* Format flags */ #define UVC_FMT_FLAG_COMPRESSED 0x00000001 From patchwork Wed Mar 8 22:45:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 66490 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp621934wrd; Wed, 8 Mar 2023 15:00:44 -0800 (PST) X-Google-Smtp-Source: AK7set8fasHtcaYiWrjUKfvss88jLF1CmM48XX1/qByQcqyQ6G7n0YuckjP7fGB8+gxPcAhBVXL/ X-Received: by 2002:a17:90b:1d8c:b0:230:ac58:4fa2 with SMTP id pf12-20020a17090b1d8c00b00230ac584fa2mr19234349pjb.12.1678316443662; Wed, 08 Mar 2023 15:00:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678316443; cv=none; d=google.com; s=arc-20160816; b=bRA3E1lNJEq7YlyM/csyGO8EQYLtKiYulpWUAGLgz+YNf0zUfkwevsYzH3ops94FGp FTdxUPIaVgRlA3ZvKQb3aZaSkTXbmw04kRNok/qItEMtNRQweEzAFT8l02wtLWlkv5De CBM1jgB8wqs4RhCpSsa9hq3IUTQz+b4dIayhZEd2gXMqmfn9ebcXNLUhDELpv8OG7jVt c7p0voGMOSLuftayCnyjf72vcLQiKUZqRGlJ40n5Yfp5Pbw6UvE9iMuJWR+RM4H/GLaE M7nQBD00KHxt+7/ywBGK4QPbn1wsVyzr0Tnocy6dUs6F9tT4eu248EF1tYG+qZAzehz2 uEIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=MMdYT/zbSZA3E8+R7T9MF7OcQdFrwVCCCcqy5A5lCk4=; b=MPkhfrxbi/do6HlltY658zt/PHnaoqUNlu4Ck4DONQj2dyB2Rz+czS8oFmTNXgfyyp yUK21DCRo3gySOuf3inrcZtxptUntuizcIAQQeazgjGttLlseoABRZ2nPJxH/GwBBUFG AFa5+99kiFQW7wU8CI999rjVzoFs6KCBvktqXpaK75eB9DM6mS7BEuo0Mak52Tc+x5xz DbQJaXVq3aRSwzE0F6LPGqxNbKsM61aoAAxOlDTb+3pbtFcSOeFVnj0F+rxQVWy4NL0n u6Sa8CHEMTtiLCu/xyNUVu/yJttO5KHFHLbQIH7SZ/Orhn5MisqiytcTOIJxeMfgdNxy KiMA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=Q23G6pVR; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b11-20020a17090ae38b00b00233fa787c94si559042pjz.96.2023.03.08.15.00.28; Wed, 08 Mar 2023 15:00:43 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=Q23G6pVR; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229815AbjCHWqB (ORCPT + 99 others); Wed, 8 Mar 2023 17:46:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44982 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229991AbjCHWpt (ORCPT ); Wed, 8 Mar 2023 17:45:49 -0500 Received: from mail-ed1-x536.google.com (mail-ed1-x536.google.com [IPv6:2a00:1450:4864:20::536]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7E339CF995 for ; Wed, 8 Mar 2023 14:45:47 -0800 (PST) Received: by mail-ed1-x536.google.com with SMTP id a25so72161506edb.0 for ; Wed, 08 Mar 2023 14:45:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1678315546; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=MMdYT/zbSZA3E8+R7T9MF7OcQdFrwVCCCcqy5A5lCk4=; b=Q23G6pVR/WsOKo+PmR4hp36VqZh8nLBH7Tgt4YdUprU8jj0VnABcgtJCNMEJa3ZTAq yPi8xu0QgAaGpimR7FEg0VjdyxA2edMragBClg3rWxRCKPyJSfNXH0GlLQ3wJJk+gXnk hbYA81jpEiP/JPXTwpmrKzHVCKX8wb+3fDD4k= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678315546; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MMdYT/zbSZA3E8+R7T9MF7OcQdFrwVCCCcqy5A5lCk4=; b=IpbxI374uPSXnz30waKLMnwGDPXtKi2pmvicUn7HMKnAfwkDUyM+Koy6vyiNGIPPwc K6fATRWPAfalPJFwOHgXl1g2FzDSjMNPjSwLJrGfUp9J4D6nmCz9pZxmIr5/JrMua83p oAbQ/kVSpBuiNBnHB1nM9gT00iInhUZ1jLh34uAwSVp/QpWWnUN86P9fx00CKYms9r3T 84fGDYQ51/5C+JStegfT2WLuxLkmWJqbMpeWPH6AqAY2z268/yJQ2pjKvnxs8bdM5tRG DEOcLPSO20q38IpShzZfilWMeeJqsKi9Ob5JEscDnJXNhz86580wnoahAST/wMuUZY5c NA6w== X-Gm-Message-State: AO0yUKVwX5j+FpsQooeIWLhASw24J2sYGEWkCOZQQuliE11YwifAri/B qxhzkahW/60hyFsQEgaozaR8iQ== X-Received: by 2002:a17:906:5857:b0:878:81d7:9f77 with SMTP id h23-20020a170906585700b0087881d79f77mr17970945ejs.34.1678315545875; Wed, 08 Mar 2023 14:45:45 -0800 (PST) Received: from alco.roam.corp.google.com (80.71.134.83.ipv4.parknet.dk. [80.71.134.83]) by smtp.gmail.com with ESMTPSA id ot18-20020a170906ccd200b008e40853a712sm8040167ejb.97.2023.03.08.14.45.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Mar 2023 14:45:45 -0800 (PST) From: Ricardo Ribalda Date: Wed, 08 Mar 2023 23:45:34 +0100 Subject: [PATCH RESEND v5 3/5] media: uvcvideo: Allow hw clock updates with buffers not full MIME-Version: 1.0 Message-Id: <20220920-resend-hwtimestamp-v5-3-139d1a144614@chromium.org> References: <20220920-resend-hwtimestamp-v5-0-139d1a144614@chromium.org> In-Reply-To: <20220920-resend-hwtimestamp-v5-0-139d1a144614@chromium.org> To: Laurent Pinchart , Mauro Carvalho Chehab Cc: "hn.chen" , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, Ricardo Ribalda X-Mailer: b4 0.11.0-dev-696ae X-Developer-Signature: v=1; a=openpgp-sha256; l=1846; i=ribalda@chromium.org; h=from:subject:message-id; bh=PZOTcR3pwQYe8Ltw0Z0lyFaWOwnv+LZC3UYi+bWPKCc=; b=owEBbQKS/ZANAwAKAdE30T7POsSIAcsmYgBkCRASErSRJgfDOO7lKM5eJqZBa9zHpcnxk01Yd4tY J0praimJAjMEAAEKAB0WIQREDzjr+/4oCDLSsx7RN9E+zzrEiAUCZAkQEgAKCRDRN9E+zzrEiJRmD/ 4v91HV2A+PNK/jQriBaQGZ5qhE7+5CYSM4Gtq9IJ40TCH3yqK/mi3paLYTY8wZIGtaQKD1PJ0MLBEW /VUegsIPFTjGN/KCAymE4j5YmVHjCfCtjVcqEPE/V0ZHYn64aaQRdo8qwwd2u7l2i497Y5bgUEbE8F /u1VHwY8TwT42v7Vub52ssvPIO4iBhiHhCOGhqIlNQ9lCc4/J01xyURmCp2QcYpUNeZqv6oVcPXSQv YMydw+ozcKqOACvNoQmyKA42kFY3X3Q5xLabOdhGjLh1DJnCmo45o5YAaO4Ywva4VrRxUDZwgcOZzu Fj5BgYNl8nvOJx1njv0vIHVFwjAgC1USACiMEJ2iIk3oxPQdszf0VDUdB1OyCZHqxgJo6ty6z4tYd1 AOiw7gbtS/qu2DnOsltb671Ij7f0ONmWvCprgMfXG6Chch3TSUhlnkO0lMs8+bjPTcBhyKa0wz2Oog MqlD0rccnpRkmHyF9M3coUgT1oZzosM4nfzVk5k7jklXPsksQ0qw9J2NAD5mUAUNRhIX7QxbddLy4D L+BTruZkZ4mjlcw1S2V0TA+FEkYSRbXnRyB9VISL9uiE2lum+F5fZO9ttieG74+Um7GEv0KsmT4BpP WDkjA3v28uhgXr3Xs5+yQzue1gmgL1yyM/1QSqxv/yNnf96GtycJd9USUoNw== X-Developer-Key: i=ribalda@chromium.org; a=openpgp; fpr=9EC3BB66E2FC129A6F90B39556A0D81F9F782DA9 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759842342700319246?= X-GMAIL-MSGID: =?utf-8?q?1759842342700319246?= With UVC 1.5 we get as little as one clock sample per frame. Which means that it takes 32 frames to move from the software timestamp to the hardware timestamp method. This results in abrupt changes in the timestamping after 32 frames (~1 second), resulting in noticeable artifacts when used for encoding. With this patch we modify the update algorithm to work with whatever amount of values are available. Tested-by: HungNien Chen Signed-off-by: Ricardo Ribalda --- drivers/media/usb/uvc/uvc_video.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c index f4470f6df45c..21985598ff5b 100644 --- a/drivers/media/usb/uvc/uvc_video.c +++ b/drivers/media/usb/uvc/uvc_video.c @@ -747,10 +747,10 @@ void uvc_video_clock_update(struct uvc_streaming *stream, spin_lock_irqsave(&clock->lock, flags); - if (clock->count < clock->size) + if (clock->count < 2) goto done; - first = &clock->samples[clock->head]; + first = &clock->samples[(clock->head - clock->count) % clock->size]; last = &clock->samples[(clock->head - 1) % clock->size]; /* First step, PTS to SOF conversion. */ @@ -765,6 +765,15 @@ void uvc_video_clock_update(struct uvc_streaming *stream, if (y2 < y1) y2 += 2048 << 16; + /* + * Have at least 1/4 of a second of timestamps before we + * try to do any calculation. Otherwise we do not have enough + * precision. This value was determined by running Android CTS + * on different devices. + */ + if ((y2 - y1) < (256 << 16)) + goto done; + y = (u64)(y2 - y1) * (1ULL << 31) + (u64)y1 * (u64)x2 - (u64)y2 * (u64)x1; y = div_u64(y, x2 - x1); From patchwork Wed Mar 8 22:45:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 66489 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp620679wrd; Wed, 8 Mar 2023 14:58:19 -0800 (PST) X-Google-Smtp-Source: AK7set9/wUeBGTow4r8dfSt4+wXUMDLMXJoHcZamR1HLEJbAEA3jUbTBeYT1DOTj7/Rd7Rt8nixo X-Received: by 2002:a17:90b:3e89:b0:237:ae7c:15be with SMTP id rj9-20020a17090b3e8900b00237ae7c15bemr19923612pjb.30.1678316298935; Wed, 08 Mar 2023 14:58:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678316298; cv=none; d=google.com; s=arc-20160816; b=sJupCX59exaq3wH1nY6+FaZaOEEHJaQoulxfNXfkFL2UB1rRpjknrEgQo/NWNCgI4/ EKNEmALxvAJlGS/t2HuBJl6Mq+2k0U41H5O0DYf832vGWenpvhKN8UhrcsHdl82d4WoI 5SCLv+Sq6nGKpEg2NqchyDD492zoJxjSeViL+uMdg92R2coPiFjRuHWg8icZ0SFQlNEn k9iCR88VMkvlxcdVHVyuTfIoixJhBJEO14SVA3Uy/7IdzkgmKlyThsBKQrULD5t1DUD/ +KjXpx3kSd3bktUzpk46rgTOEYe/mNr8iEY7n7+UxSdejTD/T34I6uNi4nSvbl/YcN3C KDeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=agGGtHxRf8USOkd58s+vm5nJWzgzOixZG2/uliZ0k5A=; b=l/1t9gLeiyGviinY4o8P+TkThoYzU4zn0pXpMg2GmLF1IwsI8dQ5QFjL7HJwev/cFB tFvuSEGOM2PbUuDWX3HMMDzhmFwn4w41oEGrHKTFdfFWcrxR17vFteTerF+5SJIN1n+w Ub1PiZeWQ0uUnIkUqyQCOH28Ql0/C+ebA9BZ8yItpYk6kjkuPA6ISfZuuXEI66eudyCa l49C+30h5COBKOxqU5zGfw75h6qq712fBYRdVWPo0Bf/yq3VJ/PjVWM7azeMNXfLePWe axUdN7LQuSTrkQQPLmqrJIrRzF5VdcpQyz/f2fCsgFqUObRDszWNUYzwvLSXPq5+0iEN lROQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=XxG1k7Uk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id o12-20020a17090ac70c00b0023a147a7892si565831pjt.64.2023.03.08.14.57.20; Wed, 08 Mar 2023 14:58:18 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=XxG1k7Uk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229994AbjCHWqJ (ORCPT + 99 others); Wed, 8 Mar 2023 17:46:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44554 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229720AbjCHWpu (ORCPT ); Wed, 8 Mar 2023 17:45:50 -0500 Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com [IPv6:2a00:1450:4864:20::52f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F2DABD00B8 for ; Wed, 8 Mar 2023 14:45:47 -0800 (PST) Received: by mail-ed1-x52f.google.com with SMTP id u9so72030219edd.2 for ; Wed, 08 Mar 2023 14:45:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1678315546; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=agGGtHxRf8USOkd58s+vm5nJWzgzOixZG2/uliZ0k5A=; b=XxG1k7Uktlh6ts0mIWGFmGFRNQ++tiK9naocld0ZC2HmDImC78Ib1x6bV/+Hx/2MK6 4U//wPs/nsB+69Z8/ZR4cHEv6ZEItm6crzFDDs7J+iaAC3BGJZn26fiQ7Ro/XXkiXDmX HM8v8CymNM7ViCnQEdu66NUDCFG9HN1523h/g= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678315546; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=agGGtHxRf8USOkd58s+vm5nJWzgzOixZG2/uliZ0k5A=; b=Jxw+8+NebpA4lR0KZlT740fYjdj+clHeLRn8jtbMxhMzYv2wQvyPa7991b95NAuSHe 2/J2uXg577BoPrMzKJTk2+TYAvPWjvyZc/HHisSabYIdgYHamEjXn1F32MCrvhjSTV3X whR5trW1Rp76h71QdOfBFBSzXN8jXHPWHLP0BvrLun9o1QO+AzgV9JLuWxmYuxvvGIyT qui8x+rifcoJXISSi6MFcmJ5IX1sro3bVhAniCquVLcrL8EVka3EnDTN+KEGKQ/euS0f 4Soijj8+EHJs2U/c+9s6tT+syaJ3xoL/HNN044JnSrkApWX7yWdM0JQsoBDgMriJrfD0 63bg== X-Gm-Message-State: AO0yUKW55g+T+X56VGvGONXEY1Pr/sPtDC28/pP4SPPI2dikf3ceCCwp dmXw20/pgE/mm56PzId8cfyUbQ== X-Received: by 2002:a17:906:700f:b0:88d:79df:7cfc with SMTP id n15-20020a170906700f00b0088d79df7cfcmr17872695ejj.62.1678315546512; Wed, 08 Mar 2023 14:45:46 -0800 (PST) Received: from alco.roam.corp.google.com (80.71.134.83.ipv4.parknet.dk. [80.71.134.83]) by smtp.gmail.com with ESMTPSA id ot18-20020a170906ccd200b008e40853a712sm8040167ejb.97.2023.03.08.14.45.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Mar 2023 14:45:46 -0800 (PST) From: Ricardo Ribalda Date: Wed, 08 Mar 2023 23:45:35 +0100 Subject: [PATCH RESEND v5 4/5] media: uvcvideo: Refactor clock circular buffer MIME-Version: 1.0 Message-Id: <20220920-resend-hwtimestamp-v5-4-139d1a144614@chromium.org> References: <20220920-resend-hwtimestamp-v5-0-139d1a144614@chromium.org> In-Reply-To: <20220920-resend-hwtimestamp-v5-0-139d1a144614@chromium.org> To: Laurent Pinchart , Mauro Carvalho Chehab Cc: "hn.chen" , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, Ricardo Ribalda X-Mailer: b4 0.11.0-dev-696ae X-Developer-Signature: v=1; a=openpgp-sha256; l=6617; i=ribalda@chromium.org; h=from:subject:message-id; bh=C7PTS4ZXKfpQAl4AaZUozQn/Y3XzA3jWhWUy0P0et3M=; b=owEBbQKS/ZANAwAKAdE30T7POsSIAcsmYgBkCRAUn6BxXs7hMNLa7PrXMhfilFJpj9+bdIa39Oia n4NkmR+JAjMEAAEKAB0WIQREDzjr+/4oCDLSsx7RN9E+zzrEiAUCZAkQFAAKCRDRN9E+zzrEiIyjD/ 9x2B67SZ3KFX0LPHFFLBGN4WXqIoGJzRJw0q/DScWRlkj0wziKLpaE2vE/Fnm4koCsFfMF7ypLKoA0 Rlzxtmye9rfujmt/JzIiUfK/iszZyKYeOybDaxC1/FsB8P7xKa3hl2KhqxMX9dmBY1nTpq8Ess4D0k RjyAOHOTE1QuArQ7FwM8C0h3bMYDFefUbY6c24z3gd52iXrBMkuu64L6/1wmYXtuUcu/LVMTbhVKL+ jZN6uQXMZL3mEHVUwdPm9sNM8YVe00yev9CnPIT6shgdo8fzqKrA6v1MjzZ0RKUzwlEtMqHZ0FngAc ZhnumyoT3dDOmJssb2XPmPn/aYxjbpV7QarebqZMoVS9bGxW7V92MGJg+h54X8//PgBagMBgfPgS7y CFTVXKo1HLYmfFNIbkird3BQvhDrE+LZM2220VIwFM1seUHbhF5zlgcNwOdcnRl3PsR8ii067UA2wN 2t2EBjpsGObxyjxkMm9REapLJeuQrDuVa3fjIxVyekdN81rBbSds+VxxBd5823XWoeBwnnWHXSISbW cxkP8DV3UHKr2801qj00qeFSPFzLgR3VLWM5HliD4KCLY10BEehJo3nz+o7lLSf/AUrFnhDJjKFCGk csBh7FhzCE4T0c6lzkCn/FnFOV5Qil0mPeI9STuTiZ4y94qPjNtcwQULNwgg== X-Developer-Key: i=ribalda@chromium.org; a=openpgp; fpr=9EC3BB66E2FC129A6F90B39556A0D81F9F782DA9 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759842191618396748?= X-GMAIL-MSGID: =?utf-8?q?1759842191618396748?= Isolate all the changes related to the clock circular buffer to its own function, that way we can make changes easier to the buffer logic. Also simplify the lock, by removing the circular buffer clock handling from uvc_video_clock_decode(). And now that we are at it, unify the API of the clock functions. Tested-by: HungNien Chen Signed-off-by: Ricardo Ribalda Reviewed-by: Sergey Senozhatsky --- drivers/media/usb/uvc/uvc_video.c | 84 ++++++++++++++++++--------------------- 1 file changed, 39 insertions(+), 45 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c index 21985598ff5b..22255bfa7db9 100644 --- a/drivers/media/usb/uvc/uvc_video.c +++ b/drivers/media/usb/uvc/uvc_video.c @@ -466,19 +466,28 @@ static inline ktime_t uvc_video_get_time(void) return ktime_get_real(); } +static void uvc_video_clock_add_sample(struct uvc_clock *clock, + const struct uvc_clock_sample *sample) +{ + unsigned long flags; + + spin_lock_irqsave(&clock->lock, flags); + + memcpy(&clock->samples[clock->head], sample, sizeof(*sample)); + clock->head = (clock->head + 1) % clock->size; + clock->count = min(clock->count + 1, clock->size); + + spin_unlock_irqrestore(&clock->lock, flags); +} + static void uvc_video_clock_decode(struct uvc_streaming *stream, struct uvc_buffer *buf, const u8 *data, int len) { - struct uvc_clock_sample *sample; + struct uvc_clock_sample sample; unsigned int header_size; bool has_pts = false; bool has_scr = false; - unsigned long flags; - ktime_t time; - u16 host_sof; - u16 dev_sof; - u32 dev_stc; switch (data[1] & (UVC_STREAM_PTS | UVC_STREAM_SCR)) { case UVC_STREAM_PTS | UVC_STREAM_SCR: @@ -523,11 +532,11 @@ uvc_video_clock_decode(struct uvc_streaming *stream, struct uvc_buffer *buf, * all the data packets of the same frame contains the same SOF. In that * case only the first one will match the host_sof. */ - dev_sof = get_unaligned_le16(&data[header_size - 2]); - if (dev_sof == stream->clock.last_sof) + sample.dev_sof = get_unaligned_le16(&data[header_size - 2]); + if (sample.dev_sof == stream->clock.last_sof) return; - dev_stc = get_unaligned_le32(&data[header_size - 6]); + sample.dev_stc = get_unaligned_le32(&data[header_size - 6]); /* * Some devices make a borderline interpretation of the UVC 1.5 standard @@ -536,19 +545,21 @@ uvc_video_clock_decode(struct uvc_streaming *stream, struct uvc_buffer *buf, * algorithm. */ if (buf && buf->bytesused == 0 && len == header_size && - dev_stc == 0 && dev_sof == 0) + sample.dev_stc == 0 && sample.dev_sof == 0) return; - stream->clock.last_sof = dev_sof; + stream->clock.last_sof = sample.dev_sof; /* * On some devices, like the Logitech C922, the device SOF does not run * at a stable rate of 1kHz. For those devices use the host SOF instead. */ - if (stream->dev->quirks & UVC_QUIRK_INVALID_DEVICE_SOF) - dev_sof = usb_get_current_frame_number(stream->dev->udev); + if (stream->dev->quirks & UVC_QUIRK_INVALID_DEVICE_SOF) { + sample.dev_sof = + usb_get_current_frame_number(stream->dev->udev); + } - time = uvc_video_get_time(); + sample.host_time = uvc_video_get_time(); /* * The UVC specification allows device implementations that can't obtain @@ -571,46 +582,29 @@ uvc_video_clock_decode(struct uvc_streaming *stream, struct uvc_buffer *buf, * the 8 LSBs of the delta are kept. */ if (stream->clock.sof_offset == (u16)-1) { - u16 delta_sof = (host_sof - dev_sof) & 255; + u16 delta_sof = (sample.host_sof - sample.dev_sof) & 255; if (delta_sof >= 10) stream->clock.sof_offset = delta_sof; else stream->clock.sof_offset = 0; } - dev_sof = (dev_sof + stream->clock.sof_offset) & 2047; - - spin_lock_irqsave(&stream->clock.lock, flags); - - sample = &stream->clock.samples[stream->clock.head]; - sample->dev_stc = dev_stc; - sample->dev_sof = dev_sof; - sample->host_sof = host_sof; - sample->host_time = time; - - /* Update the sliding window head and count. */ - stream->clock.head = (stream->clock.head + 1) % stream->clock.size; + sample.dev_sof = (sample.dev_sof + stream->clock.sof_offset) & 2047; + sample.dev_stc = get_unaligned_le32(&data[header_size - 6]); - if (stream->clock.count < stream->clock.size) - stream->clock.count++; - - spin_unlock_irqrestore(&stream->clock.lock, flags); + uvc_video_clock_add_sample(&stream->clock, &sample); } -static void uvc_video_clock_reset(struct uvc_streaming *stream) +static void uvc_video_clock_reset(struct uvc_clock *clock) { - struct uvc_clock *clock = &stream->clock; - clock->head = 0; clock->count = 0; clock->last_sof = -1; clock->sof_offset = -1; } -static int uvc_video_clock_init(struct uvc_streaming *stream) +static int uvc_video_clock_init(struct uvc_clock *clock) { - struct uvc_clock *clock = &stream->clock; - spin_lock_init(&clock->lock); clock->size = 32; @@ -619,15 +613,15 @@ static int uvc_video_clock_init(struct uvc_streaming *stream) if (clock->samples == NULL) return -ENOMEM; - uvc_video_clock_reset(stream); + uvc_video_clock_reset(clock); return 0; } -static void uvc_video_clock_cleanup(struct uvc_streaming *stream) +static void uvc_video_clock_cleanup(struct uvc_clock *clock) { - kfree(stream->clock.samples); - stream->clock.samples = NULL; + kfree(clock->samples); + clock->samples = NULL; } /* @@ -2099,7 +2093,7 @@ int uvc_video_resume(struct uvc_streaming *stream, int reset) stream->frozen = 0; - uvc_video_clock_reset(stream); + uvc_video_clock_reset(&stream->clock); if (!uvc_queue_streaming(&stream->queue)) return 0; @@ -2248,7 +2242,7 @@ int uvc_video_start_streaming(struct uvc_streaming *stream) { int ret; - ret = uvc_video_clock_init(stream); + ret = uvc_video_clock_init(&stream->clock); if (ret < 0) return ret; @@ -2266,7 +2260,7 @@ int uvc_video_start_streaming(struct uvc_streaming *stream) error_video: usb_set_interface(stream->dev->udev, stream->intfnum, 0); error_commit: - uvc_video_clock_cleanup(stream); + uvc_video_clock_cleanup(&stream->clock); return ret; } @@ -2294,5 +2288,5 @@ void uvc_video_stop_streaming(struct uvc_streaming *stream) usb_clear_halt(stream->dev->udev, pipe); } - uvc_video_clock_cleanup(stream); + uvc_video_clock_cleanup(&stream->clock); } From patchwork Wed Mar 8 22:45:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 66507 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp635148wrd; Wed, 8 Mar 2023 15:26:08 -0800 (PST) X-Google-Smtp-Source: AK7set8vjdaKNPQSsRxkDgONQxVe5WNvifCXuQu9K3meK2nf9jX5Z7XPOdd1DQ3GeEdFHA6XuFVr X-Received: by 2002:a62:6542:0:b0:5a8:ad9d:83f with SMTP id z63-20020a626542000000b005a8ad9d083fmr15061441pfb.24.1678317968023; Wed, 08 Mar 2023 15:26:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678317968; cv=none; d=google.com; s=arc-20160816; b=VOz2K4FMofH4yHgCn5ribRuDZWrGW2T4nD3d+DmvwLMddXJ0NIkYxXWUdN9iyf/o95 bGMuUu8ZJkd4gX7hsa3rLuCv/Qr5vtovT2JhAlDinf6prZTSYYFh7vkvQ+/ei0O2BYRA fZKRZWvrmCaXl+w8KCg9FG7wyMOwZLI9HfKU8YayINmjHdmr4f77NnQpkTdYQFBC7yS4 zSJrK18G+BmVcI57DzLBWrFfGiLTR8PFxEi4cqSWycY+X5RIap2CdYbidvelaCBVF4AN 8hs/Hii/xu6w2WrfRNU7AnRBXta3SA/mhG2m/x/bUQUWW96URAxROKMKOMqcdfe/VRM+ O8vQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=5nAAE1hEWYCr5Pmk00qC9NxfHeEjmY265EAWnttnUqA=; b=oZpu9uenbqOwAK9EgcoPOnTXC0EXIJL12LHQDD4oEzglkT0qxUxnTSDrLJCi+ckO4X bRWegY8orBlQPrL7btmYgZEwK2lo1qp+dbIRW4cUd656xjp6wIXUoJ6Or5NerMRkV28n 50ablkg9oT0HdHnnmwLxKBkTMHSwQc1nnNca9D4SaMJBLSfrBS2Te65Kx+ch30FWcyrm f7OZL73/HIW3YAG9Gt/RJiv4eny2ITcYUPdYIH2P8DWTFsrSXzbjGfAP49csonlezyj/ 8cNrbZ5Eoj94WXNOaM6KI0EN/xi2rF1OQw3FMV4f/etoTHkmkdch01W1UWndJ3QaVBux LUGw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=DrRi816p; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w18-20020aa79552000000b0058b9025bd61si15679299pfq.53.2023.03.08.15.25.53; Wed, 08 Mar 2023 15:26:07 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=DrRi816p; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230000AbjCHWqN (ORCPT + 99 others); Wed, 8 Mar 2023 17:46:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44996 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230007AbjCHWpu (ORCPT ); Wed, 8 Mar 2023 17:45:50 -0500 Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com [IPv6:2a00:1450:4864:20::52f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E9FEFBC6C0 for ; Wed, 8 Mar 2023 14:45:48 -0800 (PST) Received: by mail-ed1-x52f.google.com with SMTP id cy23so71798249edb.12 for ; Wed, 08 Mar 2023 14:45:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1678315547; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=5nAAE1hEWYCr5Pmk00qC9NxfHeEjmY265EAWnttnUqA=; b=DrRi816pfrsFJZsHdqlKl9NY/Ojqj53zXsA6juTnL7As94dK+3MfqUGe6pNg5IcoAM QXjmOU3i4zOGv+E6dUaJ2Pd3o3UL1d1Ci2CLhso8Lfh+RHEzjVGnh8VSWO1oXadNysXW jn8JG32Fc/63Zm7VB+0xDTPmCHCy0jxMgQjDg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678315547; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5nAAE1hEWYCr5Pmk00qC9NxfHeEjmY265EAWnttnUqA=; b=IY4yFZDwjmSJfQnxy7anFPOssjnLpZr1hHFcZcmwtvgpTQvr1PQ+MRvLaqPBapBJBS 73koxmB2nt9ephu2C0IlrQm6EmdTHaDgTuoEifmKBlh/XXqXEarLFTYEHJtbmwiMtuYu P+I03lOqyIDO7q+LYvM73wbM9e5/YPf0oL4O3PMgkcarQrviyNOXB1Y1/77jlBsaAwOU xR+I/VE3jUUd9zavHy6X2pWPYc9O94O4gdiwPHQ/kZqWIoDDpwxMgBXDDBeahHcMYvGz d3/WDE8e/zPB86qiDKX6WP4orW+s7EGuug3IIMxy4GF46AYTklhUvMylG6b2cUHtNVSw gmDw== X-Gm-Message-State: AO0yUKXGlgnpIOZpE7r5A+W4Dvqit0gRK3i50rOUBGxJYYJ2bZ6aXK4p 4/lO67CX9yecI+KHpuVJDPMV7qdRVnFbMqg4AN4cHg== X-Received: by 2002:a17:906:6c84:b0:8aa:33c4:87d5 with SMTP id s4-20020a1709066c8400b008aa33c487d5mr18188780ejr.10.1678315547309; Wed, 08 Mar 2023 14:45:47 -0800 (PST) Received: from alco.roam.corp.google.com (80.71.134.83.ipv4.parknet.dk. [80.71.134.83]) by smtp.gmail.com with ESMTPSA id ot18-20020a170906ccd200b008e40853a712sm8040167ejb.97.2023.03.08.14.45.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Mar 2023 14:45:47 -0800 (PST) From: Ricardo Ribalda Date: Wed, 08 Mar 2023 23:45:36 +0100 Subject: [PATCH RESEND v5 5/5] media: uvcvideo: Fix hw timestamp handling for slow FPS MIME-Version: 1.0 Message-Id: <20220920-resend-hwtimestamp-v5-5-139d1a144614@chromium.org> References: <20220920-resend-hwtimestamp-v5-0-139d1a144614@chromium.org> In-Reply-To: <20220920-resend-hwtimestamp-v5-0-139d1a144614@chromium.org> To: Laurent Pinchart , Mauro Carvalho Chehab Cc: "hn.chen" , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, Ricardo Ribalda X-Mailer: b4 0.11.0-dev-696ae X-Developer-Signature: v=1; a=openpgp-sha256; l=2432; i=ribalda@chromium.org; h=from:subject:message-id; bh=8oy5jraGEK21FgogoPTHRpnEBLvJaCndlyuKgZhZ4ZM=; b=owEBbQKS/ZANAwAKAdE30T7POsSIAcsmYgBkCRAWwM+vnZz8D7hi2QHfLJNIXdM2uj8xqqrGEuM8 GWfHQ0WJAjMEAAEKAB0WIQREDzjr+/4oCDLSsx7RN9E+zzrEiAUCZAkQFgAKCRDRN9E+zzrEiGVnD/ 0ZZz+qXtOEMfCgF5HlAwc1Q+RLZCxf4ZO1YCYRL8HAtJRfGzegNQnua+/fEJDCLoroLU/vgRHINUw+ ev/eB7oK2cab4EFihmX1Lwu1F5VbMpMmgkGK1FjScREm2180fNAzYdfM6gh4c2B/iz5cKKWkfgljwP GnlZdnQ2mhu8VJj3URRAwNBtG6qDujoqq6e0Gf116eJPThgv5MK6KwH95gIO89xz35Lhy6kckvJF1K 4QxFFq21iP4+zogTXqKxwJOsfbPSLy7smLy/gv8uC2+AkK9Z7nC0XZJKpeCOP8Bqp7v6EMgYmCRpXV lnJ/t6z2r5jTazn3SHFqq+gtQQBNxZqVkFGTdTY4JqV7nxlEzxGFimwJmK315PO4mjYgyNB33myuM4 sGaOBYl8MyjzD8yDupsokZhCP5d4g64MO4Xe6zs3HlfEl7FJcniTvsdMtNq9omiRnvw4gkgw8EzzE4 kcMqamAOB8gcP5xuaimAKMFppqQknbymb+jFW2wPDzOd48qA8+jA3vw4PkRpQF1fWejvoX7aDV6Yop EmBYeitH54ZLLtZmAGzhVomyHEnr/uWFqGgM4ETNNX51/4tr6RLjmMRbtoQOjc3EfoGvD5vRvHdpHJ t2OMLBjrJuj2oIgK4b14TYNJ4LT7CRlOhgQCaJ/runUpCIEFrb9sSFn0Y6GQ== X-Developer-Key: i=ribalda@chromium.org; a=openpgp; fpr=9EC3BB66E2FC129A6F90B39556A0D81F9F782DA9 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759843942015795064?= X-GMAIL-MSGID: =?utf-8?q?1759843942015795064?= In UVC 1.5 we get a single clock value per frame. With the current buffer size of 32, FPS slowers than 32 might roll-over twice. The current code cannot handle two roll-over and provide invalid timestamps. Revome all the samples from the circular buffer that are more than two rollovers old, so the algorithm always provides good timestamps. Note that we are removing values that are more than one second old, which means that there is enough distance between the two points that we use for the interpolation to provide good values. Tested-by: HungNien Chen Signed-off-by: Ricardo Ribalda --- drivers/media/usb/uvc/uvc_video.c | 15 +++++++++++++++ drivers/media/usb/uvc/uvcvideo.h | 1 + 2 files changed, 16 insertions(+) diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c index 22255bfa7db9..ae692122d5dc 100644 --- a/drivers/media/usb/uvc/uvc_video.c +++ b/drivers/media/usb/uvc/uvc_video.c @@ -473,6 +473,20 @@ static void uvc_video_clock_add_sample(struct uvc_clock *clock, spin_lock_irqsave(&clock->lock, flags); + /* Delete last overflows */ + if (clock->head == clock->last_sof_overflow) + clock->last_sof_overflow = -1; + + /* Handle overflows */ + if (clock->count > 0 && clock->last_sof > sample->dev_sof) { + /* Remove data from the last^2 overflows */ + if (clock->last_sof_overflow != -1) + clock->count = (clock->head - clock->last_sof_overflow) + % clock->count; + clock->last_sof_overflow = clock->head; + } + + /* Add sample */ memcpy(&clock->samples[clock->head], sample, sizeof(*sample)); clock->head = (clock->head + 1) % clock->size; clock->count = min(clock->count + 1, clock->size); @@ -600,6 +614,7 @@ static void uvc_video_clock_reset(struct uvc_clock *clock) clock->head = 0; clock->count = 0; clock->last_sof = -1; + clock->last_sof_overflow = -1; clock->sof_offset = -1; } diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h index 699c33bc24ed..f2a7e1507492 100644 --- a/drivers/media/usb/uvc/uvcvideo.h +++ b/drivers/media/usb/uvc/uvcvideo.h @@ -501,6 +501,7 @@ struct uvc_streaming { unsigned int head; unsigned int count; unsigned int size; + unsigned int last_sof_overflow; u16 last_sof; u16 sof_offset;