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

winegstreamer: Implement IWMMediaProps::GetMediaType() for the stream config object. 

Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2021-11-11 23:43:23 -06:00 committed by Alexandre Julliard
parent 769057b9b2
commit f3624e2d64
2 changed files with 47 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
dlls/winegstreamer/wm_reader.c
View File

@ -487,8 +487,27 @@ static HRESULT WINAPI stream_props_GetType(IWMMediaProps *iface, GUID *major_typ
static HRESULT WINAPI stream_props_GetMediaType(IWMMediaProps *iface, WM_MEDIA_TYPE *mt, DWORD *size)
{
FIXME("iface %p, mt %p, size %p, stub!\n", iface, mt, size);
return E_NOTIMPL;
struct stream_config *config = impl_from_IWMMediaProps(iface);
const DWORD req_size = *size;
AM_MEDIA_TYPE stream_mt;
TRACE("iface %p, mt %p, size %p.\n", iface, mt, size);
if (!amt_from_wg_format(&stream_mt, &config->stream->format, true))
return E_OUTOFMEMORY;
*size = sizeof(stream_mt) + stream_mt.cbFormat;
if (!mt)
return S_OK;
if (req_size < *size)
return ASF_E_BUFFERTOOSMALL;
strmbase_dump_media_type(&stream_mt);
memcpy(mt, &stream_mt, sizeof(*mt));
memcpy(mt + 1, stream_mt.pbFormat, stream_mt.cbFormat);
mt->pbFormat = (BYTE *)(mt + 1);
return S_OK;
}
static HRESULT WINAPI stream_props_SetMediaType(IWMMediaProps *iface, WM_MEDIA_TYPE *mt)

29
dlls/wmvcore/tests/wmvcore.c
View File

@ -1125,14 +1125,37 @@ static void check_audio_type(const WM_MEDIA_TYPE *mt)
ok(wave_format->wFormatTag == WAVE_FORMAT_PCM, "Got tag %#x.\n", wave_format->wFormatTag);
}
static void test_stream_media_props(IWMStreamConfig *config)
static void test_stream_media_props(IWMStreamConfig *config, const GUID *majortype)
{
char mt_buffer[2000];
WM_MEDIA_TYPE *mt = (WM_MEDIA_TYPE *)mt_buffer;
IWMMediaProps *props;
DWORD size, ret_size;
HRESULT hr;
hr = IWMStreamConfig_QueryInterface(config, &IID_IWMMediaProps, (void **)&props);
ok(hr == S_OK, "Got hr %#x.\n", hr);
size = 0xdeadbeef;
hr = IWMMediaProps_GetMediaType(props, NULL, &size);
ok(hr == S_OK, "Got hr %#x.\n", hr);
ok(size != 0xdeadbeef && size >= sizeof(WM_MEDIA_TYPE), "Got size %u.\n", size);
ret_size = size - 1;
hr = IWMMediaProps_GetMediaType(props, mt, &ret_size);
ok(hr == ASF_E_BUFFERTOOSMALL, "Got hr %#x.\n", hr);
ok(ret_size == size, "Expected size %u, got %u.\n", size, ret_size);
ret_size = sizeof(mt_buffer);
memset(mt_buffer, 0xcc, sizeof(mt_buffer));
hr = IWMMediaProps_GetMediaType(props, mt, &ret_size);
ok(hr == S_OK, "Got hr %#x.\n", hr);
ok(ret_size == size, "Expected size %u, got %u.\n", size, ret_size);
ok(size == sizeof(WM_MEDIA_TYPE) + mt->cbFormat, "Expected size %u, got %u.\n",
sizeof(WM_MEDIA_TYPE) + mt->cbFormat, size);
ok(IsEqualGUID(&mt->majortype, majortype), "Expected major type %s, got %s.\n",
debugstr_guid(majortype), debugstr_guid(&mt->majortype));
IWMMediaProps_Release(props);
}
@ -1188,7 +1211,7 @@ static void test_sync_reader_types(void)
else
ok(IsEqualGUID(&majortype, &MEDIATYPE_Audio), "Got major type %s.\n", debugstr_guid(&majortype));
test_stream_media_props(config);
test_stream_media_props(config, &majortype);
ref = IWMStreamConfig_Release(config);
ok(!ref, "Got outstanding refcount %d.\n", ref);
@ -2280,7 +2303,7 @@ static void test_async_reader_types(void)
else
ok(IsEqualGUID(&majortype, &MEDIATYPE_Audio), "Got major type %s.\n", debugstr_guid(&majortype));
test_stream_media_props(config);
test_stream_media_props(config, &majortype);
ref = IWMStreamConfig_Release(config);
ok(!ref, "Got outstanding refcount %d.\n", ref);