marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mf: Fix returned session rates when pipeline objects don't support rate control. 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
feature/deterministic
Nikolay Sivov 2020-03-27 17:17:33 +03:00 committed by Alexandre Julliard
parent 5ef6ecb3aa
commit 3e12d29c87
1 changed files with 41 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
dlls/mf/session.c
View File

@ -2805,28 +2805,41 @@ static ULONG WINAPI session_rate_support_Release(IMFRateSupport *iface)
return IMFMediaSession_Release(&session->IMFMediaSession_iface); return IMFMediaSession_Release(&session->IMFMediaSession_iface);
} }
static void session_presentation_object_get_rate(IUnknown *object, MFRATE_DIRECTION direction, static HRESULT session_presentation_object_get_rate(IUnknown *object, MFRATE_DIRECTION direction,
BOOL thin, BOOL fastest, float *result) BOOL thin, BOOL fastest, float *result)
{ {
IMFRateSupport *rate_support; IMFRateSupport *rate_support;
float rate; float rate;
HRESULT hr;
if (SUCCEEDED(MFGetService(object, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, (void **)&rate_support))) /* For objects that don't support rate control, it's assumed that only forward direction is allowed, at 1.0f. */
if (FAILED(hr = MFGetService(object, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, (void **)&rate_support)))
{ {
rate = 0.0f; if (direction == MFRATE_FORWARD)
if (fastest)
{ {
if (SUCCEEDED(IMFRateSupport_GetFastestRate(rate_support, direction, thin, &rate))) *result = 1.0f;
*result = min(fabsf(rate), *result); return S_OK;
} }
else else
{ return MF_E_REVERSE_UNSUPPORTED;
if (SUCCEEDED(IMFRateSupport_GetSlowestRate(rate_support, direction, thin, &rate)))
*result = max(fabsf(rate), *result);
}
IMFRateSupport_Release(rate_support);
} }
rate = 0.0f;
if (fastest)
{
if (SUCCEEDED(hr = IMFRateSupport_GetFastestRate(rate_support, direction, thin, &rate)))
*result = min(fabsf(rate), *result);
}
else
{
if (SUCCEEDED(hr = IMFRateSupport_GetSlowestRate(rate_support, direction, thin, &rate)))
*result = max(fabsf(rate), *result);
}
IMFRateSupport_Release(rate_support);
return hr;
} }
static HRESULT session_get_presentation_rate(struct media_session *session, MFRATE_DIRECTION direction, static HRESULT session_get_presentation_rate(struct media_session *session, MFRATE_DIRECTION direction,
@ -2834,24 +2847,33 @@ static HRESULT session_get_presentation_rate(struct media_session *session, MFRA
{ {
struct media_source *source; struct media_source *source;
struct media_sink *sink; struct media_sink *sink;
HRESULT hr = E_POINTER;
*result = 0.0f; *result = 0.0f;
EnterCriticalSection(&session->cs); EnterCriticalSection(&session->cs);
LIST_FOR_EACH_ENTRY(source, &session->presentation.sources, struct media_source, entry) if (session->presentation.topo_status != MF_TOPOSTATUS_INVALID)
{ {
session_presentation_object_get_rate((IUnknown *)source->source, direction, thin, fastest, result); LIST_FOR_EACH_ENTRY(source, &session->presentation.sources, struct media_source, entry)
} {
if (FAILED(hr = session_presentation_object_get_rate((IUnknown *)source->source, direction, thin, fastest, result)))
break;
}
LIST_FOR_EACH_ENTRY(sink, &session->presentation.sinks, struct media_sink, entry) if (SUCCEEDED(hr))
{ {
session_presentation_object_get_rate((IUnknown *)sink->sink, direction, thin, fastest, result); LIST_FOR_EACH_ENTRY(sink, &session->presentation.sinks, struct media_sink, entry)
{
if (FAILED(hr = session_presentation_object_get_rate((IUnknown *)sink->sink, direction, thin, fastest, result)))
break;
}
}
} }
LeaveCriticalSection(&session->cs); LeaveCriticalSection(&session->cs);
return S_OK; return hr;
} }
static HRESULT WINAPI session_rate_support_GetSlowestRate(IMFRateSupport *iface, MFRATE_DIRECTION direction, static HRESULT WINAPI session_rate_support_GetSlowestRate(IMFRateSupport *iface, MFRATE_DIRECTION direction,