From nobody Mon Mar 17 18:36:50 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 4ZGkGC1NQzz5qVhl; Mon, 17 Mar 2025 18:36:51 +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 4ZGkGB4dspz43BF; Mon, 17 Mar 2025 18:36:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742236610; 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=DBQN0wBoZPYhwHmLNObvwPjQm8oF+XkP1PEczloeDMo=; b=cz5EUkoLKdPT+2/AcNQfSMOL6HUYZgQmrH5ruLaPzJu1v+YSCn67RID1QLAzVBJd1KQWOT t2dyBaFtzmpKFDld69OxNEyepah1kR7efSuYs7jDe8/qdvFjc87AtNWbeYOXDb6qzoRD3V 0r58963HPTjBAvfbTEHs8zpmtb05Jb1Lhd/gG9ys2XzDcs+xfbhv7Fp4roO8Ey84eU/rU+ gX30+tN3bD+KG6HeRKGIHrYWB/fuMAaFqnbl7w8ydQQmlN7IAT2ikt4N3wOzebE9hR14mX EklyNUPT91zPg8Pg14AppF/A8q0MsGcXnKpVMI/dD7SrJXWHSX6w+0FuT21JXw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742236610; a=rsa-sha256; cv=none; b=NnlHUPrzkWjV3ffshcFOEd0GcR/JOiP7v5afTgeFcBKhgdxtvOZsymu8FrXvA26Gb+D2gB 5cwcgKT0wZZ/Y6m7ROjFUHKJXygHeZ75j158i5zTCYjDgdg3xmhlylQfH54PzGix46GLnN CpBEx/JLiGS0GT7xD2qvoB674ZIvHzLRv0SLog+GPUqKcIXoJKkw6ONjc7wI8PgjHBGCQV V1HPBusLTI6B7J3anYpASecMV37yurjlTiN9/sy6VyPUnt0ivVtZqPGEVC6oBLbFgSUGl5 K58OcOJUsj+1r2W4D3hfefKsOHeFoR1VzjNqo+3nWQhAVAzZwTF45PMWY633wA== 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=1742236610; 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=DBQN0wBoZPYhwHmLNObvwPjQm8oF+XkP1PEczloeDMo=; b=oJCRt4QVMvhg0nsVexPO116EZTrRE7VpB7GMwWcOW6zh1sEjGMLl/HUSNpqAELty/0ht9l FvTH7HTbvlnuxnZqStksy5B1ZQfAVZetV9yqeBe3FjH+8jCY5475jn3Zx/7Gyj+VaYVBPZ rUP2TKn0klGHWg1HwGoR1DWEQ1LQigj4guvgp5eGxIkkcYzv/U9GgGRdnWt4y6lGWFg/sN f0EkT8BVMZhxxIGBbz8BoumfbItE4UEQ819vdCQcDE5PrxJhgufuzXwebfEOFo/xio11sM dIlBGFOcv0sp/BA3vD1bb/MIy+prhVzU4v6Tz1/X65eiDWlPS0VPxaiBOZt1xg== 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 4ZGkGB2rRjzyR8; Mon, 17 Mar 2025 18:36:50 +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 52HIaobx013150; Mon, 17 Mar 2025 18:36:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52HIao6f013147; Mon, 17 Mar 2025 18:36:50 GMT (envelope-from git) Date: Mon, 17 Mar 2025 18:36:50 GMT Message-Id: <202503171836.52HIao6f013147@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: 15dc84ba5f50 - stable/14 - sound: Remove feed_matrix_apply_generic() 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 15dc84ba5f509a3aba0a3454c13207926b8ba2c5 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=15dc84ba5f509a3aba0a3454c13207926b8ba2c5 commit 15dc84ba5f509a3aba0a3454c13207926b8ba2c5 Author: Christos Margiolis AuthorDate: 2025-03-10 20:19:46 +0000 Commit: Christos Margiolis CommitDate: 2025-03-17 18:28:54 +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 (cherry picked from commit b73b5f70e9f6be951e66531f6f57249eea4ba4dc) --- 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)