restore AC3/DTS pass-through over S/PDIF; ok edd@ jakemsr@

This commit is contained in:
naddy 2010-08-24 14:55:30 +00:00
parent 77faf8f678
commit 7927c2232b
2 changed files with 5 additions and 4 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.170 2010/08/06 20:05:18 naddy Exp $
# $OpenBSD: Makefile,v 1.171 2010/08/24 14:55:30 naddy Exp $
# May not be hard to add more.
ONLY_FOR_ARCHS= amd64 i386 powerpc sparc64 arm mips64 mips64el
@ -13,7 +13,7 @@ SUBST_VARS+= PREFIX CONFDIR
N= mplayer
DISTNAME= mplayer-export-snapshot-${V}
PKGNAME= ${N}-${V}
REVISION= 3
REVISION= 4
CATEGORIES= x11 multimedia
EXTRACT_SUFX= .tar.bz2

View File

@ -149,7 +149,8 @@ static int init(int rate, int channels, int format, int flags)
par.sig = 1;
par.le = 0;
break;
case AF_FORMAT_AC3:
case AF_FORMAT_AC3_BE:
case AF_FORMAT_AC3_LE:
par.bits = 16;
par.sig = 1;
par.le = SIO_LE_NATIVE;
@ -193,7 +194,7 @@ static int init(int rate, int channels, int format, int flags)
bpf = par.bps * par.pchan;
ao_data.samplerate = par.rate;
ao_data.channels = par.pchan;
ao_data.format = ac3 ? AF_FORMAT_AC3 : format;
ao_data.format = ac3 ? AF_FORMAT_AC3_NE : format;
ao_data.bps = bpf * par.rate;
ao_data.buffersize = par.appbufsz * bpf;
ao_data.outburst = par.round * bpf;