From: Shengjiu Wang <shengjiu.wang@nxp.com>
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 v14 11/16] media: uapi: Add audio rate controls support
Date: Mon, 11 Mar 2024 17:53:56 +0800 [thread overview]
Message-ID: <1710150841-26991-12-git-send-email-shengjiu.wang@nxp.com> (raw)
In-Reply-To: <1710150841-26991-1-git-send-email-shengjiu.wang@nxp.com>
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 <shengjiu.wang@nxp.com>
---
.../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
--
2.34.1
next prev parent reply other threads:[~2024-03-11 10:15 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-11 9:53 [PATCH v14 00/16] Add audio support in v4l2 framework Shengjiu Wang
2024-03-11 9:53 ` [PATCH v14 01/16] media: v4l2-ctrls: add support for fraction_bits Shengjiu Wang
2024-03-11 9:53 ` [PATCH v14 02/16] ASoC: fsl_asrc: define functions for memory to memory usage Shengjiu Wang
2024-03-11 9:53 ` [PATCH v14 03/16] ASoC: fsl_easrc: " Shengjiu Wang
2024-03-11 9:53 ` [PATCH v14 04/16] ASoC: fsl_asrc: move fsl_asrc_common.h to include/sound Shengjiu Wang
2024-03-11 9:53 ` [PATCH v14 05/16] ASoC: fsl_asrc: register m2m platform device Shengjiu Wang
2024-03-11 9:53 ` [PATCH v14 06/16] ASoC: fsl_easrc: " Shengjiu Wang
2024-03-11 9:53 ` [PATCH v14 07/16] media: uapi: Add V4L2_CAP_AUDIO_M2M capability flag Shengjiu Wang
2024-03-11 9:53 ` [PATCH v14 08/16] media: v4l2: Add audio capture and output support Shengjiu Wang
2024-03-11 9:53 ` [PATCH v14 09/16] media: uapi: Define audio sample format fourcc type Shengjiu Wang
2024-03-11 9:53 ` [PATCH v14 10/16] media: uapi: Add V4L2_CTRL_CLASS_M2M_AUDIO Shengjiu Wang
2024-03-11 9:53 ` Shengjiu Wang [this message]
2024-03-11 9:53 ` [PATCH v14 12/16] media: uapi: Declare interface types for Audio Shengjiu Wang
2024-03-11 9:53 ` [PATCH v14 13/16] media: uapi: Add an entity type for audio resampler Shengjiu Wang
2024-03-11 9:53 ` [PATCH v14 14/16] media: vivid: add fixed point test controls Shengjiu Wang
2024-03-11 9:54 ` [PATCH v14 15/16] media: imx-asrc: Add memory to memory driver Shengjiu Wang
2024-03-11 9:54 ` [PATCH v14 16/16] media: vim2m-audio: add virtual driver for audio memory to memory Shengjiu Wang
2024-03-18 15:56 ` [PATCH v14 00/16] Add audio support in v4l2 framework Hans Verkuil
2024-03-19 2:24 ` Shengjiu Wang
2024-03-19 3:14 ` Shengjiu Wang
2024-03-19 7:21 ` Hans Verkuil
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1710150841-26991-12-git-send-email-shengjiu.wang@nxp.com \
--to=shengjiu.wang@nxp.com \
--cc=Xiubo.Lee@gmail.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=festevam@gmail.com \
--cc=hverkuil@xs4all.nl \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=m.szyprowski@samsung.com \
--cc=mchehab@kernel.org \
--cc=nicoleotsuka@gmail.com \
--cc=perex@perex.cz \
--cc=sakari.ailus@iki.fi \
--cc=shengjiu.wang@gmail.com \
--cc=tfiga@chromium.org \
--cc=tiwai@suse.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).