Commit e15c13c5 authored by Zebediah Figura's avatar Zebediah Figura Committed by Alexandre Julliard

quartz/vmr9: Set the stream count to 4 in IVMRWindowlessControl9::SetVideoClippingWindow().

parent 5dbede68
...@@ -3178,20 +3178,19 @@ static void test_mixing_mode(void) ...@@ -3178,20 +3178,19 @@ static void test_mixing_mode(void)
ok(hr == S_OK, "Got hr %#x.\n", hr); ok(hr == S_OK, "Got hr %#x.\n", hr);
hr = IVMRFilterConfig9_GetNumberOfStreams(config, &stream_count); hr = IVMRFilterConfig9_GetNumberOfStreams(config, &stream_count);
todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); ok(hr == S_OK, "Got hr %#x.\n", hr);
todo_wine ok(stream_count == 4, "Got %u streams.\n", stream_count); ok(stream_count == 4, "Got %u streams.\n", stream_count);
hr = IBaseFilter_QueryInterface(filter, &IID_IVMRMixerControl9, (void **)&mixer_control); hr = IBaseFilter_QueryInterface(filter, &IID_IVMRMixerControl9, (void **)&mixer_control);
todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); ok(hr == S_OK, "Got hr %#x.\n", hr);
if (hr == S_OK)
IVMRMixerControl9_Release(mixer_control); IVMRMixerControl9_Release(mixer_control);
hr = IVMRFilterConfig9_SetNumberOfStreams(config, 2); hr = IVMRFilterConfig9_SetNumberOfStreams(config, 2);
todo_wine ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr);
hr = IVMRFilterConfig9_GetNumberOfStreams(config, &stream_count); hr = IVMRFilterConfig9_GetNumberOfStreams(config, &stream_count);
ok(hr == S_OK, "Got hr %#x.\n", hr); ok(hr == S_OK, "Got hr %#x.\n", hr);
todo_wine ok(stream_count == 4, "Got %u streams.\n", stream_count); ok(stream_count == 4, "Got %u streams.\n", stream_count);
IVMRWindowlessControl9_Release(windowless_control); IVMRWindowlessControl9_Release(windowless_control);
IVMRFilterConfig9_Release(config); IVMRFilterConfig9_Release(config);
......
...@@ -1734,6 +1734,7 @@ static HRESULT WINAPI VMR9WindowlessControl_SetAspectRatioMode(IVMRWindowlessCon ...@@ -1734,6 +1734,7 @@ static HRESULT WINAPI VMR9WindowlessControl_SetAspectRatioMode(IVMRWindowlessCon
static HRESULT WINAPI VMR9WindowlessControl_SetVideoClippingWindow(IVMRWindowlessControl9 *iface, HWND window) static HRESULT WINAPI VMR9WindowlessControl_SetVideoClippingWindow(IVMRWindowlessControl9 *iface, HWND window)
{ {
struct quartz_vmr *filter = impl_from_IVMRWindowlessControl9(iface); struct quartz_vmr *filter = impl_from_IVMRWindowlessControl9(iface);
HRESULT hr;
TRACE("filter %p, window %p.\n", filter, window); TRACE("filter %p, window %p.\n", filter, window);
...@@ -1754,8 +1755,10 @@ static HRESULT WINAPI VMR9WindowlessControl_SetVideoClippingWindow(IVMRWindowles ...@@ -1754,8 +1755,10 @@ static HRESULT WINAPI VMR9WindowlessControl_SetVideoClippingWindow(IVMRWindowles
filter->clipping_window = window; filter->clipping_window = window;
hr = IVMRFilterConfig9_SetNumberOfStreams(&filter->IVMRFilterConfig9_iface, 4);
LeaveCriticalSection(&filter->renderer.filter.csFilter); LeaveCriticalSection(&filter->renderer.filter.csFilter);
return S_OK; return hr;
} }
static HRESULT WINAPI VMR9WindowlessControl_RepaintVideo(IVMRWindowlessControl9 *iface, HWND hwnd, HDC hdc) static HRESULT WINAPI VMR9WindowlessControl_RepaintVideo(IVMRWindowlessControl9 *iface, HWND hwnd, HDC hdc)
......
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