diff options
| author | cladisch <cladisch@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-10-05 07:42:02 +0000 |
|---|---|---|
| committer | cladisch <cladisch@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-10-05 07:42:02 +0000 |
| commit | 59b6e1393dee644f32db9ee09f03acbe208f41ef (patch) | |
| tree | 821dcc1bb432be4072e5365a34caa556bdf1792e /libao2 | |
| parent | 23235a0ed02b1956c4bf5cb8394acaf31f5f9423 (diff) | |
| download | mpv-59b6e1393dee644f32db9ee09f03acbe208f41ef.tar.bz2 mpv-59b6e1393dee644f32db9ee09f03acbe208f41ef.tar.xz | |
fix calculation of ao_data.bps for sample formats with more than 16 bits
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29750 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libao2')
| -rw-r--r-- | libao2/ao_oss.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/libao2/ao_oss.c b/libao2/ao_oss.c index acfb6db48a..1e369c31a1 100644 --- a/libao2/ao_oss.c +++ b/libao2/ao_oss.c @@ -396,8 +396,19 @@ ac3_retry: } ao_data.bps=ao_data.channels; - if(ao_data.format != AF_FORMAT_U8 && ao_data.format != AF_FORMAT_S8) + switch (ao_data.format & AF_FORMAT_BITS_MASK) { + case AF_FORMAT_8BIT: + break; + case AF_FORMAT_16BIT: ao_data.bps*=2; + break; + case AF_FORMAT_24BIT: + ao_data.bps*=3; + break; + case AF_FORMAT_32BIT: + ao_data.bps*=4; + break; + } ao_data.outburst-=ao_data.outburst % ao_data.bps; // round down ao_data.bps*=ao_data.samplerate; |