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

evr/mixer: Implement GetOutputStatus(). 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2020-10-22 14:02:45 +03:00 committed by Alexandre Julliard
parent 5496b88917
commit d63ff3403b
2 changed files with 49 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
dlls/evr/mixer.c
View File

@ -934,11 +934,37 @@ static HRESULT WINAPI video_mixer_transform_GetInputStatus(IMFTransform *iface,
return hr; return hr;
} }
static HRESULT WINAPI video_mixer_transform_GetOutputStatus(IMFTransform *iface, DWORD *flags) static HRESULT WINAPI video_mixer_transform_GetOutputStatus(IMFTransform *iface, DWORD *status)
{ {
FIXME("%p, %p.\n", iface, flags); struct video_mixer *mixer = impl_from_IMFTransform(iface);
HRESULT hr = S_OK;
unsigned int i;
return E_NOTIMPL; TRACE("%p, %p.\n", iface, status);
if (!status)
return E_POINTER;
EnterCriticalSection(&mixer->cs);
if (!mixer->output.media_type)
hr = MF_E_TRANSFORM_TYPE_NOT_SET;
else
{
*status = MFT_OUTPUT_STATUS_SAMPLE_READY;
for (i = 0; i < mixer->input_count; ++i)
{
if (!mixer->inputs[i].sample)
{
*status = 0;
break;
}
}
}
LeaveCriticalSection(&mixer->cs);
return hr;
} }
static HRESULT WINAPI video_mixer_transform_SetOutputBounds(IMFTransform *iface, LONGLONG lower, LONGLONG upper) static HRESULT WINAPI video_mixer_transform_SetOutputBounds(IMFTransform *iface, LONGLONG lower, LONGLONG upper)

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

@ -2098,6 +2098,12 @@ static void test_mixer_samples(void)
hr = IMFTransform_GetInputStatus(mixer, 1, &status); hr = IMFTransform_GetInputStatus(mixer, 1, &status);
ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr);
hr = IMFTransform_GetOutputStatus(mixer, NULL);
ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr);
hr = IMFTransform_GetOutputStatus(mixer, &status);
ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr);
/* Configure device and media types. */ /* Configure device and media types. */
hr = DXVA2CreateDirect3DDeviceManager9(&token, &manager); hr = DXVA2CreateDirect3DDeviceManager9(&token, &manager);
ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
@ -2132,6 +2138,11 @@ static void test_mixer_samples(void)
hr = IMFTransform_GetInputStatus(mixer, 1, &status); hr = IMFTransform_GetInputStatus(mixer, 1, &status);
ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr);
status = ~0u;
hr = IMFTransform_GetOutputStatus(mixer, &status);
ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
ok(!status, "Unexpected status %#x.\n", status);
IMFMediaType_Release(video_type); IMFMediaType_Release(video_type);
memset(&buffer, 0, sizeof(buffer)); memset(&buffer, 0, sizeof(buffer));
@ -2190,6 +2201,11 @@ todo_wine
ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
ok(status == MFT_INPUT_STATUS_ACCEPT_DATA, "Unexpected status %#x.\n", status); ok(status == MFT_INPUT_STATUS_ACCEPT_DATA, "Unexpected status %#x.\n", status);
status = ~0u;
hr = IMFTransform_GetOutputStatus(mixer, &status);
ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
ok(!status, "Unexpected status %#x.\n", status);
hr = IMFTransform_ProcessInput(mixer, 0, sample, 0); hr = IMFTransform_ProcessInput(mixer, 0, sample, 0);
ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
@ -2198,6 +2214,10 @@ todo_wine
ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
ok(!status, "Unexpected status %#x.\n", status); ok(!status, "Unexpected status %#x.\n", status);
hr = IMFTransform_GetOutputStatus(mixer, &status);
ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
ok(status == MFT_OUTPUT_STATUS_SAMPLE_READY, "Unexpected status %#x.\n", status);
hr = IMFTransform_ProcessInput(mixer, 0, sample, 0); hr = IMFTransform_ProcessInput(mixer, 0, sample, 0);
ok(hr == MF_E_NOTACCEPTING, "Unexpected hr %#x.\n", hr); ok(hr == MF_E_NOTACCEPTING, "Unexpected hr %#x.\n", hr);