From nobody Sun Mar 30 17:48:28 2025 X-Original-To: dev-commits-src-main@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 4ZQhZN3l6Sz5rp6d; Sun, 30 Mar 2025 17:48:28 +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 4ZQhZN1Mk3z3RTG; Sun, 30 Mar 2025 17:48:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743356908; 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=8qwKI+C1G5HR1lyS3cUXRZtPbtaFKWOi1nyHYQpvpK4=; b=K41ZR4tpjcgULCA4tBySG8+I/0rg6paOuHAun3Obiu4Y3buyPnk7IU5T+WKQnjyhnrxhoO A5d9OWytk+6FrlWoae9XXKV7U8jIYh2BZV3u9hoVfcfRKR0fbAqTBJ5QTit9BgVORH+Him JG/0mt9jyciz+EAjjwOVLkt3GT2xZtjgdMEHBiOBl6w6YRzEBbcmZtlz3t8HP/UmgjrPdm Ar7uON1fpFF/iAdcErPdsXcVgKkqRPtPJA0vW0NUpbNiZ4UdM3YBfgBLAIDDDYd8Nm2SC2 4CPXVrFkDtmmsB5eas05eJWnVeA7z3WV45f0VFuXRyAnLAD+ZLrykFjIQDbi5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743356908; a=rsa-sha256; cv=none; b=eL2iAjjf32WlqP4F1Op6SFqdD995If1fckiWMU2PAFGozFIhIXgEGYBnnuiH1M8XWN7aSB exZ7wuW2WYBcgVYJNfXc1Q5yIGy6KVsTz0lxH09AuerIZehW/uQU6HM1sjfQvytbk4vF+j 9+xK84fJprjehm8UyWr1jab+/Lo4qI7kvuGmHDY7PO1WoNmo6yo1K/8qZmVSDFHbgwCj+M mDYlP8cDns1cFaCczmPuyR7UkvbfcABrJVRQzyXraErtZQjjPowsq8A2ICzLp5Igrbek7F dcl5gAIMWEK9Jf1JV3yjUnguAfW0sg7iQ/i6w+PgR3kwVaAsXZ3jOzOuYiD0Dw== 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=1743356908; 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=8qwKI+C1G5HR1lyS3cUXRZtPbtaFKWOi1nyHYQpvpK4=; b=oJ4Zcf5udBCyQdoDFyjEtx5djwvcnt+obbTdv1yufOhi0FjBvtwYAwceDRqak0aejatTuD 847XR4ydiW8/fo4vCbn/vCMkTS5laBateu23I6JdZvZUPkV4KxbkAP7SBua97RLkvZrhsV TnYtnYaLVwOe40ud9Hrf2odRmdBfuDZwqU6/2Xgcfbg+FS7UMsW/p69ORY0XvnHddDq4Rl 9d+0e4IvZwVNIFSeAq6T5TLql81OOpWoOkPfHbnQIjxVOB0Vmu2DzwCZ3vKohT2ayhsLQI Mu8lVt14FG/Tga21tEaZ7hCLleGA2I6OUa9lhIhrmD/0zciQjVTKsnKC2N1Z8g== 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 4ZQhZN0yrsz1NMV; Sun, 30 Mar 2025 17:48:28 +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 52UHmSfN060269; Sun, 30 Mar 2025 17:48:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52UHmSFw060266; Sun, 30 Mar 2025 17:48:28 GMT (envelope-from git) Date: Sun, 30 Mar 2025 17:48:28 GMT Message-Id: <202503301748.52UHmSFw060266@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: a4aff024fd53 - main - sound: Improve afmt_tab List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: a4aff024fd53a38ba08bbf5309589e1865ffe024 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=a4aff024fd53a38ba08bbf5309589e1865ffe024 commit a4aff024fd53a38ba08bbf5309589e1865ffe024 Author: Christos Margiolis AuthorDate: 2025-03-30 17:45:53 +0000 Commit: Christos Margiolis CommitDate: 2025-03-30 17:45:53 +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 --- 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 } };