From patchwork Mon Feb 26 08:28:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shengjiu Wang X-Patchwork-Id: 206489 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:a81b:b0:108:e6aa:91d0 with SMTP id bq27csp1957382dyb; Mon, 26 Feb 2024 01:23:47 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCUjF6MlhEGA8/WNLj3ieBPhgm/htYd6Guwp6wyDYJdp31Q2FmAEaaRjYHbxOvLHqQIzIl9D0ZNvOQsTeL1wFZpFeQZnSA== X-Google-Smtp-Source: AGHT+IF8uJD14HEgXraLPpCcQVx4enpaVxTY1lL6aO4Ez5+vCqdHQYPmjTWHpyC7ZDZ/ek6+WS30 X-Received: by 2002:a05:6a00:9396:b0:6e5:3edd:550a with SMTP id ka22-20020a056a00939600b006e53edd550amr6916pfb.14.1708939426854; Mon, 26 Feb 2024 01:23:46 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708939426; cv=pass; d=google.com; s=arc-20160816; b=V2OpJE2uWu2DbGbmsjAyOH2pCgH2TuYMt6eEjxfY46N15HJw/2Le/VTNoPUEQomHat AUJpjM6IPhmrW2GVOLBkfNEfsJv6mP0KJBoEQuWUEV+A4pgrN07bP0diQQ4i4EYRPbVJ j6JjjjWm23pySahN5pJ6I1Eu+jeYXcGyYnA7B4OuB2NReayU23ULZyenxVGDzEd/wE6Q wXDyeCdzuZqbWxqALUESBvOHVNoCgsgIkLUZAt2EMk328hOK3ge5PdAl6Y5FOd38OPJ0 zvkLI09JKqMIrkZO0Uc59iUQyGwGNlcLuxmLx6hZ0x+WCUdQa/EJ8VhCpWIeFFGv3xsg wD3w== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-id:precedence:references :in-reply-to:message-id:date:subject:to:from; bh=SILKGfqNJjf+5uuEAdV5zNS9XG/LtkYt+dCbUKH6sY4=; fh=ufiESpW7Hvn5oNmN0l6/qCUiQrKfLLrOwb5uR1Dftds=; b=NTa6Co/5sFTJnX2WhA7idKtW/7nXKfjyr1dGqi57kb8kvAk7As8J2gNKL7V2ZH/x/S Goq1Tbz1e9N6DRdDWWm4Ban9amKkDGC20DEhD5xGwcDybWUNTWdPYvZZJye25uBWHHBI u2V81n+oBOWKsISX5gv+48rPpajyUSR6/GVOrgSlrTy08wwzcBHti9RsqWh0IchOHkwh lGvprnobWRyVihWYsH3UJYcAnkvhR09fcT8czPh8/vTNN2HMKKSyoiLEAx2D1TJTBNYN +o/Dxi3D/tjWTcco2ZG4qlu6IYmanHcqXPci0Y5NLZpTzrH9kg0wds74WqxOaGHjkSJn u6AQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1 spf=pass spfdomain=nxp.com dmarc=pass fromdomain=nxp.com); spf=pass (google.com: domain of linux-kernel+bounces-80938-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-80938-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id bn9-20020a056a00324900b006e535a40f7dsi705774pfb.91.2024.02.26.01.23.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Feb 2024 01:23:46 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-80938-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=nxp.com dmarc=pass fromdomain=nxp.com); spf=pass (google.com: domain of linux-kernel+bounces-80938-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-80938-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id B9F842825F0 for ; Mon, 26 Feb 2024 09:23:46 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id BB7FF58218; Mon, 26 Feb 2024 08:44:31 +0000 (UTC) Received: from inva021.nxp.com (inva021.nxp.com [92.121.34.21]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BEC345730C; Mon, 26 Feb 2024 08:44:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=92.121.34.21 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708937069; cv=none; b=NRkehyBvdC6UftVY15CppU1rBzgIbrQhotoRr8x20fOnAQmkKxPVj7MbI+/bK1Lpl5fF3pJE4LOsD4Z1CMkn/t7GYpyxdkLHVYnn3/1TXHJT+/5C+mv8Uphc+76BqzpnyP6Q/0YhMHHOGQ/8Tjhp9bYDtKy9q7Tu/L40puSAEbQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708937069; c=relaxed/simple; bh=zItxLVW5Z3oKtQQHUpenFQi3aYHp+cZX947e2TReMKk=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References; b=TkFYEsa3lIHz9t3K63hFYORFAJTXNsF95DlujAj0FVyok/GaslcSiaUAm83Aqxi5Vz/AXCCmQ64bbkQZKmjFHWTzsYmHXfiEfsYrQiV/b4l/AfNFhzT9h5hqVwqAjm5i3mPZnz2MLDGwtQ7gf7ZxtaNvbjizXznzcckKe3Nkj7c= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com; spf=pass smtp.mailfrom=nxp.com; arc=none smtp.client-ip=92.121.34.21 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nxp.com Received: from inva021.nxp.com (localhost [127.0.0.1]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id 6CC4220014B; Mon, 26 Feb 2024 09:44:26 +0100 (CET) Received: from aprdc01srsp001v.ap-rdc01.nxp.com (aprdc01srsp001v.ap-rdc01.nxp.com [165.114.16.16]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id 065A4201103; Mon, 26 Feb 2024 09:44:26 +0100 (CET) Received: from localhost.localdomain (shlinux2.ap.freescale.net [10.192.224.44]) by aprdc01srsp001v.ap-rdc01.nxp.com (Postfix) with ESMTP id ED505183AC0B; Mon, 26 Feb 2024 16:44:23 +0800 (+08) From: Shengjiu Wang To: hverkuil@xs4all.nl, sakari.ailus@iki.fi, tfiga@chromium.org, m.szyprowski@samsung.com, mchehab@kernel.org, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, shengjiu.wang@gmail.com, Xiubo.Lee@gmail.com, festevam@gmail.com, nicoleotsuka@gmail.com, lgirdwood@gmail.com, broonie@kernel.org, perex@perex.cz, tiwai@suse.com, alsa-devel@alsa-project.org, linuxppc-dev@lists.ozlabs.org Subject: [PATCH v13 11/16] media: uapi: Add audio rate controls support Date: Mon, 26 Feb 2024 16:28:24 +0800 Message-Id: <1708936109-11587-12-git-send-email-shengjiu.wang@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1708936109-11587-1-git-send-email-shengjiu.wang@nxp.com> References: <1708936109-11587-1-git-send-email-shengjiu.wang@nxp.com> X-Virus-Scanned: ClamAV using ClamSMTP Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791952868789294686 X-GMAIL-MSGID: 1791952868789294686 Add V4L2_CID_M2M_AUDIO_SOURCE_RATE and V4L2_CID_M2M_AUDIO_DEST_RATE new IDs for rate control. Add V4L2_CID_M2M_AUDIO_SOURCE_RATE_OFFSET and V4L2_CID_M2M_AUDIO_DEST_RATE_OFFSET for clock drift. Signed-off-by: Shengjiu Wang --- .../media/v4l/ext-ctrls-audio-m2m.rst | 38 +++++++++++++++++++ drivers/media/v4l2-core/v4l2-ctrls-defs.c | 6 +++ include/uapi/linux/v4l2-controls.h | 5 +++ 3 files changed, 49 insertions(+) diff --git a/Documentation/userspace-api/media/v4l/ext-ctrls-audio-m2m.rst b/Documentation/userspace-api/media/v4l/ext-ctrls-audio-m2m.rst index 82d2ecedbfee..b137b7c442e6 100644 --- a/Documentation/userspace-api/media/v4l/ext-ctrls-audio-m2m.rst +++ b/Documentation/userspace-api/media/v4l/ext-ctrls-audio-m2m.rst @@ -19,3 +19,41 @@ Audio M2M Control IDs The Audio M2M class descriptor. Calling :ref:`VIDIOC_QUERYCTRL` for this control will return a description of this control class. + +.. _v4l2-audio-asrc: + +``V4L2_CID_M2M_AUDIO_SOURCE_RATE (integer menu)`` + This control specifies the audio source sample rate, unit is Hz + +``V4L2_CID_M2M_AUDIO_DEST_RATE (integer menu)`` + This control specifies the audio destination sample rate, unit is Hz + +``V4L2_CID_M2M_AUDIO_SOURCE_RATE_OFFSET (fixed point)`` + This control specifies the offset from the audio source sample rate, + unit is Hz. + + The offset compensates for any clock drift. The actual source audio + sample rate is the ideal source audio sample rate from + ``V4L2_CID_M2M_AUDIO_SOURCE_RATE`` plus this fixed point offset. + + The audio source clock may have some drift. Reducing or increasing the + audio sample rate dynamically to ensure that Sample Rate Converter is + working on the real sample rate, this feature is for the Asynchronous + Sample Rate Converter module. + So, userspace would be expected to be monitoring such drift + and increasing/decreasing the sample frequency as needed by this control. + +``V4L2_CID_M2M_AUDIO_DEST_RATE_OFFSET (fixed point)`` + This control specifies the offset from the audio destination sample rate, + unit is Hz. + + The offset compensates for any clock drift. The actual destination audio + sample rate is the ideal source audio sample rate from + ``V4L2_CID_M2M_AUDIO_DEST_RATE`` plus this fixed point offset. + + The audio destination clock may have some drift. Reducing or increasing + the audio sample rate dynamically to ensure that sample rate converter + is working on the real sample rate, this feature is for the Asynchronous + Sample Rate Converter module. + So, userspace would be expected to be monitoring such drift + and increasing/decreasing the sample frequency as needed by this control. diff --git a/drivers/media/v4l2-core/v4l2-ctrls-defs.c b/drivers/media/v4l2-core/v4l2-ctrls-defs.c index 2a85ea3dc92f..91e1f5348c23 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls-defs.c +++ b/drivers/media/v4l2-core/v4l2-ctrls-defs.c @@ -1245,6 +1245,8 @@ const char *v4l2_ctrl_get_name(u32 id) /* Audio M2M controls */ case V4L2_CID_M2M_AUDIO_CLASS: return "Audio M2M Controls"; + case V4L2_CID_M2M_AUDIO_SOURCE_RATE: return "Audio Source Sample Rate"; + case V4L2_CID_M2M_AUDIO_DEST_RATE: return "Audio Destination Sample Rate"; default: return NULL; } @@ -1606,6 +1608,10 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type, case V4L2_CID_COLORIMETRY_HDR10_MASTERING_DISPLAY: *type = V4L2_CTRL_TYPE_HDR10_MASTERING_DISPLAY; break; + case V4L2_CID_M2M_AUDIO_SOURCE_RATE: + case V4L2_CID_M2M_AUDIO_DEST_RATE: + *type = V4L2_CTRL_TYPE_INTEGER_MENU; + break; default: *type = V4L2_CTRL_TYPE_INTEGER; break; diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h index a8b4b830c757..30129ccdc282 100644 --- a/include/uapi/linux/v4l2-controls.h +++ b/include/uapi/linux/v4l2-controls.h @@ -3495,6 +3495,11 @@ struct v4l2_ctrl_av1_film_grain { #define V4L2_CID_M2M_AUDIO_CLASS_BASE (V4L2_CTRL_CLASS_M2M_AUDIO | 0x900) #define V4L2_CID_M2M_AUDIO_CLASS (V4L2_CTRL_CLASS_M2M_AUDIO | 1) +#define V4L2_CID_M2M_AUDIO_SOURCE_RATE (V4L2_CID_M2M_AUDIO_CLASS_BASE + 0) +#define V4L2_CID_M2M_AUDIO_DEST_RATE (V4L2_CID_M2M_AUDIO_CLASS_BASE + 1) +#define V4L2_CID_M2M_AUDIO_SOURCE_RATE_OFFSET (V4L2_CID_M2M_AUDIO_CLASS_BASE + 2) +#define V4L2_CID_M2M_AUDIO_DEST_RATE_OFFSET (V4L2_CID_M2M_AUDIO_CLASS_BASE + 3) + /* MPEG-compression definitions kept for backwards compatibility */ #ifndef __KERNEL__ #define V4L2_CTRL_CLASS_MPEG V4L2_CTRL_CLASS_CODEC