From nobody Fri May 2 10:46:15 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zpndz3c8tz5vWmx; Fri, 02 May 2025 10:46:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zpndz2Dgrz4NNc; Fri, 02 May 2025 10:46:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746182775; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=58ZEsHazRzrT4zYjkAk1DYfIOUbSnCIrFz2+B8c2KIc=; b=bMiW6St+2xmjHxNnYuvUaybzjxnv7To6xL60+P/0iLHW4FJOrzpKphVS92B/1/Ofu9ilkv 7MScNYaWXk/1h0OgN2q25epKYUFMPLYT3l1fvtPSe8i20TU/XugRTs1anwVzMLa/MOyc8k e+H7jr+qRRE8OTZ5jV9w2zEm/VVSnbF5CJU0FDSK1jXSzCWC50j7yPPD1L7Rss3l8DPjjH 0wWTX0kvvWiJQTlezcM1azQJHPm2XmVV0i4+tMdhm8xyCG3NsOvMy3yXvzRUVkNFttHGzK bVFCky2NLVizuuKrnB8QrxkuYn3eSUAQ+t8NUkvx2ZctNDSw8CLyMBjglD7FFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746182775; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=58ZEsHazRzrT4zYjkAk1DYfIOUbSnCIrFz2+B8c2KIc=; b=iJC/nsFGNP0XI9dklLFFvMBNVIVE9VlR3DgaRYT1gYhP7wOY19sBMYaMuLi9yuTnhs52yo eIzI54eHyOSOCo5hSTGWrFR1QGJPXhcttrnkLngzLmurUMiLdlZIXLpRL+mPRabEKibyPn Ol9KPFs8RnVFDbbTbxKTvXs304TLV/n06HV9jLbOL4JltFtrAAaF2jBtvPMgBB7T2Qky/S ++zCbHZwooe0kXzJFatvf87jkRUF33i98ZqYfq9BIKO0UVfa4aCbJPHPPnJ7SAWhzNRHeU B+2arWjH/PA7YdzhP852kocJWRaAacn/wGafV2jBo0t/yARSDabAVL75M9UJPQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746182775; a=rsa-sha256; cv=none; b=itvMsbiMSSJrLxbg7duuyv7k5FjspDYy5WakeyWpBexeCIu6jRoxm8v8fzWb+RJD4MzF4X hI4pKhDPohSdkeDIoLl4v5dKVkNvJXV1KKsZ4xlIKEgdj1c4DzTOf2soR3R+rmmdU9FRzH jdR7Nbdzzm2TnzMAvvL2iZH2we9xeVWMz44nubvjf6/LPZBXalWHrvMfqXxoN63VdxoZaf O24SVJVdsa6CyflKllnm/CgBx66dk/6HQdisu4Ue9PkTHq4cFs5RuQE28eh8JOi6Ix4PBV 5Ch4tx/gGZUylZ2eB6DvdZOw7YDdgyG+JRKykwgUcRM9abcJpmwO9m7XECQksA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zpndz1hK8z18lc; Fri, 02 May 2025 10:46:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 542AkFcW035978; Fri, 2 May 2025 10:46:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 542AkFCX035975; Fri, 2 May 2025 10:46:15 GMT (envelope-from git) Date: Fri, 2 May 2025 10:46:15 GMT Message-Id: <202505021046.542AkFCX035975@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 4a9c90d81e86 - stable/14 - sound: Export hardware and software buffer sample rate in sndstat nvlist List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4a9c90d81e86ece27816e584835cd6f6ac97c8f5 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=4a9c90d81e86ece27816e584835cd6f6ac97c8f5 commit 4a9c90d81e86ece27816e584835cd6f6ac97c8f5 Author: Christos Margiolis AuthorDate: 2025-04-25 16:55:38 +0000 Commit: Christos Margiolis CommitDate: 2025-05-02 10:43:48 +0000 sound: Export hardware and software buffer sample rate in sndstat nvlist Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D49983 (cherry picked from commit 19ec522d6dc1d4616e07f5668339fc637856f547) sound tests: Fetch HWBUF_RATE and SWBUF_RATE in sndstat_nv Introduced in 19ec522d6dc1 ("sound: Export hardware and software buffer sample rate in sndstat nvlist"). Sponsored by: The FreeBSD Foundation MFC after: 1 week (cherry picked from commit 52a0f967dcc5b78c5f2f7e49a96e9cec56472a4f) --- share/man/man4/sndstat.4 | 6 ++++++ sys/dev/sound/pcm/sndstat.c | 4 ++++ sys/sys/sndstat.h | 2 ++ tests/sys/sound/sndstat.c | 2 ++ 4 files changed, 14 insertions(+) diff --git a/share/man/man4/sndstat.4 b/share/man/man4/sndstat.4 index 1d51882b98a5..1764ff418601 100644 --- a/share/man/man4/sndstat.4 +++ b/share/man/man4/sndstat.4 @@ -98,12 +98,14 @@ dsps (NVLIST ARRAY): 1 left_volume (NUMBER): 45 right_volume (NUMBER): 45 hwbuf_fmt (NUMBER): 0x200010 + hwbuf_rate (NUMBER): 48000 hwbuf_size (NUMBER): 0 hwbuf_blksz (NUMBER): 0 hwbuf_blkcnt (NUMBER): 0 hwbuf_free (NUMBER): 0 hwbuf_ready (NUMBER): 0 swbuf_fmt (NUMBER): 0x201000 + swbuf_rate (NUMBER): 48000 swbuf_size (NUMBER): 16384 swbuf_blksz (NUMBER): 2048 swbuf_blkcnt (NUMBER): 8 @@ -226,6 +228,8 @@ Left volume. Right volume. .It Dv hwbuf_format Hardware buffer format. +.It Dv hwbuf_rate +Hardware buffer sample rate; .It Dv hwbuf_size Hardware buffer size. .It Dv hwbuf_blksz @@ -238,6 +242,8 @@ Free space in hardware buffer (in bytes). Number of bytes ready to be read/written from hardware buffer. .It Dv swbuf_format Software buffer format. +.It Dv swbuf_rate +Software buffer sample rate; .It Dv swbuf_size Software buffer size. .It Dv swbuf_blksz diff --git a/sys/dev/sound/pcm/sndstat.c b/sys/dev/sound/pcm/sndstat.c index cafd9aff4bdc..509a35c5a038 100644 --- a/sys/dev/sound/pcm/sndstat.c +++ b/sys/dev/sound/pcm/sndstat.c @@ -493,6 +493,8 @@ sndstat_build_sound4_nvlist(struct snddev_info *d, nvlist_t **dip) CHN_GETVOLUME(c, SND_VOL_C_PCM, SND_CHN_T_FR)); nvlist_add_number(cdi, SNDST_DSPS_SOUND4_CHAN_HWBUF_FORMAT, sndbuf_getfmt(c->bufhard)); + nvlist_add_number(cdi, SNDST_DSPS_SOUND4_CHAN_HWBUF_RATE, + sndbuf_getspd(c->bufhard)); nvlist_add_number(cdi, SNDST_DSPS_SOUND4_CHAN_HWBUF_SIZE, sndbuf_getsize(c->bufhard)); nvlist_add_number(cdi, SNDST_DSPS_SOUND4_CHAN_HWBUF_BLKSZ, @@ -505,6 +507,8 @@ sndstat_build_sound4_nvlist(struct snddev_info *d, nvlist_t **dip) sndbuf_getready(c->bufhard)); nvlist_add_number(cdi, SNDST_DSPS_SOUND4_CHAN_SWBUF_FORMAT, sndbuf_getfmt(c->bufsoft)); + nvlist_add_number(cdi, SNDST_DSPS_SOUND4_CHAN_SWBUF_RATE, + sndbuf_getspd(c->bufsoft)); nvlist_add_number(cdi, SNDST_DSPS_SOUND4_CHAN_SWBUF_SIZE, sndbuf_getsize(c->bufsoft)); nvlist_add_number(cdi, SNDST_DSPS_SOUND4_CHAN_SWBUF_BLKSZ, diff --git a/sys/sys/sndstat.h b/sys/sys/sndstat.h index 6fd2e06ac483..a569f27f288f 100644 --- a/sys/sys/sndstat.h +++ b/sys/sys/sndstat.h @@ -94,12 +94,14 @@ struct sndstioc_nv_arg { #define SNDST_DSPS_SOUND4_CHAN_LEFTVOL "left_volume" #define SNDST_DSPS_SOUND4_CHAN_RIGHTVOL "right_volume" #define SNDST_DSPS_SOUND4_CHAN_HWBUF_FORMAT "hwbuf_format" +#define SNDST_DSPS_SOUND4_CHAN_HWBUF_RATE "hwbuf_rate" #define SNDST_DSPS_SOUND4_CHAN_HWBUF_SIZE "hwbuf_size" #define SNDST_DSPS_SOUND4_CHAN_HWBUF_BLKSZ "hwbuf_blksz" #define SNDST_DSPS_SOUND4_CHAN_HWBUF_BLKCNT "hwbuf_blkcnt" #define SNDST_DSPS_SOUND4_CHAN_HWBUF_FREE "hwbuf_free" #define SNDST_DSPS_SOUND4_CHAN_HWBUF_READY "hwbuf_ready" #define SNDST_DSPS_SOUND4_CHAN_SWBUF_FORMAT "swbuf_format" +#define SNDST_DSPS_SOUND4_CHAN_SWBUF_RATE "swbuf_rate" #define SNDST_DSPS_SOUND4_CHAN_SWBUF_SIZE "swbuf_size" #define SNDST_DSPS_SOUND4_CHAN_SWBUF_BLKSZ "swbuf_blksz" #define SNDST_DSPS_SOUND4_CHAN_SWBUF_BLKCNT "swbuf_blkcnt" diff --git a/tests/sys/sound/sndstat.c b/tests/sys/sound/sndstat.c index 637e640d3cff..ed292b570429 100644 --- a/tests/sys/sound/sndstat.c +++ b/tests/sys/sound/sndstat.c @@ -184,12 +184,14 @@ ATF_TC_BODY(sndstat_nv, tc) NV(number, LEFTVOL); NV(number, RIGHTVOL); NV(number, HWBUF_FORMAT); + NV(number, HWBUF_RATE); NV(number, HWBUF_SIZE); NV(number, HWBUF_BLKSZ); NV(number, HWBUF_BLKCNT); NV(number, HWBUF_FREE); NV(number, HWBUF_READY); NV(number, SWBUF_FORMAT); + NV(number, SWBUF_RATE); NV(number, SWBUF_SIZE); NV(number, SWBUF_BLKSZ); NV(number, SWBUF_BLKCNT);