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

quartz: Improve the directsound renderer a bit.

Browse Source
This commit is contained in:
Maarten Lankhorst 2008-06-10 17:00:40 +02:00 committed by Alexandre Julliard
parent c1add0ff51
commit 40c0566879
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dlls/quartz/dsoundrender.c
View File

@ -62,7 +62,7 @@ typedef struct DSoundRenderImpl
InputPin * pInputPin; InputPin * pInputPin;
LPDIRECTSOUND dsound; IDirectSound8 *dsound;
LPDIRECTSOUNDBUFFER dsbuffer; LPDIRECTSOUNDBUFFER dsbuffer;
DWORD buf_size; DWORD buf_size;
DWORD write_pos; DWORD write_pos;
@ -294,7 +294,13 @@ static HRESULT DSoundRender_Sample(LPVOID iface, IMediaSample * pSample)
static HRESULT DSoundRender_QueryAccept(LPVOID iface, const AM_MEDIA_TYPE * pmt) static HRESULT DSoundRender_QueryAccept(LPVOID iface, const AM_MEDIA_TYPE * pmt)
{ {
WAVEFORMATEX* format = (WAVEFORMATEX*)pmt->pbFormat; WAVEFORMATEX* format;
if (!IsEqualIID(&pmt->majortype, &MEDIATYPE_Audio))
return S_FALSE;
format = (WAVEFORMATEX*)pmt->pbFormat;
TRACE("Format = %p\n", format);
TRACE("wFormatTag = %x %x\n", format->wFormatTag, WAVE_FORMAT_PCM); TRACE("wFormatTag = %x %x\n", format->wFormatTag, WAVE_FORMAT_PCM);
TRACE("nChannels = %d\n", format->nChannels); TRACE("nChannels = %d\n", format->nChannels);
TRACE("nSamplesPerSec = %d\n", format->nAvgBytesPerSec); TRACE("nSamplesPerSec = %d\n", format->nAvgBytesPerSec);
@ -302,9 +308,10 @@ static HRESULT DSoundRender_QueryAccept(LPVOID iface, const AM_MEDIA_TYPE * pmt)
TRACE("nBlockAlign = %d\n", format->nBlockAlign); TRACE("nBlockAlign = %d\n", format->nBlockAlign);
TRACE("wBitsPerSample = %d\n", format->wBitsPerSample); TRACE("wBitsPerSample = %d\n", format->wBitsPerSample);
if (IsEqualIID(&pmt->majortype, &MEDIATYPE_Audio) && IsEqualIID(&pmt->subtype, &MEDIASUBTYPE_PCM)) if (!IsEqualIID(&pmt->subtype, &MEDIASUBTYPE_PCM))
return S_OK; return S_FALSE;
return S_FALSE;
return S_OK;
} }
HRESULT DSoundRender_create(IUnknown * pUnkOuter, LPVOID * ppv) HRESULT DSoundRender_create(IUnknown * pUnkOuter, LPVOID * ppv)
@ -341,9 +348,11 @@ HRESULT DSoundRender_create(IUnknown * pUnkOuter, LPVOID * ppv)
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
{ {
hr = DirectSoundCreate(NULL, &pDSoundRender->dsound, NULL); hr = DirectSoundCreate8(NULL, &pDSoundRender->dsound, NULL);
if (FAILED(hr)) if (FAILED(hr))
ERR("Cannot create Direct Sound object (%x)\n", hr); ERR("Cannot create Direct Sound object (%x)\n", hr);
else
IDirectSound_SetCooperativeLevel(pDSoundRender->dsound, GetDesktopWindow(), DSSCL_PRIORITY);
} }
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))