Message ID | 20220920-resend-hwtimestamp-v6-3-c7a99299ec35@chromium.org |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp285358wrd; Thu, 9 Mar 2023 05:21:29 -0800 (PST) X-Google-Smtp-Source: AK7set/iEI1CpvgigtFilU8ACJcjGYdygQUijrCfcAudI+XeinnKIPqpDL5sCoAJ0Wpy1yogv5Po X-Received: by 2002:a17:902:720b:b0:19a:7758:e5e6 with SMTP id ba11-20020a170902720b00b0019a7758e5e6mr18320238plb.48.1678368088890; Thu, 09 Mar 2023 05:21:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678368088; cv=none; d=google.com; s=arc-20160816; b=Sv+1CthQCr6mXwhv26ygN344tBM2BgWUAVxb5URKoTCLq3mgE06JHF+FCYCpXBVCSh zrOpvdSwwdzs4XrGNR0fQ1FgH96vd7b4xO4RwIX0kdM/7LUaS0gO/X4LzXFmILOiAu5f tjJFzj8e73VFYiBJr8fuzyDeaWobKeCtVDhuKDd+J3onLz0RLUIiUnearQH9gvrRceDL pPdL2OiZb0LEcU8I4zNNm5udXSTS5qQW/+cjpdk7JkSZVScI4U/tdrQGQ/CyIRMkGq/K q1NwOLTnWM5Hmftx2iBDJL14baM3PqSSMQkpNMkhtaCZa352IY7rpjuyRb/iICFM8T7l JHGw== 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=oihws/oJVUk4/qcYiN1BQhjDRl1MZi40xXWGpNQ+ONY=; b=PtOEggusK3tTUlcfvjeS55es9YBZP1LlQl7Xe6J1p+Ptegfg26r/iphNjAFtZVE9ce BxAQvvn5feKKgiaZlq0od4kbfABdqDq6T2SOr+xWDhmIOFj/NfaSb+EMZ+yrEQXjubjQ HElEMKt1qJ/XSRH+jfsDyQQIml3AsN2e3sV++lFEENRZfxZ0wL8Twj8SUpiB0ZPDFHNK TYewKe1jVy48WTPnhZN6zEJ0gQ5Tz+tQvMG+sm0FEM0MzkQueUBxRRU6msdQDQRZiCny wfBWXBRfOTHGON4qxhcU6CTSQicEtkU0IABnkMbikt5alDUjPZ35UmC+MjHZSP+/qA5k jlbg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=m6K1pinQ; 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 lg14-20020a170902fb8e00b00199051ac8f7si16628630plb.188.2023.03.09.05.21.13; Thu, 09 Mar 2023 05:21:28 -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=m6K1pinQ; 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 S231341AbjCIM5y (ORCPT <rfc822;carlos.wei.hk@gmail.com> + 99 others); Thu, 9 Mar 2023 07:57:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58006 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231134AbjCIM53 (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Thu, 9 Mar 2023 07:57:29 -0500 Received: from mail-ed1-x529.google.com (mail-ed1-x529.google.com [IPv6:2a00:1450:4864:20::529]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B533CF168F for <linux-kernel@vger.kernel.org>; Thu, 9 Mar 2023 04:56:49 -0800 (PST) Received: by mail-ed1-x529.google.com with SMTP id cw28so6582728edb.5 for <linux-kernel@vger.kernel.org>; Thu, 09 Mar 2023 04:56:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1678366568; 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=oihws/oJVUk4/qcYiN1BQhjDRl1MZi40xXWGpNQ+ONY=; b=m6K1pinQpMXJ7zNjBGgM9palA2IOSgd1NQPJ0OqhN4sVXkjbA0bvTPp+WtAD2Fw+Ka GM6aZumoy9jelme0wMZr5QrTMQFiI4Dd68/wwGDbznCPspB25fjxZTtTot6PkHnzBrCI 760PSlrpWXDpE292ciStrqHYub1wuZZbevkDU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678366568; 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=oihws/oJVUk4/qcYiN1BQhjDRl1MZi40xXWGpNQ+ONY=; b=sRoRxNK2wx5Z/NUwsag0lJ7DlAqD33KnDnHHOKK/Ew6pdS8h2AS2KWw6iCi0mbuZy+ 13FeTVeX8sGADQsiWyhwu6iaU+gvhyflGwAlb5SjwdjOwocrAJ5/M8gx+LQwSiZuo5MB OB1JImhWS6mIP729KQ/f5VrEo0p96MHCsjk/z9R6MazzoQmzCxPGZ7ro2Gb3ePrM6C/q ykC6/+vsGBEyFrHZmuni3m1BOX4iFM/NEpuicY47J6NEY4gdtD7rNJlodMww1goZbnyd A1A18trk6FWO34+DiKH3twrJ/uaZphwp+C6VFcWDIfvY6GWUviGqa+UEo9sSZL2uCSFu RjIQ== X-Gm-Message-State: AO0yUKVQ11b1yad+EiPQR7kYrqtFEnjRzOBod/+ZhcsxrCnBogBQl0sC VNkkXiNNHAreL5VvISAavN21Proj2SOujpVAol+wVA== X-Received: by 2002:aa7:d305:0:b0:4c0:4912:2006 with SMTP id p5-20020aa7d305000000b004c049122006mr17708532edq.11.1678366568228; Thu, 09 Mar 2023 04:56:08 -0800 (PST) Received: from alco.roam.corp.google.com ([2620:0:1059:10:1645:7aa4:a765:1966]) by smtp.gmail.com with ESMTPSA id hy26-20020a1709068a7a00b008d92897cc29sm8799523ejc.37.2023.03.09.04.56.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Mar 2023 04:56:08 -0800 (PST) From: Ricardo Ribalda <ribalda@chromium.org> Date: Thu, 09 Mar 2023 13:55:17 +0100 Subject: [PATCH v6 3/5] media: uvcvideo: Allow hw clock updates with buffers not full MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20220920-resend-hwtimestamp-v6-3-c7a99299ec35@chromium.org> References: <20220920-resend-hwtimestamp-v6-0-c7a99299ec35@chromium.org> In-Reply-To: <20220920-resend-hwtimestamp-v6-0-c7a99299ec35@chromium.org> To: Mauro Carvalho Chehab <mchehab@kernel.org>, Laurent Pinchart <laurent.pinchart@ideasonboard.com> Cc: linux-media@vger.kernel.org, Ricardo Ribalda <ribalda@chromium.org>, Sergey Senozhatsky <senozhatsky@chromium.org>, linux-kernel@vger.kernel.org, "hn.chen" <hn.chen@sunplusit.com> 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=GlVqUU92g3WKEyOK44VrS63EV0hOXZ0v4iXYGJQ5aOU=; b=owEBbQKS/ZANAwAKAdE30T7POsSIAcsmYgBkCddfTZKqE6aW7SvZIz5O9S+ai73EnKknqwCmNy6A J+lGGCiJAjMEAAEKAB0WIQREDzjr+/4oCDLSsx7RN9E+zzrEiAUCZAnXXwAKCRDRN9E+zzrEiP1fD/ 0XJLBl4y7+8jrIpqo6Dv+jQ23AUpjjv+62ILj8Ow8eNOCgvNd912V2bfQQpxDHIleMKurAA5n5Rio1 //G2Wc2KLghDUNpMaiQ/zFKH7fktJYVS/3NSlPApRU40rzyQNz04efItH6EZTc7l1/jS/MAODRMFb0 7cUR5EBvFFGTeeyHCNojHTff/xf15WJcX/T23z2YFmsJ/z/mhVSKw2nmwHWN0mR5W3e3WbGTyJ40uP pOX91r5lWUJ0G4VffrgnCBeED09KQmceScN6v7f8bo7lAtqc7FBdcYw0nvkQfzZGIB4xmYava0qaa0 O5y/Q/amNkwtbZQtQrC8iECRE/pJEnW0+nmdIprWApia6kM4D7fHrGg2Jllt5wXpGtTojwpVr2ddC5 nhpmVUBiMY6pMR8G6P3QlDSDhMBHHwPKI1xbGxF/TlEmo6cZHoPJ3WdQsnoUVEq0+ZBmgSGta+lV7G 75g+/45/lwhaPEBETfMDg4q2dFbQLLZstxQaX9fEfjun1N6QUdrMyv8qVnm+2S5GTqSJCuaUUH7Edu kE3nNQTPpSrL2BWoYeDcgvrOifQPlNtvFkVOKU1NGVBdc6FdV+i/1p9p6SJZzTWxzoII45wHn1qWhq kqEBNN5zFIjs4jlwflslNg5R5tcQDh5hJyfHSUPb4GX0hoxTuvzxYWk+yaJg== 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=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: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759896497064531643?= X-GMAIL-MSGID: =?utf-8?q?1759896497064531643?= |
Series |
uvcvideo: Fixes for hw timestamping
|
|
Commit Message
Ricardo Ribalda
March 9, 2023, 12:55 p.m. UTC
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 <hn.chen@sunplusit.com> Signed-off-by: Ricardo Ribalda <ribalda@chromium.org> --- drivers/media/usb/uvc/uvc_video.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
Comments
On (23/03/09 13:55), Ricardo Ribalda wrote: [..] > +++ b/drivers/media/usb/uvc/uvc_video.c > @@ -754,10 +754,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]; This looks like a significant change: `rb->head` and `rb->head - INT` are quite different things. May I ask for some clarifications? [..] > + /* > + * 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)) 256 << 16 is 1/4 of a second?
diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c index e363a71dd190..d5fb0c1339a3 100644 --- a/drivers/media/usb/uvc/uvc_video.c +++ b/drivers/media/usb/uvc/uvc_video.c @@ -754,10 +754,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. */ @@ -772,6 +772,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);