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

quartz: Add quality control to sound renderer.

This commit is contained in:
Maarten Lankhorst 2010-12-01 23:17:30 +01:00 committed by Alexandre Julliard
parent 072714f910
commit cfd4ed9018
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
dlls/quartz/dsoundrender.c
View File

@ -53,6 +53,13 @@ static const IReferenceClockVtbl IReferenceClock_Vtbl;
static const IMediaSeekingVtbl IMediaSeeking_Vtbl; static const IMediaSeekingVtbl IMediaSeeking_Vtbl;
static const IAMDirectSoundVtbl IAMDirectSound_Vtbl; static const IAMDirectSoundVtbl IAMDirectSound_Vtbl;
static const IAMFilterMiscFlagsVtbl IAMFilterMiscFlags_Vtbl; static const IAMFilterMiscFlagsVtbl IAMFilterMiscFlags_Vtbl;
static const IQualityControlVtbl DSoundRender_QualityControl_Vtbl = {
QualityControlImpl_QueryInterface,
QualityControlImpl_AddRef,
QualityControlImpl_Release,
QualityControlImpl_Notify,
QualityControlImpl_SetSink
};
typedef struct DSoundRenderImpl typedef struct DSoundRenderImpl
{ {
@ -65,6 +72,7 @@ typedef struct DSoundRenderImpl
IUnknown *seekthru_unk; IUnknown *seekthru_unk;
BaseInputPin * pInputPin; BaseInputPin * pInputPin;
QualityControlImpl qcimpl;
IDirectSound8 *dsound; IDirectSound8 *dsound;
LPDIRECTSOUNDBUFFER dsbuffer; LPDIRECTSOUNDBUFFER dsbuffer;
@ -364,6 +372,21 @@ static HRESULT WINAPI DSoundRender_Receive(BaseInputPin *pin, IMediaSample * pSa
SetEvent(This->state_change); SetEvent(This->state_change);
hr = DSoundRender_SendSampleData(This, tStart, tStop, pbSrcStream, cbSrcStream); hr = DSoundRender_SendSampleData(This, tStart, tStop, pbSrcStream, cbSrcStream);
if (This->filter.state == State_Running && This->filter.pClock && tStart >= 0) {
REFERENCE_TIME jitter, now = 0;
Quality q;
IReferenceClock_GetTime(This->filter.pClock, &now);
jitter = now - This->filter.rtStreamStart - tStart;
if (jitter <= -DSoundRenderer_Max_Fill)
jitter += DSoundRenderer_Max_Fill;
else if (jitter < 0)
jitter = 0;
q.Type = (jitter > 0 ? Famine : Flood);
q.Proportion = 1.;
q.Late = jitter;
q.TimeStamp = tStart;
IQualityControl_Notify((IQualityControl *)&This->qcimpl, (IBaseFilter*)This, q);
}
LeaveCriticalSection(&This->filter.csFilter); LeaveCriticalSection(&This->filter.csFilter);
return hr; return hr;
} }
@ -492,6 +515,8 @@ HRESULT DSoundRender_create(IUnknown * pUnkOuter, LPVOID * ppv)
IUnknown_QueryInterface(pDSoundRender->seekthru_unk, &IID_ISeekingPassThru, (void**)&passthru); IUnknown_QueryInterface(pDSoundRender->seekthru_unk, &IID_ISeekingPassThru, (void**)&passthru);
ISeekingPassThru_Init(passthru, TRUE, (IPin*)pDSoundRender->pInputPin); ISeekingPassThru_Init(passthru, TRUE, (IPin*)pDSoundRender->pInputPin);
ISeekingPassThru_Release(passthru); ISeekingPassThru_Release(passthru);
QualityControlImpl_init(&pDSoundRender->qcimpl, (IPin*)pDSoundRender->pInputPin, (IBaseFilter*)pDSoundRender);
pDSoundRender->qcimpl.lpVtbl = &DSoundRender_QualityControl_Vtbl;
*ppv = pDSoundRender; *ppv = pDSoundRender;
} }
else else
@ -530,6 +555,8 @@ static HRESULT WINAPI DSoundRender_QueryInterface(IBaseFilter * iface, REFIID ri
*ppv = &This->IAMDirectSound_vtbl; *ppv = &This->IAMDirectSound_vtbl;
else if (IsEqualIID(riid, &IID_IAMFilterMiscFlags)) else if (IsEqualIID(riid, &IID_IAMFilterMiscFlags))
*ppv = &This->IAMFilterMiscFlags_vtbl; *ppv = &This->IAMFilterMiscFlags_vtbl;
else if (IsEqualIID(riid, &IID_IQualityControl))
*ppv = &This->qcimpl;
if (*ppv) if (*ppv)
{ {
@ -655,6 +682,7 @@ static HRESULT WINAPI DSoundRender_Run(IBaseFilter * iface, REFERENCE_TIME tStar
if (This->pInputPin->pin.pConnectedTo) if (This->pInputPin->pin.pConnectedTo)
{ {
This->filter.rtStreamStart = tStart; This->filter.rtStreamStart = tStart;
QualityControlRender_Start(&This->qcimpl, tStart);
if (This->filter.state == State_Paused) if (This->filter.state == State_Paused)
{ {
/* Unblock our thread, state changing from paused to running doesn't need a reset for state change */ /* Unblock our thread, state changing from paused to running doesn't need a reset for state change */
@ -922,6 +950,7 @@ static HRESULT WINAPI DSoundRender_InputPin_EndFlush(IPin * iface)
IDirectSoundBuffer_Unlock(pFilter->dsbuffer, buffer, size, NULL, 0); IDirectSoundBuffer_Unlock(pFilter->dsbuffer, buffer, size, NULL, 0);
pFilter->writepos = pFilter->buf_size; pFilter->writepos = pFilter->buf_size;
} }
QualityControlRender_Start(&pFilter->qcimpl, pFilter->filter.rtStreamStart);
hr = BaseInputPinImpl_EndFlush(iface); hr = BaseInputPinImpl_EndFlush(iface);
LeaveCriticalSection(This->pin.pCritSec); LeaveCriticalSection(This->pin.pCritSec);
MediaSeekingPassThru_ResetMediaTime(pFilter->seekthru_unk); MediaSeekingPassThru_ResetMediaTime(pFilter->seekthru_unk);

2
dlls/quartz/tests/dsoundrender.c
View File

@ -150,9 +150,9 @@ static void test_query_interface(void)
RELEASE_EXPECT(ppb, 1); RELEASE_EXPECT(ppb, 1);
QI_SUCCEED(pDSRender, IID_IMediaPosition, pMediaPosition); QI_SUCCEED(pDSRender, IID_IMediaPosition, pMediaPosition);
RELEASE_EXPECT(pMediaPosition, 1); RELEASE_EXPECT(pMediaPosition, 1);
}
QI_SUCCEED(pDSRender, IID_IQualityControl, pQualityControl); QI_SUCCEED(pDSRender, IID_IQualityControl, pQualityControl);
RELEASE_EXPECT(pQualityControl, 1); RELEASE_EXPECT(pQualityControl, 1);
}
} }
static void test_pin(IPin *pin) static void test_pin(IPin *pin)