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

quartz: Reimplement AM_RENDEREX_RENDERTOEXISTINGRENDERERS by forbidding renderers from IFilterMapper2::EnumMatchingFilters(). 

Primarily to avoid unnecessarily creating filters like the VMR.

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-08-15 16:43:35 -05:00 committed by Alexandre Julliard
parent cb7b23a3f0
commit 0beda8a480
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dlls/quartz/filtergraph.c
View File

@ -1130,7 +1130,7 @@ static HRESULT autoplug(struct filter_graph *graph, IPin *source, IPin *sink,
static HRESULT autoplug_through_sink(struct filter_graph *graph, IPin *source, static HRESULT autoplug_through_sink(struct filter_graph *graph, IPin *source,
IBaseFilter *filter, IPin *middle_sink, IPin *sink, IBaseFilter *filter, IPin *middle_sink, IPin *sink,
BOOL render_to_existing, BOOL allow_renderers, unsigned int recursion_depth) BOOL render_to_existing, unsigned int recursion_depth)
{ {
BOOL any = FALSE, all = TRUE; BOOL any = FALSE, all = TRUE;
IPin *middle_source, *peer; IPin *middle_source, *peer;
@ -1195,7 +1195,7 @@ static HRESULT autoplug_through_sink(struct filter_graph *graph, IPin *source,
if (!sink) if (!sink)
{ {
if (all && (any || allow_renderers)) if (all)
return S_OK; return S_OK;
if (any) if (any)
return VFW_S_PARTIAL_RENDER; return VFW_S_PARTIAL_RENDER;
@ -1209,7 +1209,7 @@ err:
static HRESULT autoplug_through_filter(struct filter_graph *graph, IPin *source, static HRESULT autoplug_through_filter(struct filter_graph *graph, IPin *source,
IBaseFilter *filter, IPin *sink, BOOL render_to_existing, IBaseFilter *filter, IPin *sink, BOOL render_to_existing,
BOOL allow_renderers, unsigned int recursion_depth) unsigned int recursion_depth)
{ {
IEnumPins *sink_enum; IEnumPins *sink_enum;
IPin *filter_sink; IPin *filter_sink;
@ -1223,7 +1223,7 @@ static HRESULT autoplug_through_filter(struct filter_graph *graph, IPin *source,
while (IEnumPins_Next(sink_enum, 1, &filter_sink, NULL) == S_OK) while (IEnumPins_Next(sink_enum, 1, &filter_sink, NULL) == S_OK)
{ {
hr = autoplug_through_sink(graph, source, filter, filter_sink, sink, hr = autoplug_through_sink(graph, source, filter, filter_sink, sink,
render_to_existing, allow_renderers, recursion_depth); render_to_existing, recursion_depth);
IPin_Release(filter_sink); IPin_Release(filter_sink);
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
{ {
@ -1271,7 +1271,7 @@ static HRESULT autoplug(struct filter_graph *graph, IPin *source, IPin *sink,
LIST_FOR_EACH_ENTRY(filter, &graph->filters, struct filter, entry) LIST_FOR_EACH_ENTRY(filter, &graph->filters, struct filter, entry)
{ {
if (SUCCEEDED(hr = autoplug_through_filter(graph, source, filter->filter, if (SUCCEEDED(hr = autoplug_through_filter(graph, source, filter->filter,
sink, render_to_existing, TRUE, recursion_depth))) sink, render_to_existing, recursion_depth)))
return hr; return hr;
} }
@ -1295,8 +1295,9 @@ static HRESULT autoplug(struct filter_graph *graph, IPin *source, IPin *sink,
DeleteMediaType(mt); DeleteMediaType(mt);
if (FAILED(hr = IFilterMapper2_EnumMatchingFilters(mapper, &enummoniker, 0, FALSE, if (FAILED(hr = IFilterMapper2_EnumMatchingFilters(mapper, &enummoniker,
MERIT_UNLIKELY, TRUE, 1, types, NULL, NULL, FALSE, FALSE, 0, NULL, NULL, NULL))) 0, FALSE, MERIT_UNLIKELY, TRUE, 1, types, NULL, NULL, FALSE,
render_to_existing, 0, NULL, NULL, NULL)))
goto out; goto out;
while (IEnumMoniker_Next(enummoniker, 1, &moniker, NULL) == S_OK) while (IEnumMoniker_Next(enummoniker, 1, &moniker, NULL) == S_OK)
@ -1346,8 +1347,7 @@ static HRESULT autoplug(struct filter_graph *graph, IPin *source, IPin *sink,
continue; continue;
} }
hr = autoplug_through_filter(graph, source, filter, sink, hr = autoplug_through_filter(graph, source, filter, sink, render_to_existing, recursion_depth);
render_to_existing, !render_to_existing, recursion_depth);
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
{ {
IBaseFilter_Release(filter); IBaseFilter_Release(filter);