From nobody Sun Apr 6 00:28:30 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 4ZVY9C6P0rz5sbWD; Sun, 06 Apr 2025 00:28:31 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZVY9B64fZz3x1Q; Sun, 06 Apr 2025 00:28:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743899310; 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=DNx99tiukrRafhirG+sBeuxPsze1jdofW08Doume1XE=; b=GfrXr17qhmPr+PtxGW45jkek8yIaROfGVmWswpANQ/gqAKGKGKZp3W7DdPyea8qj3R1vLf 4fuopLETVMeVaAD0gpwmIn9FpiSe56dbT/WxvzKdywH9gtudEb0ov2hSmqFUfK+WqAm/JZ xJUmtffUXpkz/mPTRU6SwUYcYc5mI+lAIh4v8tNRCXJfZ4BAVkfMKw1GAXkkZWYsnFDsvQ RakUAE1b4SBmPBPUctPem3xTv6aUjxzRBfTr+6Q4wwP9H8w1zcpETje0HqcAnjWOS1bal9 8Hf8/KmqqXJ6/3vQ1uLZue++7aauONyWtBSxKIfs/iW+fdClhhUdQGVi12eOQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743899310; a=rsa-sha256; cv=none; b=ipHTOykEkxuRi1eEbyC2AKmhyFgqq5oXgiiceD+704v3/+xmjwCAAhATMcH4yvETeUZQnq YSuu7KzKNnoa7VbK3xybDTjtQOVa1M4P7ReNIYn1PEaVFT5wo21COkJNGVQnKD0VVaelav Y2U32FP1jKYWDYEfTyaHYXVBYuUFQSDo0LngYmprBZa+pBn4MVDxgpnbtI5BKXPmXTIiFg FXEYdMkKn9Lw1crnr1rFaEuQzNhivQ7T09tds2QGFieEfQ1QowH48l+y6O7ByDfgeEFjxz /UMcPGORgQkBFgbnPT2vM5ELDoqgZBfkKH2yOPrFoI4JBdszW8A9fe0M36xn+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743899310; 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=DNx99tiukrRafhirG+sBeuxPsze1jdofW08Doume1XE=; b=GbowQi3CaE2vqrDI2JkAQeZXcmrpYc0ZqDLKWchIEutQkm7gs6OrVsiXtIPcAFjl6vD4AO iXwoVk2jKk4FftZ5e35ARmByTz25/AWPD19cLWb8Sl1zbO0SmJg0jcey2wP/jznouJq8um RVa1RdigDqJQzQf+hTgOH7Ee0yDKXLM0heKHQKLb86FnMba6hPZzyleO51dvBMdMUu+2qs gR4kYf6wmCvkWeBFbL0oKXK93y0NxLJriwLej9bGLcjsbSnTiAnQYQqcoYJChFymCKailg RGIc6KF6UR1ogsYK8qK563ULrcLs3ycmPPwh/uJGvSYDRXUYA0HFtF72qnTtzw== 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 4ZVY9B4x8NzfXJ; Sun, 06 Apr 2025 00:28:30 +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 5360SUL4065778; Sun, 6 Apr 2025 00:28:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5360SUtk065775; Sun, 6 Apr 2025 00:28:30 GMT (envelope-from git) Date: Sun, 6 Apr 2025 00:28:30 GMT Message-Id: <202504060028.5360SUtk065775@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: 831c30f09ea8 - stable/14 - sound: Improve afmt_tab 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: 831c30f09ea8a38d6b8b45d3e24b72cc2075086c Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=831c30f09ea8a38d6b8b45d3e24b72cc2075086c commit 831c30f09ea8a38d6b8b45d3e24b72cc2075086c Author: Christos Margiolis AuthorDate: 2025-03-30 17:45:53 +0000 Commit: Christos Margiolis CommitDate: 2025-04-06 00:28:14 +0000 sound: Improve afmt_tab Reduce ifdefs, and add aliases for the unsigned formats. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: dev_submerge.ch Differential Revision: https://reviews.freebsd.org/D48009 (cherry picked from commit a4aff024fd53a38ba08bbf5309589e1865ffe024) --- sys/dev/sound/pcm/channel.c | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c index 3aa7cf219d81..31a56a8b82e2 100644 --- a/sys/dev/sound/pcm/channel.c +++ b/sys/dev/sound/pcm/channel.c @@ -961,33 +961,38 @@ static const struct { { "mulaw", NULL, NULL, AFMT_MU_LAW }, { "u8", "8", NULL, AFMT_U8 }, { "s8", NULL, NULL, AFMT_S8 }, + { "ac3", NULL, NULL, AFMT_AC3 }, #if BYTE_ORDER == LITTLE_ENDIAN { "s16le", "s16", "16", AFMT_S16_LE }, { "s16be", NULL, NULL, AFMT_S16_BE }, -#else - { "s16le", NULL, NULL, AFMT_S16_LE }, - { "s16be", "s16", "16", AFMT_S16_BE }, -#endif - { "u16le", NULL, NULL, AFMT_U16_LE }, - { "u16be", NULL, NULL, AFMT_U16_BE }, - { "s24le", NULL, NULL, AFMT_S24_LE }, + { "s24le", "s24", "24", AFMT_S24_LE }, { "s24be", NULL, NULL, AFMT_S24_BE }, - { "u24le", NULL, NULL, AFMT_U24_LE }, - { "u24be", NULL, NULL, AFMT_U24_BE }, -#if BYTE_ORDER == LITTLE_ENDIAN { "s32le", "s32", "32", AFMT_S32_LE }, { "s32be", NULL, NULL, AFMT_S32_BE }, { "f32le", "f32", NULL, AFMT_F32_LE }, { "f32be", NULL, NULL, AFMT_F32_BE }, + { "u16le", "u16", NULL, AFMT_U16_LE }, + { "u16be", NULL, NULL, AFMT_U16_BE }, + { "u24le", "u24", NULL, AFMT_U24_LE }, + { "u24be", NULL, NULL, AFMT_U24_BE }, + { "u32le", "u32", NULL, AFMT_U32_LE }, + { "u32be", NULL, NULL, AFMT_U32_BE }, #else + { "s16le", NULL, NULL, AFMT_S16_LE }, + { "s16be", "s16", "16", AFMT_S16_BE }, + { "s24le", NULL, NULL, AFMT_S24_LE }, + { "s24be", "s24", "24", AFMT_S24_BE }, { "s32le", NULL, NULL, AFMT_S32_LE }, { "s32be", "s32", "32", AFMT_S32_BE }, { "f32le", NULL, NULL, AFMT_F32_LE }, { "f32be", "f32", NULL, AFMT_F32_BE }, -#endif + { "u16le", NULL, NULL, AFMT_U16_LE }, + { "u16be", "u16", NULL, AFMT_U16_BE }, + { "u24le", NULL, NULL, AFMT_U24_LE }, + { "u24be", "u24", NULL, AFMT_U24_BE }, { "u32le", NULL, NULL, AFMT_U32_LE }, - { "u32be", NULL, NULL, AFMT_U32_BE }, - { "ac3", NULL, NULL, AFMT_AC3 }, + { "u32be", "u32", NULL, AFMT_U32_BE }, +#endif { NULL, NULL, NULL, 0 } };