Commit 7da087b7 authored by Zebediah Figura's avatar Zebediah Figura Committed by Alexandre Julliard

quartz/vmr9: Remove the "force" parameter of VMR9_maybe_init().

parent 1cb4b642
...@@ -387,7 +387,7 @@ static HRESULT initialize_device(struct quartz_vmr *filter, VMR9AllocationInfo * ...@@ -387,7 +387,7 @@ static HRESULT initialize_device(struct quartz_vmr *filter, VMR9AllocationInfo *
return hr; return hr;
} }
static HRESULT VMR9_maybe_init(struct quartz_vmr *filter, BOOL force, const AM_MEDIA_TYPE *mt) static HRESULT allocate_surfaces(struct quartz_vmr *filter, const AM_MEDIA_TYPE *mt)
{ {
VMR9AllocationInfo info = {}; VMR9AllocationInfo info = {};
HRESULT hr = E_FAIL; HRESULT hr = E_FAIL;
...@@ -418,11 +418,9 @@ static HRESULT VMR9_maybe_init(struct quartz_vmr *filter, BOOL force, const AM_M ...@@ -418,11 +418,9 @@ static HRESULT VMR9_maybe_init(struct quartz_vmr *filter, BOOL force, const AM_M
TRACE("Initializing in mode %u, our window %p, clipping window %p.\n", TRACE("Initializing in mode %u, our window %p, clipping window %p.\n",
filter->mode, filter->baseControlWindow.hwnd, filter->hWndClippingWindow); filter->mode, filter->baseControlWindow.hwnd, filter->hWndClippingWindow);
if (filter->num_surfaces)
return S_OK;
if (filter->mode == VMR9Mode_Windowless && !filter->hWndClippingWindow) if (filter->mode == VMR9Mode_Windowless && !filter->hWndClippingWindow)
return (force ? VFW_E_RUNTIME_ERROR : S_OK); return S_OK;
info.dwWidth = filter->source_rect.right; info.dwWidth = filter->source_rect.right;
info.dwHeight = filter->source_rect.bottom; info.dwHeight = filter->source_rect.bottom;
...@@ -542,7 +540,7 @@ static HRESULT vmr_connect(struct strmbase_renderer *iface, const AM_MEDIA_TYPE ...@@ -542,7 +540,7 @@ static HRESULT vmr_connect(struct strmbase_renderer *iface, const AM_MEDIA_TYPE
if (filter->mode if (filter->mode
|| SUCCEEDED(hr = IVMRFilterConfig9_SetRenderingMode(&filter->IVMRFilterConfig9_iface, VMR9Mode_Windowed))) || SUCCEEDED(hr = IVMRFilterConfig9_SetRenderingMode(&filter->IVMRFilterConfig9_iface, VMR9Mode_Windowed)))
hr = VMR9_maybe_init(filter, FALSE, mt); hr = allocate_surfaces(filter, mt);
return hr; return hr;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment