[PATCH 3/5] strmbase: Get rid of the BaseOutputPinImpl_InitAllocator() helper.

Zebediah Figura zfigura at codeweavers.com
Mon Feb 7 23:22:46 CST 2022


Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
---
 include/wine/strmbase.h | 1 -
 libs/strmbase/pin.c     | 9 ++-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h
index 868ea4c580a..3e92136b7f7 100644
--- a/include/wine/strmbase.h
+++ b/include/wine/strmbase.h
@@ -105,7 +105,6 @@ struct strmbase_sink_ops
 };
 
 /* Base Pin */
-HRESULT WINAPI BaseOutputPinImpl_InitAllocator(struct strmbase_source *pin, IMemAllocator **allocator);
 HRESULT WINAPI BaseOutputPinImpl_DecideAllocator(struct strmbase_source *pin, IMemInputPin *peer, IMemAllocator **allocator);
 HRESULT WINAPI BaseOutputPinImpl_AttemptConnection(struct strmbase_source *pin, IPin *peer, const AM_MEDIA_TYPE *mt);
 
diff --git a/libs/strmbase/pin.c b/libs/strmbase/pin.c
index f6e4ef1c139..36784f60a23 100644
--- a/libs/strmbase/pin.c
+++ b/libs/strmbase/pin.c
@@ -677,11 +677,6 @@ static const IPinVtbl source_vtbl =
     source_NewSegment,
 };
 
-HRESULT WINAPI BaseOutputPinImpl_InitAllocator(struct strmbase_source *This, IMemAllocator **pMemAlloc)
-{
-    return CoCreateInstance(&CLSID_MemoryAllocator, NULL, CLSCTX_INPROC_SERVER, &IID_IMemAllocator, (LPVOID*)pMemAlloc);
-}
-
 HRESULT WINAPI BaseOutputPinImpl_DecideAllocator(struct strmbase_source *This,
         IMemInputPin *pPin, IMemAllocator **pAlloc)
 {
@@ -690,8 +685,8 @@ HRESULT WINAPI BaseOutputPinImpl_DecideAllocator(struct strmbase_source *This,
     hr = IMemInputPin_GetAllocator(pPin, pAlloc);
 
     if (hr == VFW_E_NO_ALLOCATOR)
-        /* Input pin provides no allocator, use standard memory allocator */
-        hr = BaseOutputPinImpl_InitAllocator(This, pAlloc);
+        hr = CoCreateInstance(&CLSID_MemoryAllocator, NULL,
+                CLSCTX_INPROC_SERVER, &IID_IMemAllocator, (void **)pAlloc);
 
     if (SUCCEEDED(hr))
     {
-- 
2.34.1




More information about the wine-devel mailing list