system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-14 09:41:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

winegstreamer: Implement GetOutputSizeInfo for WMV decoder.

Browse source
This commit is contained in:
Ziqing Hui 2023-01-09 18:02:22 +08:00 committed by Alexandre Julliard
parent 53b455c9c0
commit efb819c781
2 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dlls/mf/tests/transform.c
View file

@ -5090,7 +5090,6 @@ static void test_wmv_decoder_media_object(void)
hr = IMediaObject_SetOutputType(media_object, 0, NULL, DMO_SET_TYPEF_CLEAR);
ok(hr == S_OK, "SetOutputType returned %#lx.\n", hr);
hr = IMediaObject_GetOutputSizeInfo(media_object, 0, &size, &alignment);
todo_wine
ok(hr == DMO_E_TYPE_NOT_SET, "GetOutputSizeInfo returned %#lx.\n", hr);
for (i = 0; i < ARRAY_SIZE(expected_output_types); ++i)
@ -5120,12 +5119,9 @@ static void test_wmv_decoder_media_object(void)
ok(hr == S_OK, "MFCalculateImageSize returned %#lx.\n", hr);
hr = IMediaObject_GetOutputSizeInfo(media_object, 0, &size, &alignment);
todo_wine
{
ok(hr == S_OK, "GetOutputSizeInfo returned %#lx.\n", hr);
ok(size == expected_size, "Got unexpected size %lu, expected %lu.\n", size, expected_size);
ok(alignment == 1, "Got unexpected alignment %lu.\n", alignment);
}
}
winetest_pop_context();
}

25
dlls/winegstreamer/wmv_decoder.c
View file

@ -82,6 +82,7 @@ struct wmv_decoder
struct wg_format input_format;
struct wg_format output_format;
GUID output_subtype;
};
static bool wg_format_is_set(struct wg_format *format)
@ -549,7 +550,10 @@ static HRESULT WINAPI media_object_SetOutputType(IMediaObject *iface, DWORD inde
return DMO_E_TYPE_NOT_ACCEPTED;
if (!(flags & DMO_SET_TYPEF_TEST_ONLY))
{
decoder->output_subtype = type->subtype;
decoder->output_format = wg_format;
}
return S_OK;
}
@ -576,8 +580,25 @@ static HRESULT WINAPI media_object_GetInputSizeInfo(IMediaObject *iface, DWORD i
static HRESULT WINAPI media_object_GetOutputSizeInfo(IMediaObject *iface, DWORD index, DWORD *size, DWORD *alignment)
{
FIXME("iface %p, index %lu, size %p, alignment %p stub!\n", iface, index, size, alignment);
return E_NOTIMPL;
struct wmv_decoder *decoder = impl_from_IMediaObject(iface);
HRESULT hr;
TRACE("iface %p, index %lu, size %p, alignment %p.\n", iface, index, size, alignment);
if (index > 0)
return DMO_E_INVALIDSTREAMINDEX;
if (!wg_format_is_set(&decoder->output_format))
return DMO_E_TYPE_NOT_SET;
if (FAILED(hr = MFCalculateImageSize(&decoder->output_subtype,
decoder->output_format.u.video.width, decoder->output_format.u.video.height, (UINT32 *)size)))
{
FIXME("Failed to get image size of subtype %s.\n", debugstr_guid(&decoder->output_subtype));
return hr;
}
*alignment = 1;
return S_OK;
}
static HRESULT WINAPI media_object_GetInputMaxLatency(IMediaObject *iface, DWORD index, REFERENCE_TIME *latency)