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

winecoreaudio: Make supported format test more restrictive.

This commit is contained in:
Jörg Höhle 2009-09-11 07:43:45 +02:00 committed by Alexandre Julliard
parent 8870fe38b5
commit 89fe38ca9e
1 changed files with 18 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
dlls/winecoreaudio.drv/audio.c
View File

@ -431,6 +431,22 @@ static DWORD bytes_to_mmtime(LPMMTIME lpTime, DWORD position,
return MMSYSERR_NOERROR; return MMSYSERR_NOERROR;
} }
static BOOL supportedFormat(LPWAVEFORMATEX wf)
{
if (wf->nSamplesPerSec == 0)
return FALSE;
if (wf->wFormatTag == WAVE_FORMAT_PCM) {
if (wf->nChannels >= 1 && wf->nChannels <= 2) {
if (wf->wBitsPerSample==8||wf->wBitsPerSample==16)
return TRUE;
}
} else
WARN("only WAVE_FORMAT_PCM supported\n");
return FALSE;
}
/************************************************************************** /**************************************************************************
* CoreAudio_GetDevCaps [internal] * CoreAudio_GetDevCaps [internal]
*/ */
@ -793,10 +809,7 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags)
lpDesc->lpFormat->wFormatTag, lpDesc->lpFormat->nChannels, lpDesc->lpFormat->wFormatTag, lpDesc->lpFormat->nChannels,
lpDesc->lpFormat->nSamplesPerSec, lpDesc->lpFormat->wBitsPerSample); lpDesc->lpFormat->nSamplesPerSec, lpDesc->lpFormat->wBitsPerSample);
if (lpDesc->lpFormat->wFormatTag != WAVE_FORMAT_PCM || if (!supportedFormat(lpDesc->lpFormat))
lpDesc->lpFormat->nChannels == 0 ||
lpDesc->lpFormat->nSamplesPerSec == 0
)
{ {
WARN("Bad format: tag=%04X nChannels=%d nSamplesPerSec=%d wBitsPerSample=%d !\n", WARN("Bad format: tag=%04X nChannels=%d nSamplesPerSec=%d wBitsPerSample=%d !\n",
lpDesc->lpFormat->wFormatTag, lpDesc->lpFormat->nChannels, lpDesc->lpFormat->wFormatTag, lpDesc->lpFormat->nChannels,
@ -893,14 +906,6 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags)
wwo->waveDesc = *lpDesc; wwo->waveDesc = *lpDesc;
memcpy(&wwo->format, lpDesc->lpFormat, sizeof(PCMWAVEFORMAT)); memcpy(&wwo->format, lpDesc->lpFormat, sizeof(PCMWAVEFORMAT));
if (wwo->format.wBitsPerSample == 0) {
WARN("Resetting zeroed wBitsPerSample\n");
wwo->format.wBitsPerSample = 8 *
(wwo->format.wf.nAvgBytesPerSec /
wwo->format.wf.nSamplesPerSec) /
wwo->format.wf.nChannels;
}
wwo->dwPlayedTotal = 0; wwo->dwPlayedTotal = 0;
wwo->dwWrittenTotal = 0; wwo->dwWrittenTotal = 0;
@ -1884,9 +1889,7 @@ static DWORD widOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags)
lpDesc->lpFormat->wFormatTag, lpDesc->lpFormat->nChannels, lpDesc->lpFormat->wFormatTag, lpDesc->lpFormat->nChannels,
lpDesc->lpFormat->nSamplesPerSec, lpDesc->lpFormat->wBitsPerSample); lpDesc->lpFormat->nSamplesPerSec, lpDesc->lpFormat->wBitsPerSample);
if (lpDesc->lpFormat->wFormatTag != WAVE_FORMAT_PCM || if (!supportedFormat(lpDesc->lpFormat) ||
lpDesc->lpFormat->nChannels == 0 ||
lpDesc->lpFormat->nSamplesPerSec == 0 ||
lpDesc->lpFormat->nSamplesPerSec != AudioUnit_GetInputDeviceSampleRate() lpDesc->lpFormat->nSamplesPerSec != AudioUnit_GetInputDeviceSampleRate()
) )
{ {
@ -1920,15 +1923,6 @@ static DWORD widOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags)
wwi->waveDesc = *lpDesc; wwi->waveDesc = *lpDesc;
memcpy(&wwi->format, lpDesc->lpFormat, sizeof(PCMWAVEFORMAT)); memcpy(&wwi->format, lpDesc->lpFormat, sizeof(PCMWAVEFORMAT));
if (wwi->format.wBitsPerSample == 0)
{
WARN("Resetting zeroed wBitsPerSample\n");
wwi->format.wBitsPerSample = 8 *
(wwi->format.wf.nAvgBytesPerSec /
wwi->format.wf.nSamplesPerSec) /
wwi->format.wf.nChannels;
}
wwi->dwTotalRecorded = 0; wwi->dwTotalRecorded = 0;
wwi->trace_on = TRACE_ON(wave); wwi->trace_on = TRACE_ON(wave);