From owner-svn-src-all@FreeBSD.ORG Wed Jan 25 11:45:50 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 891781065754; Wed, 25 Jan 2012 11:45:50 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 749DD8FC1B; Wed, 25 Jan 2012 11:45:50 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q0PBjoIH023474; Wed, 25 Jan 2012 11:45:50 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0PBjoIv023472; Wed, 25 Jan 2012 11:45:50 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201201251145.q0PBjoIv023472@svn.freebsd.org> From: Alexander Motin Date: Wed, 25 Jan 2012 11:45:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r230537 - head/sys/dev/sound/pcm X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Jan 2012 11:45:50 -0000 Author: mav Date: Wed Jan 25 11:45:50 2012 New Revision: 230537 URL: http://svn.freebsd.org/changeset/base/230537 Log: Allow PASSTHROUGH (AC3) to have more then 2 channels. 8 channels can be used to get more then 6.144Mbps bandwidth. Modified: head/sys/dev/sound/pcm/channel.c Modified: head/sys/dev/sound/pcm/channel.c ============================================================================== --- head/sys/dev/sound/pcm/channel.c Wed Jan 25 11:28:18 2012 (r230536) +++ head/sys/dev/sound/pcm/channel.c Wed Jan 25 11:45:50 2012 (r230537) @@ -2000,9 +2000,10 @@ chn_setformat(struct pcm_channel *c, uin int ret; /* XXX force stereo */ - if (format & AFMT_PASSTHROUGH) + if ((format & AFMT_PASSTHROUGH) && AFMT_CHANNEL(format) < 2) { format = SND_FORMAT(format, AFMT_PASSTHROUGH_CHANNEL, AFMT_PASSTHROUGH_EXTCHANNEL); + } oldformat = c->format; oldspeed = c->speed;