Skip to content

W
wine-cw
Commit 8a506ea9 authored by Giovanni Mascellani's avatar Giovanni Mascellani Committed by Alexandre Julliard
Browse files
Options

winegstreamer: Improve reported supported rates values for the media source.

Signed-off-by: 's avatarGiovanni Mascellani <gmascellani@codeweavers.com> Signed-off-by: 's avatarNikolay Sivov <nsivov@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 0393a0e2
Hide whitespace changes
Inline Side-by-side
Showing with 69 additions and 9 deletions
dlls/mfplat/tests/mfplat.c
View file @ 8a506ea9
......@@ -655,12 +655,15 @@ static void test_source_resolver(void)
IMFStreamDescriptor *sd;
IUnknown *cancel_cookie;
IMFByteStream *stream;
IMFGetService *get_service;
IMFRateSupport *rate_support;
WCHAR pathW[MAX_PATH];
int i, sample_count;
WCHAR *filename;
PROPVARIANT var;
HRESULT hr;
GUID guid;
float rate;
if (!pMFCreateSourceResolver)
{
......@@ -766,6 +769,62 @@ static void test_source_resolver(void)
check_interface(mediasource, &IID_IMFGetService, TRUE);
check_service_interface(mediasource, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, TRUE);
hr = IMFMediaSource_QueryInterface(mediasource, &IID_IMFGetService, (void**)&get_service);
ok(hr == S_OK, "Failed to get service interface, hr %#x.\n", hr);
hr = IMFGetService_GetService(get_service, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, (void**)&rate_support);
ok(hr == S_OK, "Failed to get rate support interface, hr %#x.\n", hr);
hr = IMFRateSupport_GetFastestRate(rate_support, MFRATE_FORWARD, FALSE, &rate);
ok(hr == S_OK, "Failed to query fastest rate, hr %#x.\n", hr);
ok(rate == 1e6f, "Unexpected fastest rate %f.\n", rate);
hr = IMFRateSupport_GetFastestRate(rate_support, MFRATE_FORWARD, TRUE, &rate);
ok(hr == S_OK, "Failed to query fastest rate, hr %#x.\n", hr);
ok(rate == 1e6f, "Unexpected fastest rate %f.\n", rate);
hr = IMFRateSupport_GetFastestRate(rate_support, MFRATE_REVERSE, FALSE, &rate);
ok(hr == S_OK, "Failed to query fastest rate, hr %#x.\n", hr);
ok(rate == -1e6f, "Unexpected fastest rate %f.\n", rate);
hr = IMFRateSupport_GetFastestRate(rate_support, MFRATE_REVERSE, TRUE, &rate);
ok(hr == S_OK, "Failed to query fastest rate, hr %#x.\n", hr);
ok(rate == -1e6f, "Unexpected fastest rate %f.\n", rate);
hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_FORWARD, FALSE, &rate);
ok(hr == S_OK, "Failed to query slowest rate, hr %#x.\n", hr);
ok(rate == 0.0f, "Unexpected slowest rate %f.\n", rate);
hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_FORWARD, TRUE, &rate);
ok(hr == S_OK, "Failed to query slowest rate, hr %#x.\n", hr);
ok(rate == 0.0f, "Unexpected slowest rate %f.\n", rate);
hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_REVERSE, FALSE, &rate);
ok(hr == S_OK, "Failed to query slowest rate, hr %#x.\n", hr);
ok(rate == 0.0f, "Unexpected slowest rate %f.\n", rate);
hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_REVERSE, TRUE, &rate);
ok(hr == S_OK, "Failed to query slowest rate, hr %#x.\n", hr);
ok(rate == 0.0f, "Unexpected slowest rate %f.\n", rate);
hr = IMFRateSupport_IsRateSupported(rate_support, FALSE, 0.0f, NULL);
ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
hr = IMFRateSupport_IsRateSupported(rate_support, FALSE, 0.0f, &rate);
ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
ok(rate == 0.0f, "Unexpected rate %f.\n", rate);
hr = IMFRateSupport_IsRateSupported(rate_support, FALSE, 1.0f, &rate);
ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
ok(rate == 1.0f, "Unexpected rate %f.\n", rate);
hr = IMFRateSupport_IsRateSupported(rate_support, FALSE, -1.0f, &rate);
ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
ok(rate == -1.0f, "Unexpected rate %f.\n", rate);
hr = IMFRateSupport_IsRateSupported(rate_support, FALSE, 1e6f + 1.0f, &rate);
ok(hr == MF_E_UNSUPPORTED_RATE, "Unexpected hr %#x.\n", hr);
ok(rate == 1e6f + 1.0f || broken(rate == 1e6f) /* Win7 */, "Unexpected %f.\n", rate);
hr = IMFRateSupport_IsRateSupported(rate_support, FALSE, -1e6f, &rate);
ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
ok(rate == -1e6f, "Unexpected rate %f.\n", rate);
hr = IMFRateSupport_IsRateSupported(rate_support, FALSE, -1e6f - 1.0f, &rate);
ok(hr == MF_E_UNSUPPORTED_RATE, "Unexpected hr %#x.\n", hr);
ok(rate == -1e6f - 1.0f || broken(rate == -1e6f) /* Win7 */, "Unexpected rate %f.\n", rate);
check_service_interface(mediasource, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateControl, TRUE);
hr = IMFMediaSource_CreatePresentationDescriptor(mediasource, &descriptor);
ok(hr == S_OK, "Failed to get presentation descriptor, hr %#x.\n", hr);
......@@ -879,6 +938,8 @@ todo_wine
hr = IMFMediaSource_CreatePresentationDescriptor(mediasource, NULL);
ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr);
IMFRateSupport_Release(rate_support);
IMFGetService_Release(get_service);
IMFMediaSource_Release(mediasource);
IMFByteStream_Release(stream);
......
dlls/winegstreamer/media_source.c
View file @ 8a506ea9
......@@ -933,7 +933,7 @@ static HRESULT WINAPI media_source_rate_support_GetSlowestRate(IMFRateSupport *i
{
TRACE("%p, %d, %d, %p.\n", iface, direction, thin, rate);
*rate = direction == MFRATE_FORWARD ? 1.0f : -1.0f;
*rate = 0.0f;
return S_OK;
}
......@@ -942,21 +942,20 @@ static HRESULT WINAPI media_source_rate_support_GetFastestRate(IMFRateSupport *i
{
TRACE("%p, %d, %d, %p.\n", iface, direction, thin, rate);
*rate = direction == MFRATE_FORWARD ? 1.0f : -1.0f;
*rate = direction == MFRATE_FORWARD ? 1e6f : -1e6f;
return S_OK;
}
static HRESULT WINAPI media_source_rate_support_IsRateSupported(IMFRateSupport *iface, BOOL thin, float rate, float *nearest_support_rate)
static HRESULT WINAPI media_source_rate_support_IsRateSupported(IMFRateSupport *iface, BOOL thin, float rate,
float *nearest_rate)
{
const float supported_rate = rate >= 0.0f ? 1.0f : -1.0f;
TRACE("%p, %d, %f, %p.\n", iface, thin, rate, nearest_rate);
TRACE("%p, %d, %f, %p.\n", iface, thin, rate, nearest_support_rate);
if (nearest_rate)
*nearest_rate = rate;
if (nearest_support_rate)
*nearest_support_rate = supported_rate;
return rate == supported_rate ? S_OK : MF_E_UNSUPPORTED_RATE;
return rate >= -1e6f && rate <= 1e6f ? S_OK : MF_E_UNSUPPORTED_RATE;
}
static const IMFRateSupportVtbl media_source_rate_support_vtbl =
......
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