Module: wine Branch: master Commit: c7d65913dac758ae15ea32c4dedc6dce7b46f61d URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7d65913dac758ae15ea32c4d...
Author: Zebediah Figura z.figura12@gmail.com Date: Sun Mar 7 14:49:07 2021 -0600
strmbase: Remove the unused "avg_render", "start", and "stop" fields from struct strmbase_renderer.
This corresponds to part of GStreamer commit dc0ed9a5ebadbc5b0e9baac215b6b1714cf23b22.
Signed-off-by: Zebediah Figura z.figura12@gmail.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/strmbase/renderer.c | 32 +------------------------------- include/wine/strmbase.h | 2 +- 2 files changed, 2 insertions(+), 32 deletions(-)
diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index ffe8d3cc957..ec915a95ef8 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -59,7 +59,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(strmbase);
static void QualityControlRender_Start(struct strmbase_qc *This, REFERENCE_TIME tStart) { - This->avg_render = This->last_in_time = This->last_left = This->avg_duration = This->avg_pt = -1; + This->last_in_time = This->last_left = This->avg_duration = This->avg_pt = -1; This->clockstart = tStart; This->avg_rate = -1.0; This->is_dropped = FALSE; @@ -217,8 +217,6 @@ static void QualityControlRender_DoQOS(struct strmbase_qc *priv)
static void QualityControlRender_BeginRender(struct strmbase_qc *This, REFERENCE_TIME start, REFERENCE_TIME stop) { - This->start = -1; - This->current_rstart = start; This->current_rstop = max(stop, start);
@@ -237,32 +235,6 @@ static void QualityControlRender_BeginRender(struct strmbase_qc *This, REFERENCE This->is_dropped = QualityControlRender_IsLate(This, This->current_jitter, start, stop); TRACE("dropped %d, start %s, stop %s, jitter %s.\n", This->is_dropped, debugstr_time(start), debugstr_time(stop), debugstr_time(This->current_jitter)); - - if (!This->pin->filter->clock) - return; - - IReferenceClock_GetTime(This->pin->filter->clock, &This->start); - - TRACE("Starting at %s.\n", debugstr_time(This->start)); -} - -static void QualityControlRender_EndRender(struct strmbase_qc *This) -{ - REFERENCE_TIME elapsed; - - TRACE("%p\n", This); - - if (!This->pin->filter->clock || This->start < 0 - || FAILED(IReferenceClock_GetTime(This->pin->filter->clock, &This->stop))) - return; - - elapsed = This->start - This->stop; - if (elapsed < 0) - return; - if (This->avg_render < 0) - This->avg_render = elapsed; - else - This->avg_render = UPDATE_RUNNING_AVG(This->avg_render, elapsed); }
static inline struct strmbase_renderer *impl_from_strmbase_filter(struct strmbase_filter *iface) @@ -447,7 +419,6 @@ static HRESULT WINAPI BaseRenderer_Receive(struct strmbase_sink *pin, IMediaSamp { QualityControlRender_BeginRender(&filter->qc, start, stop); hr = filter->pFuncsTable->pfnDoRenderSample(filter, sample); - QualityControlRender_EndRender(&filter->qc); }
if (need_wait) @@ -480,7 +451,6 @@ static HRESULT WINAPI BaseRenderer_Receive(struct strmbase_sink *pin, IMediaSamp { QualityControlRender_BeginRender(&filter->qc, start, stop); hr = filter->pFuncsTable->pfnDoRenderSample(filter, sample); - QualityControlRender_EndRender(&filter->qc); }
QualityControlRender_DoQOS(&filter->qc); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 3a5a0c0e25e..9df0437dd9a 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -279,7 +279,7 @@ struct strmbase_qc IQualityControl *tonotify;
/* Render stuff */ - REFERENCE_TIME last_in_time, last_left, avg_duration, avg_pt, avg_render, start, stop; + REFERENCE_TIME last_in_time, last_left, avg_duration, avg_pt; REFERENCE_TIME current_jitter, current_rstart, current_rstop, clockstart; double avg_rate; BOOL is_dropped;