From nobody Mon Dec 8 17:21:36 2025 X-Original-To: dev-commits-src-all@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 4dQ80c40Hqz6K6Yk for ; Mon, 08 Dec 2025 17:21:36 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dQ80c1v1Nz3Tb9 for ; Mon, 08 Dec 2025 17:21:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765214496; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3fQeMfhOHiD+zqMBZ1Cs9JCxmKIVsBLHuUfrdN9WV9M=; b=M/7isChEQVFHOFoeuRgP+yvRASJmimM2ZDT5EA4jssWReAUxYMfCQ8sFo/B/NuS21cFcY2 cO6zxN5n/SAlaVIIwdzT5DW/aj2KTQ1CLquDrHKegR0tVhP9biVREkrNAYXEBs0E3yFeFe /9WahMV3xcQ6jq/uC9fwqo37wka28v6Wwnku2mh1rHgi6Po61UTvSc6sds6ijjSNTBo8ql Tc7aJM8ypzSo3ld35LNn2mdBbBpU4QJBULw0BqFfrg9vBLR6OXsb6z/fCLvkUCsTYOiY8g cAg5nWQ/hDpG1AunRvfNxn50WjNYBe5EX2fVlbCKwU9atTA/vU6s88Rbqeao0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765214496; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3fQeMfhOHiD+zqMBZ1Cs9JCxmKIVsBLHuUfrdN9WV9M=; b=ZaUW+ESSrCRmGK8efNdlWS0ln+CHyCK4Ofcpm83R/p5/+pXCPQGWwo4e6FQlJJz5mJVd/h tWe9iA9BdfOvn8wJvvhA3xvxjTx/h+neo8BtiCvhnmxObJylW2Sjzu/C0aMxU6tR1rpVAJ 9CTyBo6L03o7gWug81JmDRR4f101ev8bei4Esv8kgVq9S9RjCNtUgb8daMKIYpjvOycPOZ sJm4yDGZ8j+APE4UxK9p7KtwuGFcW1OBIyrfNy5wmpghi4vT9eTE11HTut1Hvn0kLLzKJn Tki/HlVmKVePm9cq74X4AgUVyFomrGbziO68V1Xj+XMtuuPAfNxMwzIAWqwnKw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765214496; a=rsa-sha256; cv=none; b=N4tylvH+he8EuPg1E3VrpA7BoVgDZDkQBwiKv3PLHjRKweiUgseYUOOD3DhJK4sv+xg0NR z0w4wOOBe3JZUukQ87dlXRs3FbX0hjN8c8V8irNjRVOrV1Gq1B+uMkNUUfSJFqMmV2suqv qMdE+7jmknqFQcLgBrEEMPNMd7CzYVBhNwCi9aLgyGT/dkyw8LK5C929qlWQhDjDVYQMrj GQ07zYumhVKsP5TMrWKb3Ezdciy89vkpSn1J4POT5FPvsYW0XwsZHD9UyXMALY/Fm/iQod ezyBpfOXRiI1AxRF4CuIuVGT+l06wRlLqd1HvPJdP3GttPmLHayzY39Rch0oBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dQ80c18HXz6gN for ; Mon, 08 Dec 2025 17:21:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id ad32 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 08 Dec 2025 17:21:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Goran=?utf-8?Q? Meki=C4=87?= From: Christos Margiolis Subject: git: ebe7b241662b - main - sound examples: Check if setting property was successful List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: ebe7b241662be3941e462be9f228fcad1b67073a Auto-Submitted: auto-generated Date: Mon, 08 Dec 2025 17:21:36 +0000 Message-Id: <69370920.ad32.225d24c8@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=ebe7b241662be3941e462be9f228fcad1b67073a commit ebe7b241662be3941e462be9f228fcad1b67073a Author: Goran Mekić AuthorDate: 2025-12-08 17:20:34 +0000 Commit: Christos Margiolis CommitDate: 2025-12-08 17:21:30 +0000 sound examples: Check if setting property was successful MFC after: 1 week Reviewed by: christos Differential Revision: https://reviews.freebsd.org/D54038 --- share/examples/sound/oss.h | 22 ++++++++++++++++++---- share/examples/sound/simple.c | 4 ++++ 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/share/examples/sound/oss.h b/share/examples/sound/oss.h index e1ba4165810f..cf38b8de2b0c 100644 --- a/share/examples/sound/oss.h +++ b/share/examples/sound/oss.h @@ -112,16 +112,28 @@ oss_init(struct config *config) } /* Set sample format */ - if (ioctl(config->fd, SNDCTL_DSP_SETFMT, &config->format) < 0) + tmp = config->format; + if (ioctl(config->fd, SNDCTL_DSP_SETFMT, &tmp) < 0) err(1, "Unable to set sample format"); + if (tmp != config->format) + warnx("Format: requested=%08x, got=%08x", config->format, tmp); + config->format = tmp; /* Set sample channels */ - if (ioctl(config->fd, SNDCTL_DSP_CHANNELS, &config->audio_info.max_channels) < 0) + tmp = config->audio_info.max_channels; + if (ioctl(config->fd, SNDCTL_DSP_CHANNELS, &tmp) < 0) err(1, "Unable to set channels"); + if (tmp != config->audio_info.max_channels) + warnx("Channels: requested=%d, got=%d", config->audio_info.max_channels, tmp); + config->audio_info.max_channels = tmp; /* Set sample rate */ + tmp = config->sample_rate; if (ioctl(config->fd, SNDCTL_DSP_SPEED, &config->sample_rate) < 0) err(1, "Unable to set sample rate"); + if (tmp != config->sample_rate) + warnx("Sample rate: requested=%d, got=%d", config->sample_rate, tmp); + config->sample_rate = tmp; /* Calculate sample size */ switch (config->format) { @@ -197,10 +209,12 @@ oss_init(struct config *config) config->chsamples = config->sample_count / config->audio_info.max_channels; printf("bytes: %d, fragments: %d, fragsize: %d, fragstotal: %d, " - "samples: %d\n", + "samples: %d, channels: %d, sample size: %d, sample rate: %d, " + "format: %08x\n", config->buffer_info.bytes, config->buffer_info.fragments, config->buffer_info.fragsize, config->buffer_info.fragstotal, - config->sample_count); + config->sample_count, config->audio_info.max_channels, + config->sample_size, config->sample_rate, config->format); /* Set trigger direction and mmap protection */ switch (config->mode & O_ACCMODE) { diff --git a/share/examples/sound/simple.c b/share/examples/sound/simple.c index e458841f596a..78f9d848bcec 100644 --- a/share/examples/sound/simple.c +++ b/share/examples/sound/simple.c @@ -29,6 +29,7 @@ * SUCH DAMAGE. */ +#include #include "oss.h" /* @@ -115,6 +116,9 @@ main(int argc, char *argv[]) int rc, bytes; oss_init(&config); + if (config.format != AFMT_S32_NE) + errx(1, "Device doesn't support signed 32bit samples. " + "Check with 'sndctl' if it can be configured for 's32le' format."); bytes = config.buffer_info.bytes; channels = malloc(bytes);