strmbase: Get rid of the BaseOutputPinImpl_InitAllocator() helper.

Signed-off-by: Zebediah Figura <zfigura@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

strmbase: Get rid of the BaseOutputPinImpl_InitAllocator() helper.
98a2689f · Zebediah Figura · Alexandre Julliard · 4e610a07 · 98a2689f · 98a2689f
Commit 98a2689f authored Feb 07, 2022 by Zebediah Figura Committed by Alexandre Julliard Feb 08, 2022
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 8 deletions

strmbase.h include/wine/strmbase.h +0 -1

pin.c libs/strmbase/pin.c +2 -7

No files found.
--- 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);


--- 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))
    {