ShuriZma
/
Cxbx-Reloaded
mirror of https://github.com/Cxbx-Reloaded/Cxbx-Reloaded.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Implement multi-channels support in HLE DSound

This commit is contained in:
RadWolfie 2018-04-06 18:35:06 -05:00
parent 2f8b67804d
commit f04e45b9c3
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/CxbxKrnl/EmuDSoundInline.hpp
View File

@ -183,13 +183,10 @@ inline void GeneratePCMFormat(
// be WAVEFORMATEXTENSIBLE if that's what the programmer(s) wanted
// in the first place, FYI.
if (lpwfxFormat->cbSize > 22) {
EmuWarning("WAVEFORMATEXTENSIBLE is detected!");
}
if (pDSBufferDesc->lpwfxFormat == nullptr) {
pDSBufferDesc->lpwfxFormat = (WAVEFORMATEX*)malloc(sizeof(WAVEFORMATEX) + lpwfxFormat->cbSize);
}
memcpy(pDSBufferDesc->lpwfxFormat, lpwfxFormat, sizeof(WAVEFORMATEX));
memcpy(pDSBufferDesc->lpwfxFormat, lpwfxFormat, sizeof(WAVEFORMATEX) + lpwfxFormat->cbSize);
dwEmuFlags = dwEmuFlags & ~DSB_FLAG_AUDIO_CODECS;
@ -225,7 +222,7 @@ inline void GeneratePCMFormat(
// TODO: A better response to this scenario if possible.
pDSBufferDesc->lpwfxFormat = (WAVEFORMATEX*)malloc(sizeof(WAVEFORMATEX));
pDSBufferDesc->lpwfxFormat = (WAVEFORMATEX*)malloc(sizeof(WAVEFORMATEXTENSIBLE));
//memset(pDSBufferDescSpecial->lpwfxFormat, 0, sizeof(WAVEFORMATEX));
//memset(pDSBufferDescSpecial, 0, sizeof(DSBUFFERDESC));
@ -236,6 +233,7 @@ inline void GeneratePCMFormat(
pDSBufferDesc->lpwfxFormat->nBlockAlign = 4;
pDSBufferDesc->lpwfxFormat->nAvgBytesPerSec = pDSBufferDesc->lpwfxFormat->nSamplesPerSec * pDSBufferDesc->lpwfxFormat->nBlockAlign;
pDSBufferDesc->lpwfxFormat->wBitsPerSample = 16;
pDSBufferDesc->lpwfxFormat->cbSize = sizeof(WAVEFORMATEX);
pDSBufferDesc->dwSize = sizeof(DSBUFFERDESC);
pDSBufferDesc->dwFlags = DSBCAPS_CTRLPAN | DSBCAPS_CTRLVOLUME | DSBCAPS_CTRLFREQUENCY;
@ -268,13 +266,18 @@ inline void GeneratePCMFormat(
}
}
//TODO: is this needed?
if (pDSBufferDesc->lpwfxFormat != nullptr) {
// we only support 2 channels right now
if (pDSBufferDesc->lpwfxFormat->nChannels > 2) {
pDSBufferDesc->lpwfxFormat->nChannels = 2;
pDSBufferDesc->lpwfxFormat->nBlockAlign = (2 * pDSBufferDesc->lpwfxFormat->wBitsPerSample) / 8;
pDSBufferDesc->lpwfxFormat->nAvgBytesPerSec = pDSBufferDesc->lpwfxFormat->nSamplesPerSec * pDSBufferDesc->lpwfxFormat->nBlockAlign;
// we NOW support 2+ channels, this conversion is necessary in order to support PC audio.
if (pDSBufferDesc->lpwfxFormat->nChannels > 2 && pDSBufferDesc->lpwfxFormat->wFormatTag != WAVE_FORMAT_EXTENSIBLE) {
PWAVEFORMATEXTENSIBLE lpwfxFormatExtensible = (PWAVEFORMATEXTENSIBLE)pDSBufferDesc->lpwfxFormat;
lpwfxFormatExtensible->Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE;
lpwfxFormatExtensible->Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX);
lpwfxFormatExtensible->Samples.wValidBitsPerSample = lpwfxFormatExtensible->Format.wBitsPerSample;
lpwfxFormatExtensible->Samples.wSamplesPerBlock = 0;
lpwfxFormatExtensible->Samples.wReserved = 0;
// TODO: dwChannelMask might need a real time conversion depending on channels given to xbox.
lpwfxFormatExtensible->dwChannelMask = SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_FRONT_CENTER | SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT | SPEAKER_LOW_FREQUENCY;
lpwfxFormatExtensible->SubFormat = KSDATAFORMAT_SUBTYPE_PCM;
}
}