ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dsound: Also handle two-to-six-channel conversions.

This commit is contained in:
Andrew Eikum 2011-03-01 14:57:35 -06:00 committed by Alexandre Julliard
parent 0d0d4f394f
commit 54ff22b844
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dlls/dsound/mixer.c
View File

@ -294,22 +294,29 @@ static inline void cp_fields(const IDirectSoundBufferImpl *dsb, const BYTE *ibuf
INT istep = dsb->pwfx->wBitsPerSample / 8, ostep = device->pwfx->wBitsPerSample / 8; INT istep = dsb->pwfx->wBitsPerSample / 8, ostep = device->pwfx->wBitsPerSample / 8;
if (device->pwfx->nChannels == dsb->pwfx->nChannels || if (device->pwfx->nChannels == dsb->pwfx->nChannels ||
(device->pwfx->nChannels == 2 && dsb->pwfx->nChannels == 6)) { (device->pwfx->nChannels == 2 && dsb->pwfx->nChannels == 6) ||
(device->pwfx->nChannels == 6 && dsb->pwfx->nChannels == 2)) {
dsb->convert(ibuf, obuf, istride, ostride, count, freqAcc, adj); dsb->convert(ibuf, obuf, istride, ostride, count, freqAcc, adj);
if (device->pwfx->nChannels == 2) if (device->pwfx->nChannels == 2 || dsb->pwfx->nChannels == 2)
dsb->convert(ibuf + istep, obuf + ostep, istride, ostride, count, freqAcc, adj); dsb->convert(ibuf + istep, obuf + ostep, istride, ostride, count, freqAcc, adj);
return;
} }
if (device->pwfx->nChannels == 1 && dsb->pwfx->nChannels == 2) if (device->pwfx->nChannels == 1 && dsb->pwfx->nChannels == 2)
{ {
dsb->convert(ibuf, obuf, istride, ostride, count, freqAcc, adj); dsb->convert(ibuf, obuf, istride, ostride, count, freqAcc, adj);
return;
} }
if (device->pwfx->nChannels == 2 && dsb->pwfx->nChannels == 1) if (device->pwfx->nChannels == 2 && dsb->pwfx->nChannels == 1)
{ {
dsb->convert(ibuf, obuf, istride, ostride, count, freqAcc, adj); dsb->convert(ibuf, obuf, istride, ostride, count, freqAcc, adj);
dsb->convert(ibuf, obuf + ostep, istride, ostride, count, freqAcc, adj); dsb->convert(ibuf, obuf + ostep, istride, ostride, count, freqAcc, adj);
return;
} }
WARN("Unable to remap channels: device=%u, buffer=%u\n", device->pwfx->nChannels,
dsb->pwfx->nChannels);
} }
/** /**