[PATCH 5/5] strmbase: Get rid of current sample tracking.
Zebediah Figura
z.figura12 at gmail.com
Mon Feb 10 19:22:20 CST 2020
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
dlls/strmbase/renderer.c | 17 -----------------
include/wine/strmbase.h | 2 --
2 files changed, 19 deletions(-)
diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c
index 8470da40f0..1f2154393d 100644
--- a/dlls/strmbase/renderer.c
+++ b/dlls/strmbase/renderer.c
@@ -84,7 +84,6 @@ static HRESULT renderer_init_stream(struct strmbase_filter *iface)
if (filter->sink.pin.peer)
ResetEvent(filter->state_event);
filter->eos = FALSE;
- BaseRendererImpl_ClearPendingSample(filter);
ResetEvent(filter->flush_event);
if (filter->pFuncsTable->renderer_init_stream)
filter->pFuncsTable->renderer_init_stream(filter);
@@ -228,7 +227,6 @@ static HRESULT sink_begin_flush(struct strmbase_sink *iface)
{
struct strmbase_renderer *filter = impl_from_IPin(&iface->pin.IPin_iface);
- BaseRendererImpl_ClearPendingSample(filter);
SetEvent(filter->flush_event);
return S_OK;
@@ -279,7 +277,6 @@ void strmbase_renderer_cleanup(struct strmbase_renderer *filter)
filter->csRenderLock.DebugInfo->Spare[0] = 0;
DeleteCriticalSection(&filter->csRenderLock);
- BaseRendererImpl_ClearPendingSample(filter);
CloseHandle(filter->state_event);
CloseHandle(filter->advise_event);
CloseHandle(filter->flush_event);
@@ -313,9 +310,6 @@ HRESULT WINAPI BaseRendererImpl_Receive(struct strmbase_renderer *This, IMediaSa
DeleteMediaType(pmt);
}
- This->pMediaSample = pSample;
- IMediaSample_AddRef(pSample);
-
if (This->pFuncsTable->pfnPrepareReceive)
hr = This->pFuncsTable->pfnPrepareReceive(This, pSample);
if (FAILED(hr))
@@ -388,22 +382,11 @@ HRESULT WINAPI BaseRendererImpl_Receive(struct strmbase_renderer *This, IMediaSa
QualityControlRender_DoQOS(This->qcimpl);
- BaseRendererImpl_ClearPendingSample(This);
LeaveCriticalSection(&This->csRenderLock);
return hr;
}
-HRESULT WINAPI BaseRendererImpl_ClearPendingSample(struct strmbase_renderer *iface)
-{
- if (iface->pMediaSample)
- {
- IMediaSample_Release(iface->pMediaSample);
- iface->pMediaSample = NULL;
- }
- return S_OK;
-}
-
HRESULT WINAPI strmbase_renderer_init(struct strmbase_renderer *filter, IUnknown *outer,
const CLSID *clsid, const WCHAR *sink_name, const struct strmbase_renderer_ops *ops)
{
diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h
index 57ff024708..5151e68644 100644
--- a/include/wine/strmbase.h
+++ b/include/wine/strmbase.h
@@ -483,7 +483,6 @@ struct strmbase_renderer
/* Signaled when a flush or state change occurs, i.e. anything that needs
* to immediately unblock the streaming thread. */
HANDLE flush_event;
- IMediaSample *pMediaSample;
REFERENCE_TIME stream_start;
IQualityControl *pQSink;
@@ -522,7 +521,6 @@ struct strmbase_renderer_ops
HRESULT (*renderer_pin_query_interface)(struct strmbase_renderer *iface, REFIID iid, void **out);
};
-HRESULT WINAPI BaseRendererImpl_ClearPendingSample(struct strmbase_renderer *filter);
HRESULT WINAPI BaseRendererImpl_Receive(struct strmbase_renderer *filter, IMediaSample *sample);
HRESULT WINAPI strmbase_renderer_init(struct strmbase_renderer *filter, IUnknown *outer,
--
2.25.0
More information about the wine-devel
mailing list