mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-06 04:51:11 +00:00
strmbase: Retrieve the filter clock from the pin pointer.
Signed-off-by: Zebediah Figura <z.figura12@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
db7eb33275
commit
9a760f9479
|
@ -36,7 +36,6 @@ HRESULT QualityControlImpl_Create(struct strmbase_pin *pin, QualityControlImpl *
|
|||
This = *ppv;
|
||||
This->pin = pin;
|
||||
This->tonotify = NULL;
|
||||
This->clock = NULL;
|
||||
This->current_rstart = This->current_rstop = -1;
|
||||
TRACE("-> %p\n", This);
|
||||
return S_OK;
|
||||
|
@ -125,13 +124,6 @@ void QualityControlRender_Start(QualityControlImpl *This, REFERENCE_TIME tStart)
|
|||
This->qos_handled = TRUE; /* Lie that will be corrected on first adjustment */
|
||||
}
|
||||
|
||||
|
||||
void QualityControlRender_SetClock(QualityControlImpl *This, IReferenceClock *clock)
|
||||
{
|
||||
TRACE("%p %p\n", This, clock);
|
||||
This->clock = clock;
|
||||
}
|
||||
|
||||
static BOOL QualityControlRender_IsLate(QualityControlImpl *This, REFERENCE_TIME jitter,
|
||||
REFERENCE_TIME start, REFERENCE_TIME stop)
|
||||
{
|
||||
|
@ -168,7 +160,7 @@ void QualityControlRender_DoQOS(QualityControlImpl *priv)
|
|||
|
||||
TRACE("%p\n", priv);
|
||||
|
||||
if (!priv->clock || priv->current_rstart < 0)
|
||||
if (!priv->pin->filter->pClock || priv->current_rstart < 0)
|
||||
return;
|
||||
|
||||
start = priv->current_rstart;
|
||||
|
@ -284,7 +276,7 @@ void QualityControlRender_BeginRender(QualityControlImpl *This, REFERENCE_TIME s
|
|||
if (start >= 0)
|
||||
{
|
||||
REFERENCE_TIME now;
|
||||
IReferenceClock_GetTime(This->clock, &now);
|
||||
IReferenceClock_GetTime(This->pin->filter->pClock, &now);
|
||||
This->current_jitter = (now - This->clockstart) - start;
|
||||
}
|
||||
else
|
||||
|
@ -299,10 +291,10 @@ void QualityControlRender_BeginRender(QualityControlImpl *This, REFERENCE_TIME s
|
|||
else
|
||||
This->rendered++;
|
||||
|
||||
if (!This->clock)
|
||||
if (!This->pin->filter->pClock)
|
||||
return;
|
||||
|
||||
IReferenceClock_GetTime(This->clock, &This->start);
|
||||
IReferenceClock_GetTime(This->pin->filter->pClock, &This->start);
|
||||
|
||||
TRACE("Starting at %s.\n", debugstr_time(This->start));
|
||||
}
|
||||
|
@ -313,7 +305,8 @@ void QualityControlRender_EndRender(QualityControlImpl *This)
|
|||
|
||||
TRACE("%p\n", This);
|
||||
|
||||
if (!This->clock || This->start < 0 || FAILED(IReferenceClock_GetTime(This->clock, &This->stop)))
|
||||
if (!This->pin->filter->pClock || This->start < 0
|
||||
|| FAILED(IReferenceClock_GetTime(This->pin->filter->pClock, &This->stop)))
|
||||
return;
|
||||
|
||||
elapsed = This->start - This->stop;
|
||||
|
|
|
@ -22,11 +22,6 @@
|
|||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(strmbase);
|
||||
|
||||
static inline struct strmbase_renderer *impl_from_IBaseFilter(IBaseFilter *iface)
|
||||
{
|
||||
return CONTAINING_RECORD(iface, struct strmbase_renderer, filter.IBaseFilter_iface);
|
||||
}
|
||||
|
||||
static inline struct strmbase_renderer *impl_from_strmbase_filter(struct strmbase_filter *iface)
|
||||
{
|
||||
return CONTAINING_RECORD(iface, struct strmbase_renderer, filter);
|
||||
|
@ -436,18 +431,6 @@ HRESULT WINAPI BaseRendererImpl_Receive(struct strmbase_renderer *This, IMediaSa
|
|||
return hr;
|
||||
}
|
||||
|
||||
static HRESULT WINAPI BaseRendererImpl_SetSyncSource(IBaseFilter *iface, IReferenceClock *clock)
|
||||
{
|
||||
struct strmbase_renderer *This = impl_from_IBaseFilter(iface);
|
||||
HRESULT hr;
|
||||
|
||||
EnterCriticalSection(&This->filter.csFilter);
|
||||
QualityControlRender_SetClock(This->qcimpl, clock);
|
||||
hr = BaseFilterImpl_SetSyncSource(iface, clock);
|
||||
LeaveCriticalSection(&This->filter.csFilter);
|
||||
return hr;
|
||||
}
|
||||
|
||||
static const IBaseFilterVtbl strmbase_renderer_vtbl =
|
||||
{
|
||||
BaseFilterImpl_QueryInterface,
|
||||
|
@ -458,7 +441,7 @@ static const IBaseFilterVtbl strmbase_renderer_vtbl =
|
|||
BaseFilterImpl_Pause,
|
||||
BaseFilterImpl_Run,
|
||||
BaseFilterImpl_GetState,
|
||||
BaseRendererImpl_SetSyncSource,
|
||||
BaseFilterImpl_SetSyncSource,
|
||||
BaseFilterImpl_GetSyncSource,
|
||||
BaseFilterImpl_EnumPins,
|
||||
BaseFilterImpl_FindPin,
|
||||
|
|
|
@ -57,7 +57,6 @@ typedef struct QualityControlImpl {
|
|||
IQualityControl *tonotify;
|
||||
|
||||
/* Render stuff */
|
||||
IReferenceClock *clock;
|
||||
REFERENCE_TIME last_in_time, last_left, avg_duration, avg_pt, avg_render, start, stop;
|
||||
REFERENCE_TIME current_jitter, current_rstart, current_rstop, clockstart;
|
||||
double avg_rate;
|
||||
|
@ -74,7 +73,6 @@ HRESULT WINAPI QualityControlImpl_Notify(IQualityControl *iface, IBaseFilter *se
|
|||
HRESULT WINAPI QualityControlImpl_SetSink(IQualityControl *iface, IQualityControl *tonotify);
|
||||
|
||||
void QualityControlRender_Start(QualityControlImpl *This, REFERENCE_TIME tStart);
|
||||
void QualityControlRender_SetClock(QualityControlImpl *This, IReferenceClock *clock);
|
||||
void QualityControlRender_DoQOS(QualityControlImpl *priv);
|
||||
void QualityControlRender_BeginRender(QualityControlImpl *This, REFERENCE_TIME start, REFERENCE_TIME stop);
|
||||
void QualityControlRender_EndRender(QualityControlImpl *This);
|
||||
|
|
Loading…
Reference in a new issue