strmbase: Rename pfnDoRenderSample to renderer_render.

Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2021-03-11 17:21:56 -06:00 committed by Alexandre Julliard
parent 0ae1669ec2
commit 4abf09f02e
6 changed files with 12 additions and 13 deletions

View File

@ -48,7 +48,7 @@ static void evr_destroy(struct strmbase_renderer *iface)
free(filter); free(filter);
} }
static HRESULT WINAPI evr_DoRenderSample(struct strmbase_renderer *iface, IMediaSample *sample) static HRESULT evr_render(struct strmbase_renderer *iface, IMediaSample *sample)
{ {
FIXME("Not implemented.\n"); FIXME("Not implemented.\n");
return E_NOTIMPL; return E_NOTIMPL;
@ -63,7 +63,7 @@ static HRESULT evr_query_accept(struct strmbase_renderer *iface, const AM_MEDIA_
static const struct strmbase_renderer_ops renderer_ops = static const struct strmbase_renderer_ops renderer_ops =
{ {
.renderer_query_accept = evr_query_accept, .renderer_query_accept = evr_query_accept,
.pfnDoRenderSample = evr_DoRenderSample, .renderer_render = evr_render,
.renderer_destroy = evr_destroy, .renderer_destroy = evr_destroy,
}; };

View File

@ -36,7 +36,7 @@ static struct null_renderer *impl_from_strmbase_renderer(struct strmbase_rendere
return CONTAINING_RECORD(iface, struct null_renderer, renderer); return CONTAINING_RECORD(iface, struct null_renderer, renderer);
} }
static HRESULT WINAPI NullRenderer_DoRenderSample(struct strmbase_renderer *iface, IMediaSample *sample) static HRESULT null_renderer_render(struct strmbase_renderer *iface, IMediaSample *sample)
{ {
return S_OK; return S_OK;
} }
@ -57,7 +57,7 @@ static void null_renderer_destroy(struct strmbase_renderer *iface)
static const struct strmbase_renderer_ops renderer_ops = static const struct strmbase_renderer_ops renderer_ops =
{ {
.renderer_query_accept = null_renderer_query_accept, .renderer_query_accept = null_renderer_query_accept,
.pfnDoRenderSample = NullRenderer_DoRenderSample, .renderer_render = null_renderer_render,
.renderer_destroy = null_renderer_destroy, .renderer_destroy = null_renderer_destroy,
}; };

View File

@ -79,7 +79,7 @@ static void VideoRenderer_AutoShowWindow(struct video_renderer *This)
ShowWindow(This->window.hwnd, SW_SHOW); ShowWindow(This->window.hwnd, SW_SHOW);
} }
static HRESULT WINAPI VideoRenderer_DoRenderSample(struct strmbase_renderer *iface, IMediaSample *pSample) static HRESULT video_renderer_render(struct strmbase_renderer *iface, IMediaSample *pSample)
{ {
struct video_renderer *filter = impl_from_strmbase_renderer(iface); struct video_renderer *filter = impl_from_strmbase_renderer(iface);
RECT src = filter->window.src, dst = filter->window.dst; RECT src = filter->window.src, dst = filter->window.dst;
@ -214,7 +214,7 @@ static RECT video_renderer_get_default_rect(struct video_window *iface)
static const struct strmbase_renderer_ops renderer_ops = static const struct strmbase_renderer_ops renderer_ops =
{ {
.renderer_query_accept = video_renderer_query_accept, .renderer_query_accept = video_renderer_query_accept,
.pfnDoRenderSample = VideoRenderer_DoRenderSample, .renderer_render = video_renderer_render,
.renderer_init_stream = video_renderer_init_stream, .renderer_init_stream = video_renderer_init_stream,
.renderer_stop_stream = video_renderer_stop_stream, .renderer_stop_stream = video_renderer_stop_stream,
.renderer_destroy = video_renderer_destroy, .renderer_destroy = video_renderer_destroy,

View File

@ -206,7 +206,7 @@ static inline struct quartz_vmr *impl_from_IBaseFilter(IBaseFilter *iface)
return CONTAINING_RECORD(iface, struct quartz_vmr, renderer.filter.IBaseFilter_iface); return CONTAINING_RECORD(iface, struct quartz_vmr, renderer.filter.IBaseFilter_iface);
} }
static HRESULT WINAPI VMR9_DoRenderSample(struct strmbase_renderer *iface, IMediaSample *sample) static HRESULT vmr_render(struct strmbase_renderer *iface, IMediaSample *sample)
{ {
struct quartz_vmr *filter = impl_from_IBaseFilter(&iface->filter.IBaseFilter_iface); struct quartz_vmr *filter = impl_from_IBaseFilter(&iface->filter.IBaseFilter_iface);
unsigned int data_size, width, depth, src_pitch; unsigned int data_size, width, depth, src_pitch;
@ -638,7 +638,7 @@ static HRESULT vmr_pin_query_interface(struct strmbase_renderer *iface, REFIID i
static const struct strmbase_renderer_ops renderer_ops = static const struct strmbase_renderer_ops renderer_ops =
{ {
.renderer_query_accept = vmr_query_accept, .renderer_query_accept = vmr_query_accept,
.pfnDoRenderSample = VMR9_DoRenderSample, .renderer_render = vmr_render,
.renderer_init_stream = vmr_init_stream, .renderer_init_stream = vmr_init_stream,
.renderer_start_stream = vmr_start_stream, .renderer_start_stream = vmr_start_stream,
.renderer_stop_stream = vmr_stop_stream, .renderer_stop_stream = vmr_stop_stream,

View File

@ -361,7 +361,7 @@ static HRESULT WINAPI BaseRenderer_Receive(struct strmbase_sink *pin, IMediaSamp
filter->current_sample = sample; filter->current_sample = sample;
hr = filter->pFuncsTable->pfnDoRenderSample(filter, sample); hr = filter->pFuncsTable->renderer_render(filter, sample);
SetEvent(filter->state_event); SetEvent(filter->state_event);
LeaveCriticalSection(&filter->filter.stream_cs); LeaveCriticalSection(&filter->filter.stream_cs);
@ -401,14 +401,14 @@ static HRESULT WINAPI BaseRenderer_Receive(struct strmbase_sink *pin, IMediaSamp
} }
if (state == State_Running) if (state == State_Running)
hr = filter->pFuncsTable->pfnDoRenderSample(filter, sample); hr = filter->pFuncsTable->renderer_render(filter, sample);
perform_qos(filter, start, stop, jitter); perform_qos(filter, start, stop, jitter);
} }
else else
{ {
if (state == State_Running) if (state == State_Running)
hr = filter->pFuncsTable->pfnDoRenderSample(filter, sample); hr = filter->pFuncsTable->renderer_render(filter, sample);
} }
return hr; return hr;

View File

@ -305,13 +305,12 @@ struct strmbase_renderer
BOOL eos; BOOL eos;
}; };
typedef HRESULT (WINAPI *BaseRenderer_DoRenderSample)(struct strmbase_renderer *iface, IMediaSample *sample);
typedef HRESULT (WINAPI *BaseRenderer_BreakConnect) (struct strmbase_renderer *iface); typedef HRESULT (WINAPI *BaseRenderer_BreakConnect) (struct strmbase_renderer *iface);
struct strmbase_renderer_ops struct strmbase_renderer_ops
{ {
HRESULT (*renderer_query_accept)(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt); HRESULT (*renderer_query_accept)(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt);
BaseRenderer_DoRenderSample pfnDoRenderSample; HRESULT (*renderer_render)(struct strmbase_renderer *iface, IMediaSample *sample);
void (*renderer_init_stream)(struct strmbase_renderer *iface); void (*renderer_init_stream)(struct strmbase_renderer *iface);
void (*renderer_start_stream)(struct strmbase_renderer *iface); void (*renderer_start_stream)(struct strmbase_renderer *iface);
void (*renderer_stop_stream)(struct strmbase_renderer *iface); void (*renderer_stop_stream)(struct strmbase_renderer *iface);