Commit cdf9c4f2 authored by Aric Stewart's avatar Aric Stewart Committed by Alexandre Julliard

strmbase: Rename MediaSeekingPassThru to RendererPosPassThru to match standard strmbase naming.

parent 026037ab
...@@ -386,7 +386,7 @@ static HRESULT WINAPI DSoundRender_Receive(BaseInputPin *pin, IMediaSample * pSa ...@@ -386,7 +386,7 @@ static HRESULT WINAPI DSoundRender_Receive(BaseInputPin *pin, IMediaSample * pSa
} }
if (IMediaSample_GetMediaTime(pSample, &tStart, &tStop) == S_OK) if (IMediaSample_GetMediaTime(pSample, &tStart, &tStop) == S_OK)
MediaSeekingPassThru_RegisterMediaTime(This->seekthru_unk, tStart); RendererPosPassThru_RegisterMediaTime(This->seekthru_unk, tStart);
hr = IMediaSample_GetTime(pSample, &tStart, &tStop); hr = IMediaSample_GetTime(pSample, &tStart, &tStop);
if (FAILED(hr)) { if (FAILED(hr)) {
ERR("Cannot get sample time (%x)\n", hr); ERR("Cannot get sample time (%x)\n", hr);
...@@ -670,7 +670,7 @@ static HRESULT WINAPI DSoundRender_Stop(IBaseFilter * iface) ...@@ -670,7 +670,7 @@ static HRESULT WINAPI DSoundRender_Stop(IBaseFilter * iface)
This->writepos = This->buf_size; This->writepos = This->buf_size;
SetEvent(This->state_change); SetEvent(This->state_change);
SetEvent(This->blocked); SetEvent(This->blocked);
MediaSeekingPassThru_ResetMediaTime(This->seekthru_unk); RendererPosPassThru_ResetMediaTime(This->seekthru_unk);
} }
LeaveCriticalSection(&This->filter.csFilter); LeaveCriticalSection(&This->filter.csFilter);
...@@ -922,7 +922,7 @@ static HRESULT WINAPI DSoundRender_InputPin_EndOfStream(IPin * iface) ...@@ -922,7 +922,7 @@ static HRESULT WINAPI DSoundRender_InputPin_EndOfStream(IPin * iface)
} }
hr = DSoundRender_HandleEndOfStream(me); hr = DSoundRender_HandleEndOfStream(me);
MediaSeekingPassThru_EOS(me->seekthru_unk); RendererPosPassThru_EOS(me->seekthru_unk);
SetEvent(me->state_change); SetEvent(me->state_change);
LeaveCriticalSection(This->pin.pCritSec); LeaveCriticalSection(This->pin.pCritSec);
...@@ -977,7 +977,7 @@ static HRESULT WINAPI DSoundRender_InputPin_EndFlush(IPin * iface) ...@@ -977,7 +977,7 @@ static HRESULT WINAPI DSoundRender_InputPin_EndFlush(IPin * iface)
QualityControlRender_Start(&pFilter->qcimpl, pFilter->filter.rtStreamStart); 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); RendererPosPassThru_ResetMediaTime(pFilter->seekthru_unk);
return hr; return hr;
} }
......
...@@ -71,7 +71,7 @@ static HRESULT WINAPI NullRenderer_Receive(BaseInputPin *pin, IMediaSample * pSa ...@@ -71,7 +71,7 @@ static HRESULT WINAPI NullRenderer_Receive(BaseInputPin *pin, IMediaSample * pSa
TRACE("%p %p\n", pin, pSample); TRACE("%p %p\n", pin, pSample);
if (SUCCEEDED(IMediaSample_GetMediaTime(pSample, &start, &stop))) if (SUCCEEDED(IMediaSample_GetMediaTime(pSample, &start, &stop)))
MediaSeekingPassThru_RegisterMediaTime(This->seekthru_unk, start); RendererPosPassThru_RegisterMediaTime(This->seekthru_unk, start);
EnterCriticalSection(&This->filter.csFilter); EnterCriticalSection(&This->filter.csFilter);
if (This->pInputPin->flushing || This->pInputPin->end_of_stream) if (This->pInputPin->flushing || This->pInputPin->end_of_stream)
hr = S_FALSE; hr = S_FALSE;
...@@ -308,7 +308,7 @@ static HRESULT WINAPI NullRenderer_Stop(IBaseFilter * iface) ...@@ -308,7 +308,7 @@ static HRESULT WINAPI NullRenderer_Stop(IBaseFilter * iface)
EnterCriticalSection(&This->filter.csFilter); EnterCriticalSection(&This->filter.csFilter);
{ {
This->filter.state = State_Stopped; This->filter.state = State_Stopped;
MediaSeekingPassThru_ResetMediaTime(This->seekthru_unk); RendererPosPassThru_ResetMediaTime(This->seekthru_unk);
} }
LeaveCriticalSection(&This->filter.csFilter); LeaveCriticalSection(&This->filter.csFilter);
...@@ -428,7 +428,7 @@ static HRESULT WINAPI NullRenderer_InputPin_EndOfStream(IPin * iface) ...@@ -428,7 +428,7 @@ static HRESULT WINAPI NullRenderer_InputPin_EndOfStream(IPin * iface)
IMediaEventSink_Release(pEventSink); IMediaEventSink_Release(pEventSink);
} }
} }
MediaSeekingPassThru_EOS(pNull->seekthru_unk); RendererPosPassThru_EOS(pNull->seekthru_unk);
return hr; return hr;
} }
...@@ -443,7 +443,7 @@ static HRESULT WINAPI NullRenderer_InputPin_EndFlush(IPin * iface) ...@@ -443,7 +443,7 @@ static HRESULT WINAPI NullRenderer_InputPin_EndFlush(IPin * iface)
hr = BaseInputPinImpl_EndOfStream(iface); hr = BaseInputPinImpl_EndOfStream(iface);
pNull = (NullRendererImpl*)This->pin.pinInfo.pFilter; pNull = (NullRendererImpl*)This->pin.pinInfo.pFilter;
MediaSeekingPassThru_ResetMediaTime(pNull->seekthru_unk); RendererPosPassThru_ResetMediaTime(pNull->seekthru_unk);
return hr; return hr;
} }
......
...@@ -390,7 +390,7 @@ static HRESULT WINAPI VideoRenderer_Receive(BaseInputPin* pin, IMediaSample * pS ...@@ -390,7 +390,7 @@ static HRESULT WINAPI VideoRenderer_Receive(BaseInputPin* pin, IMediaSample * pS
} }
if (IMediaSample_GetMediaTime(pSample, &tStart, &tStop) == S_OK) if (IMediaSample_GetMediaTime(pSample, &tStart, &tStop) == S_OK)
MediaSeekingPassThru_RegisterMediaTime(This->seekthru_unk, tStart); RendererPosPassThru_RegisterMediaTime(This->seekthru_unk, tStart);
/* Preroll means the sample isn't shown, this is used for key frames and things like that */ /* Preroll means the sample isn't shown, this is used for key frames and things like that */
if (IMediaSample_IsPreroll(pSample) == S_OK) { if (IMediaSample_IsPreroll(pSample) == S_OK) {
...@@ -776,7 +776,7 @@ static HRESULT WINAPI VideoRenderer_Stop(IBaseFilter * iface) ...@@ -776,7 +776,7 @@ static HRESULT WINAPI VideoRenderer_Stop(IBaseFilter * iface)
This->filter.state = State_Stopped; This->filter.state = State_Stopped;
SetEvent(This->hEvent); SetEvent(This->hEvent);
SetEvent(This->blocked); SetEvent(This->blocked);
MediaSeekingPassThru_ResetMediaTime(This->seekthru_unk); RendererPosPassThru_ResetMediaTime(This->seekthru_unk);
if (This->AutoShow) if (This->AutoShow)
/* Black it out */ /* Black it out */
RedrawWindow(This->hWnd, NULL, NULL, RDW_INVALIDATE|RDW_ERASE); RedrawWindow(This->hWnd, NULL, NULL, RDW_INVALIDATE|RDW_ERASE);
...@@ -928,7 +928,7 @@ static HRESULT WINAPI VideoRenderer_InputPin_EndOfStream(IPin * iface) ...@@ -928,7 +928,7 @@ static HRESULT WINAPI VideoRenderer_InputPin_EndOfStream(IPin * iface)
hr = IMediaEventSink_Notify(pEventSink, EC_COMPLETE, S_OK, (LONG_PTR)pFilter); hr = IMediaEventSink_Notify(pEventSink, EC_COMPLETE, S_OK, (LONG_PTR)pFilter);
IMediaEventSink_Release(pEventSink); IMediaEventSink_Release(pEventSink);
} }
MediaSeekingPassThru_EOS(pFilter->seekthru_unk); RendererPosPassThru_EOS(pFilter->seekthru_unk);
This->end_of_stream = 1; This->end_of_stream = 1;
out: out:
LeaveCriticalSection(This->pin.pCritSec); LeaveCriticalSection(This->pin.pCritSec);
...@@ -973,7 +973,7 @@ static HRESULT WINAPI VideoRenderer_InputPin_EndFlush(IPin * iface) ...@@ -973,7 +973,7 @@ static HRESULT WINAPI VideoRenderer_InputPin_EndFlush(IPin * iface)
QualityControlRender_Start(&pVideoRenderer->qcimpl, pVideoRenderer->filter.rtStreamStart); QualityControlRender_Start(&pVideoRenderer->qcimpl, pVideoRenderer->filter.rtStreamStart);
hr = BaseInputPinImpl_EndFlush(iface); hr = BaseInputPinImpl_EndFlush(iface);
LeaveCriticalSection(This->pin.pCritSec); LeaveCriticalSection(This->pin.pCritSec);
MediaSeekingPassThru_ResetMediaTime(pVideoRenderer->seekthru_unk); RendererPosPassThru_ResetMediaTime(pVideoRenderer->seekthru_unk);
return hr; return hr;
} }
......
...@@ -567,7 +567,7 @@ static HRESULT WINAPI MediaSeekingPassThru_GetPreroll(IMediaSeeking * iface, LON ...@@ -567,7 +567,7 @@ static HRESULT WINAPI MediaSeekingPassThru_GetPreroll(IMediaSeeking * iface, LON
return hr; return hr;
} }
HRESULT WINAPI MediaSeekingPassThru_RegisterMediaTime(IUnknown *iface, REFERENCE_TIME start) HRESULT WINAPI RendererPosPassThru_RegisterMediaTime(IUnknown *iface, REFERENCE_TIME start)
{ {
ICOM_THIS_MULTI(PassThruImpl, IInner_vtbl, iface); ICOM_THIS_MULTI(PassThruImpl, IInner_vtbl, iface);
EnterCriticalSection(&This->time_cs); EnterCriticalSection(&This->time_cs);
...@@ -577,7 +577,7 @@ HRESULT WINAPI MediaSeekingPassThru_RegisterMediaTime(IUnknown *iface, REFERENCE ...@@ -577,7 +577,7 @@ HRESULT WINAPI MediaSeekingPassThru_RegisterMediaTime(IUnknown *iface, REFERENCE
return S_OK; return S_OK;
} }
HRESULT WINAPI MediaSeekingPassThru_ResetMediaTime(IUnknown *iface) HRESULT WINAPI RendererPosPassThru_ResetMediaTime(IUnknown *iface)
{ {
ICOM_THIS_MULTI(PassThruImpl, IInner_vtbl, iface); ICOM_THIS_MULTI(PassThruImpl, IInner_vtbl, iface);
EnterCriticalSection(&This->time_cs); EnterCriticalSection(&This->time_cs);
...@@ -586,7 +586,7 @@ HRESULT WINAPI MediaSeekingPassThru_ResetMediaTime(IUnknown *iface) ...@@ -586,7 +586,7 @@ HRESULT WINAPI MediaSeekingPassThru_ResetMediaTime(IUnknown *iface)
return S_OK; return S_OK;
} }
HRESULT WINAPI MediaSeekingPassThru_EOS(IUnknown *iface) HRESULT WINAPI RendererPosPassThru_EOS(IUnknown *iface)
{ {
ICOM_THIS_MULTI(PassThruImpl, IInner_vtbl, iface); ICOM_THIS_MULTI(PassThruImpl, IInner_vtbl, iface);
REFERENCE_TIME time; REFERENCE_TIME time;
......
...@@ -321,9 +321,9 @@ HRESULT WINAPI SourceSeekingImpl_GetRate(IMediaSeeking * iface, double * dRate); ...@@ -321,9 +321,9 @@ HRESULT WINAPI SourceSeekingImpl_GetRate(IMediaSeeking * iface, double * dRate);
HRESULT WINAPI SourceSeekingImpl_GetPreroll(IMediaSeeking * iface, LONGLONG * pPreroll); HRESULT WINAPI SourceSeekingImpl_GetPreroll(IMediaSeeking * iface, LONGLONG * pPreroll);
/* PosPassThru */ /* PosPassThru */
HRESULT WINAPI MediaSeekingPassThru_RegisterMediaTime(IUnknown *iface, REFERENCE_TIME start); HRESULT WINAPI RendererPosPassThru_RegisterMediaTime(IUnknown *iface, REFERENCE_TIME start);
HRESULT WINAPI MediaSeekingPassThru_ResetMediaTime(IUnknown *iface); HRESULT WINAPI RendererPosPassThru_ResetMediaTime(IUnknown *iface);
HRESULT WINAPI MediaSeekingPassThru_EOS(IUnknown *iface); HRESULT WINAPI RendererPosPassThru_EOS(IUnknown *iface);
HRESULT WINAPI CreatePosPassThru(IUnknown* pUnkOuter, BOOL bRenderer, IPin *pPin, IUnknown **ppPassThru); HRESULT WINAPI CreatePosPassThru(IUnknown* pUnkOuter, BOOL bRenderer, IPin *pPin, IUnknown **ppPassThru);
HRESULT WINAPI PosPassThru_Construct(IUnknown* pUnkOuter, LPVOID *ppPassThru); HRESULT WINAPI PosPassThru_Construct(IUnknown* pUnkOuter, LPVOID *ppPassThru);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment