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

evr: Consistently use base renderer methods. 

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-08-27 20:45:17 -05:00 committed by Alexandre Julliard
parent 0aa48ff150
commit d06ec99a0c
2 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
dlls/evr/evr.c
View File

@ -33,7 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(evr);
typedef struct typedef struct
{ {
BaseFilter filter; BaseRenderer renderer;
} evr_filter; } evr_filter;
static const IBaseFilterVtbl basefilter_vtbl = static const IBaseFilterVtbl basefilter_vtbl =
@ -55,33 +55,41 @@ static const IBaseFilterVtbl basefilter_vtbl =
BaseFilterImpl_QueryVendorInfo BaseFilterImpl_QueryVendorInfo
}; };
static inline evr_filter *impl_from_BaseFilter(BaseFilter *iface) static inline evr_filter *impl_from_BaseRenderer(BaseRenderer *iface)
{ {
return CONTAINING_RECORD(iface, evr_filter, filter); return CONTAINING_RECORD(iface, evr_filter, renderer);
} }
static IPin *evr_get_pin(BaseFilter *iface, unsigned int index) static void evr_destroy(BaseRenderer *iface)
{ {
FIXME("iface %p, index %u, stub!\n", iface, index); evr_filter *filter = impl_from_BaseRenderer(iface);
return NULL;
}
static void evr_destroy(BaseFilter *iface) strmbase_renderer_cleanup(&filter->renderer);
{
evr_filter *filter = impl_from_BaseFilter(iface);
strmbase_filter_cleanup(&filter->filter);
CoTaskMemFree(filter); CoTaskMemFree(filter);
} }
static const BaseFilterFuncTable basefilter_functable = static HRESULT WINAPI evr_DoRenderSample(BaseRenderer *iface, IMediaSample *sample)
{ {
.filter_get_pin = evr_get_pin, FIXME("Not implemented.\n");
.filter_destroy = evr_destroy, return E_NOTIMPL;
}
static HRESULT WINAPI evr_CheckMediaType(BaseRenderer *iface, const AM_MEDIA_TYPE *mt)
{
FIXME("Not implemented.\n");
return E_NOTIMPL;
}
static const BaseRendererFuncTable renderer_ops =
{
.pfnCheckMediaType = evr_CheckMediaType,
.pfnDoRenderSample = evr_DoRenderSample,
.renderer_destroy = evr_destroy,
}; };
HRESULT evr_filter_create(IUnknown *outer, void **out) HRESULT evr_filter_create(IUnknown *outer, void **out)
{ {
static const WCHAR sink_name[] = {'E','V','R',' ','I','n','p','u','t','0',0};
evr_filter *object; evr_filter *object;
*out = NULL; *out = NULL;
@ -90,10 +98,10 @@ HRESULT evr_filter_create(IUnknown *outer, void **out)
if (!object) if (!object)
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
strmbase_filter_init(&object->filter, &basefilter_vtbl, outer, strmbase_renderer_init(&object->renderer, &basefilter_vtbl, outer,
&CLSID_EnhancedVideoRenderer, &basefilter_functable); &CLSID_EnhancedVideoRenderer, sink_name, &renderer_ops);
*out = &object->filter.IUnknown_inner; *out = &object->renderer.filter.IUnknown_inner;
return S_OK; return S_OK;
} }

4
dlls/evr/tests/evr.c
View File

@ -158,8 +158,8 @@ static void test_interfaces(void)
todo_wine check_interface(filter, &IID_IAMFilterMiscFlags, TRUE); todo_wine check_interface(filter, &IID_IAMFilterMiscFlags, TRUE);
check_interface(filter, &IID_IBaseFilter, TRUE); check_interface(filter, &IID_IBaseFilter, TRUE);
check_interface(filter, &IID_IMediaFilter, TRUE); check_interface(filter, &IID_IMediaFilter, TRUE);
todo_wine check_interface(filter, &IID_IMediaPosition, TRUE); check_interface(filter, &IID_IMediaPosition, TRUE);
todo_wine check_interface(filter, &IID_IMediaSeeking, TRUE); check_interface(filter, &IID_IMediaSeeking, TRUE);
check_interface(filter, &IID_IPersist, TRUE); check_interface(filter, &IID_IPersist, TRUE);
check_interface(filter, &IID_IUnknown, TRUE); check_interface(filter, &IID_IUnknown, TRUE);