From nobody Mon Mar 10 20:22:12 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 4ZBSx04RP8z5pbjj; Mon, 10 Mar 2025 20:22:12 +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 4ZBSx03MGjz3s3Q; Mon, 10 Mar 2025 20:22:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741638132; 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=1pFp6FZ1UgfGzj1VUNeSFuSNIkIPrSF/Rt4v3LqaZhE=; b=gsV13HcBExZQA8BriZzH0AZHYStmt9NIaNWtKHSYO3HYrwP7al3yt8GJqgHkGa5gIBKy8P S81CVAkxjHM1hNgFhZNqlUi3+lxawS1TSlkzw11kbbFol4fJzyyWneM9FUYFlgyDctrATL HlkDi6eUIT5TD7QEayWtNjA3NyPsiqZ0m765sdGuQZALgxFkDpIbGiLvWEaUh6g60IVYYE r5vlTYCNmPUKATkzLZSOnyf+UfjqV/loQKpBqvTlmQdHTEt2rJ8F0R8vOyNmaaFIJ+tmcG kIog+znTXrsnz2RcQvpPTkiq+wMnngF9BxX6JpV82A5IrA406v4B74taLQ3vlw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741638132; a=rsa-sha256; cv=none; b=i9o7nCCfTkTn0qGnXgmRYpwMN+LXSUAFScC6I+2XQE6EwMt2wWIuKUwq9N38sSH3KhiXY7 EN/u9GD+4jZGStGAmbryn7XGZHm1ZXtOVgHegKCPMD0noNQyB3kGRtgJbArXeWtWOhLaTa IV9m964bNrt6VBSGcuBDxzDgQp8w6sY/X/sIe9OwLUb5ZJvd3tlyq+ioE+3mQNr30JSbMd xbAhX0F/PJjnrjkCPUmU3vzwdTOVuNGMgD3aLzPA4C8zc7pM5dLN4dfRuTDoBE8bpgrXLw v6N6XOqdCXPfMeH5eS+e90iTgbtnq96VHufi+HyIB7yF5nibigd7/mNs38yzDQ== 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=1741638132; 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=1pFp6FZ1UgfGzj1VUNeSFuSNIkIPrSF/Rt4v3LqaZhE=; b=Y/X9LRW0nUxyaY4AMp3m7//RR6jCCG2qdv7kj0PMxbLMJCJ469umGZZ/+Vy+MPMA2Td5DS wIiidFWXEo8fnwmeebE57pBdUDVSh0xD40PftsxlIjPxmCoatK0YscE404CfY/QamFkNCC KoKrTxsggR4Li5XmlZYJzos3t/Fr+Rwd4fcKhX3uzAHWq53TSCjE8ozulUbGHdAfVYeSJi aBGEy4mSlIuYqn8h/XnelOKMk5aHoIs+IKZgNNH/8QQzDNv34hf+iNJ734mrnqcCxcLw4Q Xt38P7H7efNsCHKC8ZiOXDtqrylEEilRIa7h8s9TfImu0dIl9RWrvJWTdG2uRQ== 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 4ZBSx02yVfzvgB; Mon, 10 Mar 2025 20:22:12 +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 52AKMC8M044408; Mon, 10 Mar 2025 20:22:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52AKMCf4044405; Mon, 10 Mar 2025 20:22:12 GMT (envelope-from git) Date: Mon, 10 Mar 2025 20:22:12 GMT Message-Id: <202503102022.52AKMCf4044405@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: b73b5f70e9f6 - main - sound: Remove feed_matrix_apply_generic() 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: b73b5f70e9f6be951e66531f6f57249eea4ba4dc Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=b73b5f70e9f6be951e66531f6f57249eea4ba4dc commit b73b5f70e9f6be951e66531f6f57249eea4ba4dc Author: Christos Margiolis AuthorDate: 2025-03-10 20:19:46 +0000 Commit: Christos Margiolis CommitDate: 2025-03-10 20:19:46 +0000 sound: Remove feed_matrix_apply_generic() It does what feed_matrix_apply() already does, so it is redundant. Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D48036 --- sys/dev/sound/pcm/feeder_matrix.c | 49 --------------------------------------- 1 file changed, 49 deletions(-) diff --git a/sys/dev/sound/pcm/feeder_matrix.c b/sys/dev/sound/pcm/feeder_matrix.c index ab7922179867..2fee2be8bf5b 100644 --- a/sys/dev/sound/pcm/feeder_matrix.c +++ b/sys/dev/sound/pcm/feeder_matrix.c @@ -169,55 +169,6 @@ feed_matrix_reset(struct feed_matrix_info *info) } } -#ifdef FEEDMATRIX_GENERIC -static void -feed_matrix_apply_generic(struct feed_matrix_info *info, - uint8_t *src, uint8_t *dst, uint32_t count) -{ - intpcm64_t accum; - intpcm_t v; - int i, j; - - do { - for (i = 0; info->matrix[i].chn[0] != SND_CHN_T_EOF; - i++) { - if (info->matrix[i].chn[0] == SND_CHN_T_NULL) { - pcm_sample_write_norm(dst, 0, info->out); - dst += info->bps; - continue; - } else if (info->matrix[i].chn[1] == - SND_CHN_T_EOF) { - v = pcm_sample_read_norm(src + - info->matrix[i].chn[0], info->in); - pcm_sample_write_norm(dst, v, info->out); - dst += info->bps; - continue; - } - - accum = 0; - for (j = 0; - info->matrix[i].chn[j] != SND_CHN_T_EOF; - j++) { - v = pcm_sample_read_norm(src + - info->matrix[i].chn[j], info->in); - accum += v; - } - - accum = (accum * info->matrix[i].mul) >> - info->matrix[i].shift; - - FEEDMATRIX_CLIP_CHECK(accum, 32); - - v = (accum > PCM_S32_MAX) ? PCM_S32_MAX : - ((accum < PCM_S32_MIN) ? PCM_S32_MIN : accum); - pcm_sample_write_norm(dst, v, info->out); - dst += info->bps; - } - src += info->ialign; - } while (--count != 0); -} -#endif - static int feed_matrix_setup(struct feed_matrix_info *info, struct pcmchan_matrix *m_in, struct pcmchan_matrix *m_out)