ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wineqtdecoder: Store the sink as a strmbase_sink structure. 

Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2019-12-12 21:24:32 -06:00 committed by Alexandre Julliard
parent 5fd2285407
commit ad0cea8344
1 changed files with 18 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
dlls/wineqtdecoder/qtsplitter.c
View File

@ -138,7 +138,7 @@ typedef struct QTOutPin {
} QTOutPin; } QTOutPin;
typedef struct QTInPin { typedef struct QTInPin {
struct strmbase_pin pin; struct strmbase_sink pin;
GUID subType; GUID subType;
IAsyncReader *pReader; IAsyncReader *pReader;
@ -199,7 +199,7 @@ static inline QTSplitter *impl_from_IBaseFilter( IBaseFilter *iface )
static inline QTInPin *impl_from_IPin(IPin *iface) static inline QTInPin *impl_from_IPin(IPin *iface)
{ {
return CONTAINING_RECORD(iface, QTInPin, pin.IPin_iface); return CONTAINING_RECORD(iface, QTInPin, pin.pin.IPin_iface);
} }
/* /*
@ -211,7 +211,7 @@ static struct strmbase_pin *qt_splitter_get_pin(struct strmbase_filter *base, un
QTSplitter *filter = impl_from_strmbase_filter(base); QTSplitter *filter = impl_from_strmbase_filter(base);
if (index == 0) if (index == 0)
return &filter->pInputPin.pin; return &filter->pInputPin.pin.pin;
else if (index == 1) else if (index == 1)
{ {
if (filter->pVideo_Pin) if (filter->pVideo_Pin)
@ -232,18 +232,15 @@ static void qt_splitter_destroy(struct strmbase_filter *iface)
EnterCriticalSection(&filter->csReceive); EnterCriticalSection(&filter->csReceive);
/* Don't need to clean up output pins, disconnecting input pin will do that */ /* Don't need to clean up output pins, disconnecting input pin will do that */
if (filter->pInputPin.pin.pin.peer)
IPin_Disconnect(filter->pInputPin.pin.pin.peer);
if (filter->pInputPin.pin.peer)
IPin_Disconnect(filter->pInputPin.pin.peer);
FreeMediaType(&filter->pInputPin.pin.mt);
if (filter->pInputPin.pAlloc) if (filter->pInputPin.pAlloc)
IMemAllocator_Release(filter->pInputPin.pAlloc); IMemAllocator_Release(filter->pInputPin.pAlloc);
filter->pInputPin.pAlloc = NULL; filter->pInputPin.pAlloc = NULL;
if (filter->pInputPin.pReader) if (filter->pInputPin.pReader)
IAsyncReader_Release(filter->pInputPin.pReader); IAsyncReader_Release(filter->pInputPin.pReader);
filter->pInputPin.pReader = NULL; filter->pInputPin.pReader = NULL;
filter->pInputPin.pin.IPin_iface.lpVtbl = NULL;
if (filter->pQTMovie) if (filter->pQTMovie)
{ {
@ -274,6 +271,7 @@ static void qt_splitter_destroy(struct strmbase_filter *iface)
filter->csReceive.DebugInfo->Spare[0] = 0; filter->csReceive.DebugInfo->Spare[0] = 0;
DeleteCriticalSection(&filter->csReceive); DeleteCriticalSection(&filter->csReceive);
strmbase_sink_cleanup(&filter->pInputPin.pin);
strmbase_filter_cleanup(&filter->filter); strmbase_filter_cleanup(&filter->filter);
CoTaskMemFree(filter); CoTaskMemFree(filter);
@ -333,10 +331,10 @@ static HRESULT sink_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE
return S_FALSE; return S_FALSE;
} }
static const BasePinFuncTable sink_ops = static const struct strmbase_sink_ops sink_ops =
{ {
.pin_query_accept = sink_query_accept, .base.pin_query_accept = sink_query_accept,
.pin_get_media_type = strmbase_pin_get_media_type, .base.pin_get_media_type = strmbase_pin_get_media_type,
}; };
IUnknown * CALLBACK QTSplitter_create(IUnknown *outer, HRESULT *phr) IUnknown * CALLBACK QTSplitter_create(IUnknown *outer, HRESULT *phr)
@ -357,6 +355,8 @@ IUnknown * CALLBACK QTSplitter_create(IUnknown *outer, HRESULT *phr)
ZeroMemory(This,sizeof(*This)); ZeroMemory(This,sizeof(*This));
strmbase_filter_init(&This->filter, outer, &CLSID_QTSplitter, &filter_ops); strmbase_filter_init(&This->filter, outer, &CLSID_QTSplitter, &filter_ops);
strmbase_sink_init(&This->pInputPin.pin, &QT_InputPin_Vtbl, &This->filter,
wcsInputPinName, &sink_ops, NULL);
InitializeCriticalSection(&This->csReceive); InitializeCriticalSection(&This->csReceive);
This->csReceive.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__": QTSplitter.csReceive"); This->csReceive.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__": QTSplitter.csReceive");
@ -366,13 +366,6 @@ IUnknown * CALLBACK QTSplitter_create(IUnknown *outer, HRESULT *phr)
This->aSession = NULL; This->aSession = NULL;
This->runEvent = CreateEventW(NULL, 0, 0, NULL); This->runEvent = CreateEventW(NULL, 0, 0, NULL);
This->pInputPin.pin.dir = PINDIR_INPUT;
This->pInputPin.pin.filter = &This->filter;
lstrcpynW(This->pInputPin.pin.name, wcsInputPinName, ARRAY_SIZE(This->pInputPin.pin.name));
This->pInputPin.pin.IPin_iface.lpVtbl = &QT_InputPin_Vtbl;
This->pInputPin.pin.peer = NULL;
This->pInputPin.pin.pFuncsTable = &sink_ops;
*phr = S_OK; *phr = S_OK;
return &This->filter.IUnknown_inner; return &This->filter.IUnknown_inner;
} }
@ -984,7 +977,7 @@ static HRESULT WINAPI QTInPin_ReceiveConnection(IPin *iface, IPin *pReceivePin,
EnterCriticalSection(&filter->filter.csFilter); EnterCriticalSection(&filter->filter.csFilter);
This->pReader = NULL; This->pReader = NULL;
if (This->pin.peer) if (This->pin.pin.peer)
hr = VFW_E_ALREADY_CONNECTED; hr = VFW_E_ALREADY_CONNECTED;
else if (IPin_QueryAccept(iface, pmt) != S_OK) else if (IPin_QueryAccept(iface, pmt) != S_OK)
hr = VFW_E_TYPE_NOT_ACCEPTED; hr = VFW_E_TYPE_NOT_ACCEPTED;
@ -1066,22 +1059,22 @@ static HRESULT WINAPI QTInPin_Disconnect(IPin *iface)
{ {
HRESULT hr; HRESULT hr;
QTInPin *This = impl_from_IPin(iface); QTInPin *This = impl_from_IPin(iface);
QTSplitter *filter = impl_from_strmbase_filter(This->pin.filter); QTSplitter *filter = impl_from_strmbase_filter(This->pin.pin.filter);
FILTER_STATE state; FILTER_STATE state;
TRACE("()\n"); TRACE("()\n");
hr = IBaseFilter_GetState(&filter->filter.IBaseFilter_iface, INFINITE, &state); hr = IBaseFilter_GetState(&filter->filter.IBaseFilter_iface, INFINITE, &state);
EnterCriticalSection(&filter->filter.csFilter); EnterCriticalSection(&filter->filter.csFilter);
if (This->pin.peer) if (This->pin.pin.peer)
{ {
QTSplitter *Parser = impl_from_strmbase_filter(This->pin.filter); QTSplitter *Parser = impl_from_strmbase_filter(This->pin.pin.filter);
if (SUCCEEDED(hr) && state == State_Stopped) if (SUCCEEDED(hr) && state == State_Stopped)
{ {
IMemAllocator_Decommit(This->pAlloc); IMemAllocator_Decommit(This->pAlloc);
IPin_Disconnect(This->pin.peer); IPin_Disconnect(This->pin.pin.peer);
IPin_Release(This->pin.peer); IPin_Release(This->pin.pin.peer);
This->pin.peer = NULL; This->pin.pin.peer = NULL;
hr = QT_RemoveOutputPins(Parser); hr = QT_RemoveOutputPins(Parser);
} }
else else