upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-12 18:20:49 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

sound: Fix VCHANs' starting and ending points in feeder chain

Browse source 
sndstat(4) falsely reports "hardware" as the starting point of
recording, and ending point of playback VCHANs. Recording VCHANs get
their input from the primary recording channel, and playback VCHANs send
their input to the primary playback channel.

Sponsored by:	The FreeBSD Foundation
MFC after:	2 days
Reviewed by:	dev_submerge.ch, markj
Differential Revision:	https://reviews.freebsd.org/D46177
This commit is contained in:
Christos Margiolis 2024-08-02 15:53:16 +03:00
parent 1b5e5ff68c
commit b58d9db4d7
1 changed files with 28 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
sys/dev/sound/pcm/sndstat.c
View file

@ -517,8 +517,13 @@ sndstat_build_sound4_nvlist(struct snddev_info *d, nvlist_t **dip)
nvlist_add_number(cdi, SNDST_DSPS_SOUND4_CHAN_SWBUF_READY,
sndbuf_getready(c->bufsoft));
sbuf_printf(&sb, "[%s",
(c->direction == PCMDIR_REC) ? "hardware" : "userland");
if (c->parentchannel != NULL) {
sbuf_printf(&sb, "[%s", (c->direction == PCMDIR_REC) ?
c->parentchannel->name : "userland");
} else {
sbuf_printf(&sb, "[%s", (c->direction == PCMDIR_REC) ?
"hardware" : "userland");
}
sbuf_printf(&sb, " -> ");
f = c->feeder;
while (f->source != NULL)
@ -550,8 +555,13 @@ sndstat_build_sound4_nvlist(struct snddev_info *d, nvlist_t **dip)
sbuf_printf(&sb, " -> ");
f = f->parent;
}
sbuf_printf(&sb, "%s]",
(c->direction == PCMDIR_REC) ? "userland" : "hardware");
if (c->parentchannel != NULL) {
sbuf_printf(&sb, "%s]", (c->direction == PCMDIR_REC) ?
"userland" : c->parentchannel->name);
} else {
sbuf_printf(&sb, "%s]", (c->direction == PCMDIR_REC) ?
"userland" : "hardware");
}
CHN_UNLOCK(c);
@ -1306,8 +1316,13 @@ sndstat_prepare_pcm(struct sbuf *s, device_t dev, int verbose)
sbuf_printf(s, "channel flags=0x%b", c->flags, CHN_F_BITS);
sbuf_printf(s, "\n\t");
sbuf_printf(s, "{%s}",
(c->direction == PCMDIR_REC) ? "hardware" : "userland");
if (c->parentchannel != NULL) {
sbuf_printf(s, "{%s}", (c->direction == PCMDIR_REC) ?
c->parentchannel->name : "userland");
} else {
sbuf_printf(s, "{%s}", (c->direction == PCMDIR_REC) ?
"hardware" : "userland");
}
sbuf_printf(s, " -> ");
f = c->feeder;
while (f->source != NULL)
@ -1339,8 +1354,13 @@ sndstat_prepare_pcm(struct sbuf *s, device_t dev, int verbose)
sbuf_printf(s, " -> ");
f = f->parent;
}
sbuf_printf(s, "{%s}",
(c->direction == PCMDIR_REC) ? "userland" : "hardware");
if (c->parentchannel != NULL) {
sbuf_printf(s, "{%s}", (c->direction == PCMDIR_REC) ?
"userland" : c->parentchannel->name);
} else {
sbuf_printf(s, "{%s}", (c->direction == PCMDIR_REC) ?
"userland" : "hardware");
}
CHN_UNLOCK(c);
}