Module: wine Branch: master Commit: 646f2040d855cf2185e900c16fe2758d4ef07bfd URL: https://source.winehq.org/git/wine.git/?a=commit;h=646f2040d855cf2185e900c16...
Author: Zebediah Figura z.figura12@gmail.com Date: Wed Mar 10 19:23:37 2021 -0600
strmbase: Rename pfnCheckMediaType to renderer_query_accept.
Signed-off-by: Zebediah Figura z.figura12@gmail.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/evr/evr.c | 4 ++-- dlls/qedit/nullrenderer.c | 5 ++--- dlls/quartz/videorenderer.c | 4 ++-- dlls/quartz/vmr9.c | 4 ++-- dlls/strmbase/renderer.c | 4 ++-- include/wine/strmbase.h | 3 +-- 6 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/dlls/evr/evr.c b/dlls/evr/evr.c index 001839026b2..ff89d85ac8c 100644 --- a/dlls/evr/evr.c +++ b/dlls/evr/evr.c @@ -54,7 +54,7 @@ static HRESULT WINAPI evr_DoRenderSample(struct strmbase_renderer *iface, IMedia return E_NOTIMPL; }
-static HRESULT WINAPI evr_CheckMediaType(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt) +static HRESULT evr_query_accept(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt) { FIXME("Not implemented.\n"); return E_NOTIMPL; @@ -62,7 +62,7 @@ static HRESULT WINAPI evr_CheckMediaType(struct strmbase_renderer *iface, const
static const struct strmbase_renderer_ops renderer_ops = { - .pfnCheckMediaType = evr_CheckMediaType, + .renderer_query_accept = evr_query_accept, .pfnDoRenderSample = evr_DoRenderSample, .renderer_destroy = evr_destroy, }; diff --git a/dlls/qedit/nullrenderer.c b/dlls/qedit/nullrenderer.c index e703ea24305..a9319b06efe 100644 --- a/dlls/qedit/nullrenderer.c +++ b/dlls/qedit/nullrenderer.c @@ -41,9 +41,8 @@ static HRESULT WINAPI NullRenderer_DoRenderSample(struct strmbase_renderer *ifac return S_OK; }
-static HRESULT WINAPI NullRenderer_CheckMediaType(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt) +static HRESULT null_renderer_query_accept(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt) { - TRACE("Not a stub!\n"); return S_OK; }
@@ -57,7 +56,7 @@ static void null_renderer_destroy(struct strmbase_renderer *iface)
static const struct strmbase_renderer_ops renderer_ops = { - .pfnCheckMediaType = NullRenderer_CheckMediaType, + .renderer_query_accept = null_renderer_query_accept, .pfnDoRenderSample = NullRenderer_DoRenderSample, .renderer_destroy = null_renderer_destroy, }; diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index a90e96c8f2a..ec40bc8db9c 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -105,7 +105,7 @@ static HRESULT WINAPI VideoRenderer_DoRenderSample(struct strmbase_renderer *ifa return S_OK; }
-static HRESULT WINAPI VideoRenderer_CheckMediaType(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt) +static HRESULT video_renderer_query_accept(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt) { if (!IsEqualGUID(&mt->majortype, &MEDIATYPE_Video)) return S_FALSE; @@ -213,7 +213,7 @@ static RECT video_renderer_get_default_rect(struct video_window *iface)
static const struct strmbase_renderer_ops renderer_ops = { - .pfnCheckMediaType = VideoRenderer_CheckMediaType, + .renderer_query_accept = video_renderer_query_accept, .pfnDoRenderSample = VideoRenderer_DoRenderSample, .renderer_init_stream = video_renderer_init_stream, .renderer_stop_stream = video_renderer_stop_stream, diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index b98e172e48e..9e8a037eca0 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -312,7 +312,7 @@ static HRESULT WINAPI VMR9_DoRenderSample(struct strmbase_renderer *iface, IMedi return IVMRImagePresenter9_PresentImage(filter->presenter, filter->cookie, &info); }
-static HRESULT WINAPI VMR9_CheckMediaType(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt) +static HRESULT vmr_query_accept(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt) { if (!IsEqualIID(&mt->majortype, &MEDIATYPE_Video) || !mt->pbFormat) return S_FALSE; @@ -637,7 +637,7 @@ static HRESULT vmr_pin_query_interface(struct strmbase_renderer *iface, REFIID i
static const struct strmbase_renderer_ops renderer_ops = { - .pfnCheckMediaType = VMR9_CheckMediaType, + .renderer_query_accept = vmr_query_accept, .pfnDoRenderSample = VMR9_DoRenderSample, .renderer_init_stream = vmr_init_stream, .renderer_start_stream = vmr_start_stream, diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index c95fe63c3f9..7718232e97c 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -302,7 +302,7 @@ static const struct strmbase_filter_ops filter_ops = static HRESULT sink_query_accept(struct strmbase_pin *pin, const AM_MEDIA_TYPE *mt) { struct strmbase_renderer *filter = impl_from_IPin(&pin->IPin_iface); - return filter->pFuncsTable->pfnCheckMediaType(filter, mt); + return filter->pFuncsTable->renderer_query_accept(filter, mt); }
static HRESULT sink_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) @@ -344,7 +344,7 @@ static HRESULT WINAPI BaseRenderer_Receive(struct strmbase_sink *pin, IMediaSamp TRACE("Format change.\n"); strmbase_dump_media_type(mt);
- if (FAILED(filter->pFuncsTable->pfnCheckMediaType(filter, mt))) + if (FAILED(filter->pFuncsTable->renderer_query_accept(filter, mt))) return VFW_E_TYPE_NOT_ACCEPTED; DeleteMediaType(mt); } diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 76caf103dee..dbb4a21c071 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -305,13 +305,12 @@ struct strmbase_renderer BOOL eos; };
-typedef HRESULT (WINAPI *BaseRenderer_CheckMediaType)(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt); typedef HRESULT (WINAPI *BaseRenderer_DoRenderSample)(struct strmbase_renderer *iface, IMediaSample *sample); typedef HRESULT (WINAPI *BaseRenderer_BreakConnect) (struct strmbase_renderer *iface);
struct strmbase_renderer_ops { - BaseRenderer_CheckMediaType pfnCheckMediaType; + HRESULT (*renderer_query_accept)(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt); BaseRenderer_DoRenderSample pfnDoRenderSample; void (*renderer_init_stream)(struct strmbase_renderer *iface); void (*renderer_start_stream)(struct strmbase_renderer *iface);