[PATCH 4/5] strmbase: Get rid of BaseOutputPinImpl_Deliver().
Zebediah Figura
z.figura12 at gmail.com
Tue Nov 26 17:39:19 CST 2019
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
dlls/strmbase/pin.c | 40 ----------------------------------------
include/wine/strmbase.h | 1 -
2 files changed, 41 deletions(-)
diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c
index 4606c25a78..755dd0928a 100644
--- a/dlls/strmbase/pin.c
+++ b/dlls/strmbase/pin.c
@@ -465,46 +465,6 @@ HRESULT WINAPI BaseOutputPinImpl_GetDeliveryBuffer(struct strmbase_source *This,
return hr;
}
-/* replaces OutputPin_SendSample */
-HRESULT WINAPI BaseOutputPinImpl_Deliver(struct strmbase_source *This, IMediaSample *pSample)
-{
- IMemInputPin * pMemConnected = NULL;
- PIN_INFO pinInfo;
- HRESULT hr;
-
- EnterCriticalSection(&This->pin.filter->csFilter);
- {
- if (!This->pin.peer || !This->pMemInputPin)
- hr = VFW_E_NOT_CONNECTED;
- else
- {
- /* we don't have the lock held when using This->pMemInputPin,
- * so we need to AddRef it to stop it being deleted while we are
- * using it. Same with its filter. */
- pMemConnected = This->pMemInputPin;
- IMemInputPin_AddRef(pMemConnected);
- hr = IPin_QueryPinInfo(This->pin.peer, &pinInfo);
- }
- }
- LeaveCriticalSection(&This->pin.filter->csFilter);
-
- if (SUCCEEDED(hr))
- {
- /* NOTE: if we are in a critical section when Receive is called
- * then it causes some problems (most notably with the native Video
- * Renderer) if we are re-entered for whatever reason */
- hr = IMemInputPin_Receive(pMemConnected, pSample);
-
- /* If the filter's destroyed, tell upstream to stop sending data */
- if(IBaseFilter_Release(pinInfo.pFilter) == 0 && SUCCEEDED(hr))
- hr = S_FALSE;
- }
- if (pMemConnected)
- IMemInputPin_Release(pMemConnected);
-
- return hr;
-}
-
/* replaces OutputPin_CommitAllocator */
HRESULT WINAPI BaseOutputPinImpl_Active(struct strmbase_source *This)
{
diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h
index dd2f8426bf..eace7c1e3b 100644
--- a/include/wine/strmbase.h
+++ b/include/wine/strmbase.h
@@ -123,7 +123,6 @@ HRESULT WINAPI BaseOutputPinImpl_EndFlush(IPin * iface);
HRESULT WINAPI BaseOutputPinImpl_GetDeliveryBuffer(struct strmbase_source *pin,
IMediaSample **sample, REFERENCE_TIME *start, REFERENCE_TIME *stop, DWORD flags);
-HRESULT WINAPI BaseOutputPinImpl_Deliver(struct strmbase_source *pin, IMediaSample *sample);
HRESULT WINAPI BaseOutputPinImpl_Active(struct strmbase_source *pin);
HRESULT WINAPI BaseOutputPinImpl_Inactive(struct strmbase_source *pin);
HRESULT WINAPI BaseOutputPinImpl_InitAllocator(struct strmbase_source *pin, IMemAllocator **allocator);
--
2.24.0
More information about the wine-devel
mailing list