From patchwork Fri Jan 13 13:48:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 43316 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp282309wrt; Fri, 13 Jan 2023 05:59:25 -0800 (PST) X-Google-Smtp-Source: AMrXdXu7HMwu5w1oWaEA3Yg8Frl2HE4NsSDpCf1jCnlLRnzX7zNLzT8OLkjVGJvCdpUWVJLbMohz X-Received: by 2002:a17:906:7e0c:b0:86c:df3:4bbc with SMTP id e12-20020a1709067e0c00b0086c0df34bbcmr181377ejr.4.1673618365428; Fri, 13 Jan 2023 05:59:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673618365; cv=none; d=google.com; s=arc-20160816; b=vIuvo2NAI7KKUTKZunxHI70mYjrb6jWUL2UmVxq5YsLrD7xU3Ho9e0rEMsL5Ja2a+X LWoFpBmwP9GsTa/gMS0QccVwDrM78l8tq2O3tvEHH8XwRQaQJA47bIx5fbc0MjrSxdJY JBUQCXEuFDdrK9UogTrNqxht5tIyytMeLSMqpf73yW9Ig192aCYNkXhzlrKOrcWoeOEY O21+2ZOUt9i1nBkBmuajgmeQ78XmvivbX/9ZxoERjDa+cfEkVopFpw9eOxdMWkN45+Db P7Fok5oitkZGecM+RT8TY3zMkhpXqAvckSXw010fywnaRQaAF985rWNF7Cq2enIL+0cx esvg== 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=qJgtpHz+rrTvZ2HTdfCXZ2CyubMLbgrhsqS57oo+fLs=; b=XIejPpDLLuPAqRG5Gt1SNLchzrW6HDBB5H77y61q4/NUt5YVhtvQlXisxl1Yj2Uhqo rqIXapUTBDhuSIqgGTavYwcpg6T4qw5tZiQ6gpyh2siqHI+oUeM5JJL3dpReTM+CwH+Y vzttWM7s/ETm+ipRUByaO2Zy5mnWy0SIX85CYD2q74Vy/Du84sr80jmntudYRpcUbd3k lLahzH54YzzwSfyVxPl8AWP0f0bdY8on+a22w/vJlqP5esXq+i7Pz6uAA3lFTafGAvwk mGCBvxll5CPxcbT7flqd3ZMssJqUy0HyM01KWLyBK3xL6mk11pgGujT/k50xWwialIU/ rGoQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=ND08wZXS; 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 sa18-20020a1709076d1200b007ae4717bf08si24656082ejc.359.2023.01.13.05.59.01; Fri, 13 Jan 2023 05:59:25 -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=ND08wZXS; 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 S241716AbjAMNxC (ORCPT + 99 others); Fri, 13 Jan 2023 08:53:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51312 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241591AbjAMNwV (ORCPT ); Fri, 13 Jan 2023 08:52:21 -0500 Received: from mail-ej1-x62d.google.com (mail-ej1-x62d.google.com [IPv6:2a00:1450:4864:20::62d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7C8F9669BB for ; Fri, 13 Jan 2023 05:49:06 -0800 (PST) Received: by mail-ej1-x62d.google.com with SMTP id v6so9445112ejg.6 for ; Fri, 13 Jan 2023 05:49:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; 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=qJgtpHz+rrTvZ2HTdfCXZ2CyubMLbgrhsqS57oo+fLs=; b=ND08wZXSDHaD26Y0TCZhButoS5O8WaoV7uieUsnmBfhZHWPpncmTUCs4PJn3K1qSeg zmUzvLwj9sNFB6KtMVa44DjavpJ2SZ+wLrZyXmBA/dkQDh3FXuqNIA1fi8HIhR1rDCaG dKc0juQpNzQk2G1W7Q8wPK3AVhFEv9G+IVROs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=qJgtpHz+rrTvZ2HTdfCXZ2CyubMLbgrhsqS57oo+fLs=; b=AjUUpj19A/0UsvDz6AD6AEA00+gqHpmbwJiauFxr+0sD97HBZygG7uqb8DTp6MRtae BC+Jp2p81e7BSkPWIdbiQTYFMHB4xqZede/+UBxptxXPWw5rMr3HG9U7eR0ko+w0Dllj 6iZAvJU97uHV7hrVzL+6mmZ5AgeAqi6/AvyIS0+NJtUWE3+9a3PQGS5OwhWm+apcRr6U 1Ee3/yqslsrphgBlyIrCwkt0a9iFBEgUdcB7g+nmO609VxId4pM7kUGomoNzZtRosXNB MeNevVRcQStzoM/adiD4WwxBf/d8edLTaW8wmwM5gfQ+4Xq187Hb8wwxndEHXdtwUlEd 7FVQ== X-Gm-Message-State: AFqh2kpcvN3d7gD4DLaOERcF7dv7nzpbd9nI6OJM6yCzEVGMeLzSmEk8 3oxggVAx7+ddbREDPun4FhRIujL8M0kpUGk/c5Y= X-Received: by 2002:a17:907:8a24:b0:846:95f9:5b4d with SMTP id sc36-20020a1709078a2400b0084695f95b4dmr90060532ejc.42.1673617744658; Fri, 13 Jan 2023 05:49:04 -0800 (PST) Received: from alco.roam.corp.google.com ([2620:0:1059:10:b023:4272:bddc:acf2]) by smtp.gmail.com with ESMTPSA id w23-20020a1709062f9700b0084d3bf44996sm7072888eji.142.2023.01.13.05.49.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Jan 2023 05:49:04 -0800 (PST) From: Ricardo Ribalda Date: Fri, 13 Jan 2023 14:48:48 +0100 Subject: [PATCH v5 2/5] media: uvcvideo: Quirk for invalid dev_sof in Logitech C922 MIME-Version: 1.0 Message-Id: <20220920-resend-hwtimestamp-v5-2-660679c6e148@chromium.org> References: <20220920-resend-hwtimestamp-v5-0-660679c6e148@chromium.org> In-Reply-To: <20220920-resend-hwtimestamp-v5-0-660679c6e148@chromium.org> To: Mauro Carvalho Chehab , Laurent Pinchart 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=5225; i=ribalda@chromium.org; h=from:subject:message-id; bh=hnq1PFU+jUes6McsuTh1jrRR6iZpqXb1FFM1WIqCsy0=; b=owEBbQKS/ZANAwAKAdE30T7POsSIAcsmYgBjwWFHk2w4RhlH18GhP3/ZqGa/Lgl662roB7gJW0jX tE+jkN6JAjMEAAEKAB0WIQREDzjr+/4oCDLSsx7RN9E+zzrEiAUCY8FhRwAKCRDRN9E+zzrEiFuHD/ 0T+asPS2gJL5WRZcRw41N5tD5bz49be8iTGWEr5yjsM7e/dLMj2gA6jD6+PZE7rAlvHGcXUItOxY7D Z/aYo8edrIpPc+EqSGRuoUvQILn3xFn85iukIjts/l+76aPKp1M7BbxVNHYl7vsJTSHtctB5Rq6XtH 49Kdnk+HPfngySAvC8GouO6GbDsCD04uSN5fsMbh7xcM93NTqMgoCHqTJvdEPCMW6LirNs1MYmTAGM KANqrIB+8sqZi+5khKW4pmuGXxYRNnUQFgM3TqeJXxYVkY6G9UUhk1btaFvNw7/hcdznHoSuEwwf0j CNm/vsAmRQ2OTCUMHG0pZyA1S4BkvLXDGcYx35i93QZbVhrCgT27ZemDky82lZqU2SpoL4Zg/fMUhP vGTrw6sV+JDqzh9JfdETbo9XogvEu6hzlWQZ5CJnUFD9Wuk7xmSXs1wg7NoVx1RTUVq2DjPQGHQl1i ZSsMWfF9uCc6ymrEMo1WKL8ZiXYpFaSlzmYiTlU0cmdkLRVWreLOLnLr1UCPOQ7wLFSH35+Usql0vB SevSDJTpskAE42jfK8Gd9JLb/qjnWHTN3X7jiFyMazMu69B3ESB5ViZ8oIViK3xLGLlp0PXgfJ3N9O 6iRhtHlsD1mBez4uTqHeyddhTupgsUeWXE0TQp+o+fUbf4PjirUCjKx3ludg== 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 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?1754916051005757507?= X-GMAIL-MSGID: =?utf-8?q?1754916051005757507?= 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