diff options
| author | Alexandre Ratchov <alex@caoua.org> | 2016-09-20 22:00:40 +0000 |
|---|---|---|
| committer | Eric Wong <e@80x24.org> | 2016-09-20 22:18:59 +0000 |
| commit | ea4f3fb3c6de93e10786fbfc1cb1bdf9006bbcdb (patch) | |
| tree | 5d27471ba28bfd7d8b200f17f30dd91f8d7f948b | |
| parent | 7e74b254b2a7c963be0bfce751fc5911fe681c12 (diff) | |
| download | sox-ea4f3fb3c6de93e10786fbfc1cb1bdf9006bbcdb.tar.gz | |
sndio: handle 24-bit samples properly on OpenBSD js/sndio
Reported-by: Jan Stary <hans@stare.cz> cf. http://marc.info/?l=openbsd-ports&m=147395657332262&w=2
| -rw-r--r-- | src/sndio.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/sndio.c b/src/sndio.c index e031b5bb..77785ce4 100644 --- a/src/sndio.c +++ b/src/sndio.c @@ -113,8 +113,6 @@ static int startany(sox_format_t *ft, unsigned mode) else reqpar.rchan = ft->signal.channels; } - if (ft->signal.precision > 0) - reqpar.bits = ft->signal.precision; switch (ft->encoding.encoding) { case SOX_ENCODING_SIGN2: reqpar.sig = 1; @@ -127,6 +125,12 @@ static int startany(sox_format_t *ft, unsigned mode) } if (ft->encoding.bits_per_sample > 0) reqpar.bits = ft->encoding.bits_per_sample; + else if (ft->signal.precision > 0) + reqpar.bits = ft->signal.precision; + else + reqpar.bits = SOX_DEFAULT_PRECISION; + reqpar.bps = (reqpar.bits + 7) / 8; + reqpar.msb = 1; if (ft->encoding.reverse_bytes != sox_option_default) { reqpar.le = SIO_LE_NATIVE; if (ft->encoding.reverse_bytes) |