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

strmbase: Store the filter name and graph directly in the strmbase_filter 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 2020-01-30 19:05:18 -06:00 committed by Alexandre Julliard
parent eea01d8e8b
commit 6f71e2c48d
6 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dlls/qcap/avimux.c
View File

@ -772,8 +772,7 @@ static HRESULT WINAPI ConfigInterleaving_put_Mode(
if(This->mode != mode) { if(This->mode != mode) {
if(This->source.pin.peer) { if(This->source.pin.peer) {
HRESULT hr = IFilterGraph_Reconnect(This->filter.filterInfo.pGraph, HRESULT hr = IFilterGraph_Reconnect(This->filter.graph, &This->source.pin.IPin_iface);
&This->source.pin.IPin_iface);
if(FAILED(hr)) if(FAILED(hr))
return hr; return hr;
} }
@ -1152,7 +1151,7 @@ static HRESULT WINAPI AviMuxOut_AttemptConnection(struct strmbase_source *iface,
if (!filter->in[i]->pin.pin.peer) if (!filter->in[i]->pin.pin.peer)
continue; continue;
hr = IFilterGraph_Reconnect(filter->filter.filterInfo.pGraph, &filter->in[i]->pin.pin.IPin_iface); hr = IFilterGraph_Reconnect(filter->filter.graph, &filter->in[i]->pin.pin.IPin_iface);
if (FAILED(hr)) if (FAILED(hr))
{ {
IPin_Disconnect(&iface->pin.IPin_iface); IPin_Disconnect(&iface->pin.IPin_iface);

4
dlls/qcap/vfwcapture.c
View File

@ -216,9 +216,9 @@ AMStreamConfig_SetFormat(IAMStreamConfig *iface, AM_MEDIA_TYPE *pmt)
} }
hr = qcap_driver_set_format(This->driver_info, pmt); hr = qcap_driver_set_format(This->driver_info, pmt);
if (SUCCEEDED(hr) && This->filter.filterInfo.pGraph && This->source.pin.peer) if (SUCCEEDED(hr) && This->filter.graph && This->source.pin.peer)
{ {
hr = IFilterGraph_Reconnect(This->filter.filterInfo.pGraph, &This->source.pin.IPin_iface); hr = IFilterGraph_Reconnect(This->filter.graph, &This->source.pin.IPin_iface);
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
TRACE("Reconnection completed, with new media format..\n"); TRACE("Reconnection completed, with new media format..\n");
} }

2
dlls/qedit/samplegrabber.c
View File

@ -80,8 +80,6 @@ static inline SG_Impl *impl_from_IMemInputPin(IMemInputPin *iface)
static void SampleGrabber_cleanup(SG_Impl *This) static void SampleGrabber_cleanup(SG_Impl *This)
{ {
TRACE("(%p)\n", This); TRACE("(%p)\n", This);
if (This->filter.filterInfo.pGraph)
WARN("(%p) still joined to filter graph %p\n", This, This->filter.filterInfo.pGraph);
if (This->allocator) if (This->allocator)
IMemAllocator_Release(This->allocator); IMemAllocator_Release(This->allocator);
if (This->grabberIface) if (This->grabberIface)

38
dlls/strmbase/filter.c
View File

@ -443,35 +443,37 @@ static HRESULT WINAPI filter_FindPin(IBaseFilter *iface, const WCHAR *id, IPin *
return VFW_E_NOT_FOUND; return VFW_E_NOT_FOUND;
} }
static HRESULT WINAPI filter_QueryFilterInfo(IBaseFilter *iface, FILTER_INFO *pInfo) static HRESULT WINAPI filter_QueryFilterInfo(IBaseFilter *iface, FILTER_INFO *info)
{ {
struct strmbase_filter *This = impl_from_IBaseFilter(iface); struct strmbase_filter *filter = impl_from_IBaseFilter(iface);
TRACE("(%p)->(%p)\n", This, pInfo);
lstrcpyW(pInfo->achName, This->filterInfo.achName); TRACE("filter %p, info %p.\n", filter, info);
pInfo->pGraph = This->filterInfo.pGraph;
if (pInfo->pGraph) lstrcpyW(info->achName, filter->name);
IFilterGraph_AddRef(pInfo->pGraph); info->pGraph = filter->graph;
if (info->pGraph)
IFilterGraph_AddRef(info->pGraph);
return S_OK; return S_OK;
} }
static HRESULT WINAPI filter_JoinFilterGraph(IBaseFilter *iface, IFilterGraph *pGraph, const WCHAR *pName) static HRESULT WINAPI filter_JoinFilterGraph(IBaseFilter *iface, IFilterGraph *graph, const WCHAR *name)
{ {
struct strmbase_filter *This = impl_from_IBaseFilter(iface); struct strmbase_filter *filter = impl_from_IBaseFilter(iface);
TRACE("(%p)->(%p, %s)\n", This, pGraph, debugstr_w(pName)); TRACE("filter %p, graph %p, name %s.\n", filter, graph, debugstr_w(name));
EnterCriticalSection(&This->csFilter); EnterCriticalSection(&filter->csFilter);
{
if (pName) if (name)
lstrcpynW(This->filterInfo.achName, pName, MAX_FILTER_NAME); lstrcpynW(filter->name, name, ARRAY_SIZE(filter->name));
else else
*This->filterInfo.achName = '\0'; filter->name[0] = 0;
This->filterInfo.pGraph = pGraph; /* NOTE: do NOT increase ref. count */ /* The graph references us, so we cannot also reference the graph. */
} filter->graph = graph;
LeaveCriticalSection(&This->csFilter);
LeaveCriticalSection(&filter->csFilter);
return S_OK; return S_OK;
} }

2
dlls/strmbase/renderer.c
View File

@ -199,7 +199,7 @@ static void sink_disconnect(struct strmbase_sink *iface)
static HRESULT sink_eos(struct strmbase_sink *iface) static HRESULT sink_eos(struct strmbase_sink *iface)
{ {
struct strmbase_renderer *filter = impl_from_IPin(&iface->pin.IPin_iface); struct strmbase_renderer *filter = impl_from_IPin(&iface->pin.IPin_iface);
IFilterGraph *graph = filter->filter.filterInfo.pGraph; IFilterGraph *graph = filter->filter.graph;
IMediaEventSink *event_sink; IMediaEventSink *event_sink;
HRESULT hr = S_OK; HRESULT hr = S_OK;

3
include/wine/strmbase.h
View File

@ -130,7 +130,8 @@ struct strmbase_filter
FILTER_STATE state; FILTER_STATE state;
IReferenceClock * pClock; IReferenceClock * pClock;
FILTER_INFO filterInfo; WCHAR name[128];
IFilterGraph *graph;
CLSID clsid; CLSID clsid;
LONG pin_version; LONG pin_version;