February 2020 - Wine-commits

Zebediah Figura : d3dcompiler/tests: Rewrite to use a separate d3d9 device for each test.
by Alexandre Julliard 28 Feb '20

28 Feb '20

Module: wine Branch: master Commit: 6f809561467eae4979bc3fada822f3daa578992e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f809561467eae4979bc3fad… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Feb 28 11:23:59 2020 +0100 d3dcompiler/tests: Rewrite to use a separate d3d9 device for each test. This brings the d3dcompiler tests more in line with existing d3d9 tests, and allows potentially running the tests in parallel. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/tests/Makefile.in | 2 +- dlls/d3dcompiler_43/tests/hlsl.c | 701 ---------------------------------- dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 678 ++++++++++++++++++++++++++++++++ dlls/d3dcompiler_47/tests/Makefile.in | 2 +- 4 files changed, 680 insertions(+), 703 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6f809561467eae4979bc…

1 0

Zebediah Figura : d3dcompiler/tests: Port some tests to shader model 4.
by Alexandre Julliard 28 Feb '20

28 Feb '20

Module: wine Branch: master Commit: 8ce03e2055ee3592912776a16eb5595d48a51ca2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ce03e2055ee3592912776a1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Feb 28 11:24:00 2020 +0100 d3dcompiler/tests: Port some tests to shader model 4. In particular, port those for which there is an interesting difference in code generation. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/tests/Makefile.in | 1 + dlls/d3dcompiler_43/tests/hlsl_d3d11.c | 562 +++++++++++++++++++++++++++++++++ dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 37 ++- dlls/d3dcompiler_47/tests/Makefile.in | 1 + 4 files changed, 585 insertions(+), 16 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8ce03e2055ee35929127…

1 0

Zebediah Figura : d3dcompiler/tests: Add a test for the comma operator.
by Alexandre Julliard 28 Feb '20

28 Feb '20

Module: wine Branch: master Commit: 1cea81d1044c4c8a6af833bdc49f1610eb00dc7f URL: https://source.winehq.org/git/wine.git/?a=commit;h=1cea81d1044c4c8a6af833bd… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Feb 28 11:24:01 2020 +0100 d3dcompiler/tests: Add a test for the comma operator. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c index 36ea9c3765..9bf3784c1d 100644 --- a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c @@ -574,6 +574,36 @@ static void test_trig(void) release_test_context(&test_context); } +static void test_comma(void) +{ + struct test_context test_context; + ID3D10Blob *ps_code = NULL; + struct vec4 v; + + static const char ps_source[] = + "float4 main(float x: TEXCOORD0): COLOR\n" + "{\n" + " float4 ret;\n" + " return (ret = float4(0.1, 0.2, 0.3, 0.4)), ret + 0.5;\n" + "}"; + + if (!init_test_context(&test_context)) + return; + + todo_wine ps_code = compile_shader(ps_source, "ps_2_0"); + if (ps_code) + { + draw_quad(test_context.device, ps_code); + + v = get_color_vec4(test_context.device, 0, 0); + ok(compare_vec4(&v, 0.6f, 0.7f, 0.8f, 0.9f, 0), + "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); + + ID3D10Blob_Release(ps_code); + } + release_test_context(&test_context); +} + static void test_fail(void) { static const char *tests[] = @@ -679,5 +709,6 @@ START_TEST(hlsl_d3d9) test_conditionals(); test_float_vectors(); test_trig(); + test_comma(); test_fail(); }

1 0

Matteo Bruni : wined3d: Optimize scanning changed texture states in wined3d_device_apply_stateblock().
by Alexandre Julliard 28 Feb '20

28 Feb '20

Module: wine Branch: master Commit: ebc96e32bdb721f549cf7d704c19b0d762d3f147 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ebc96e32bdb721f549cf7d70… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Feb 28 11:24:59 2020 +0100 wined3d: Optimize scanning changed texture states in wined3d_device_apply_stateblock(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e706c830d3..9478c459e0 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3951,12 +3951,13 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, } } - for (i = 0; i < ARRAY_SIZE(state->texture_states); ++i) + for (i = 0; i < ARRAY_SIZE(changed->textureState); ++i) { - for (j = 0; j < ARRAY_SIZE(state->texture_states[i]); ++j) + map = changed->textureState[i]; + while (map) { - if (changed->textureState[i] & (1u << j)) - wined3d_device_set_texture_stage_state(device, i, j, state->texture_states[i][j]); + j = wined3d_bit_scan(&map); + wined3d_device_set_texture_stage_state(device, i, j, state->texture_states[i][j]); } }

1 0

Matteo Bruni : wined3d: Optimize scanning changed sampler states in wined3d_device_apply_stateblock().
by Alexandre Julliard 28 Feb '20

28 Feb '20

Module: wine Branch: master Commit: fcd51de66b06fad6f74a0abfaab985bf7b92e4cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=fcd51de66b06fad6f74a0abf… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Feb 28 11:25:00 2020 +0100 wined3d: Optimize scanning changed sampler states in wined3d_device_apply_stateblock(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9478c459e0..863b483bab 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3961,15 +3961,17 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, } } - for (i = 0; i < ARRAY_SIZE(state->sampler_states); ++i) + for (i = 0; i < ARRAY_SIZE(changed->samplerState); ++i) { DWORD stage = i; + if (stage >= WINED3D_MAX_FRAGMENT_SAMPLERS) stage += WINED3DVERTEXTEXTURESAMPLER0 - WINED3D_MAX_FRAGMENT_SAMPLERS; - for (j = 0; j < ARRAY_SIZE(state->sampler_states[j]); ++j) + map = changed->samplerState[i]; + while (map) { - if (changed->samplerState[i] & (1 << j)) - wined3d_device_set_sampler_state(device, stage, j, state->sampler_states[i][j]); + j = wined3d_bit_scan(&map); + wined3d_device_set_sampler_state(device, stage, j, state->sampler_states[i][j]); } }

1 0

Matteo Bruni : wined3d: Optimize scanning changed stream states in wined3d_device_apply_stateblock().
by Alexandre Julliard 28 Feb '20

28 Feb '20

Module: wine Branch: master Commit: 02d3cfe0aee36f0228c44686cd34d564ee4f0f35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02d3cfe0aee36f0228c44686… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Feb 28 11:25:01 2020 +0100 wined3d: Optimize scanning changed stream states in wined3d_device_apply_stateblock(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 863b483bab..add20cc63e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3998,14 +3998,19 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, if (changed->scissorRect) wined3d_device_set_scissor_rects(device, 1, &state->scissor_rect); - for (i = 0; i < ARRAY_SIZE(state->streams); ++i) - { - if (changed->streamSource & (1u << i)) - wined3d_device_set_stream_source(device, i, state->streams[i].buffer, - state->streams[i].offset, state->streams[i].stride); - if (changed->streamFreq & (1u << i)) - wined3d_device_set_stream_source_freq(device, i, - state->streams[i].frequency | state->streams[i].flags); + map = changed->streamSource; + while (map) + { + i = wined3d_bit_scan(&map); + wined3d_device_set_stream_source(device, i, state->streams[i].buffer, + state->streams[i].offset, state->streams[i].stride); + } + map = changed->streamFreq; + while (map) + { + i = wined3d_bit_scan(&map); + wined3d_device_set_stream_source_freq(device, i, + state->streams[i].frequency | state->streams[i].flags); } for (i = 0; i < ARRAY_SIZE(state->textures); ++i)

1 0

Matteo Bruni : wined3d: Optimize scanning changed textures in wined3d_device_apply_stateblock().
by Alexandre Julliard 28 Feb '20

28 Feb '20

Module: wine Branch: master Commit: aa21b022bb79d945515b15e8293c043c8f77c979 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa21b022bb79d945515b15e8… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Feb 28 11:25:02 2020 +0100 wined3d: Optimize scanning changed textures in wined3d_device_apply_stateblock(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index add20cc63e..6474b02ccc 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3843,7 +3843,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, struct wined3d_color colour; struct wined3d_range range; BOOL set_blend_state; - DWORD map; + DWORD map, stage; TRACE("device %p, stateblock %p.\n", device, stateblock); @@ -3963,8 +3963,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, for (i = 0; i < ARRAY_SIZE(changed->samplerState); ++i) { - DWORD stage = i; - + stage = i; if (stage >= WINED3D_MAX_FRAGMENT_SAMPLERS) stage += WINED3DVERTEXTEXTURESAMPLER0 - WINED3D_MAX_FRAGMENT_SAMPLERS; map = changed->samplerState[i]; @@ -4013,13 +4012,14 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, state->streams[i].frequency | state->streams[i].flags); } - for (i = 0; i < ARRAY_SIZE(state->textures); ++i) + map = changed->textures; + while (map) { - DWORD stage = i; + i = wined3d_bit_scan(&map); + stage = i; if (stage >= WINED3D_MAX_FRAGMENT_SAMPLERS) stage += WINED3DVERTEXTEXTURESAMPLER0 - WINED3D_MAX_FRAGMENT_SAMPLERS; - if (changed->textures & (1u << i)) - wined3d_device_set_texture(device, stage, state->textures[i]); + wined3d_device_set_texture(device, stage, state->textures[i]); } for (i = 0; i < ARRAY_SIZE(state->clip_planes); ++i)

1 0

Matteo Bruni : wined3d: Optimize scanning changed clip planes in wined3d_device_apply_stateblock().
by Alexandre Julliard 28 Feb '20

28 Feb '20

Module: wine Branch: master Commit: ad5f230afc1535bb59d857f25c688949e64ca15f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad5f230afc1535bb59d857f2… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Feb 28 11:25:03 2020 +0100 wined3d: Optimize scanning changed clip planes in wined3d_device_apply_stateblock(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 7 ++++--- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6474b02ccc..660ba777ef 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4022,10 +4022,11 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, wined3d_device_set_texture(device, stage, state->textures[i]); } - for (i = 0; i < ARRAY_SIZE(state->clip_planes); ++i) + map = changed->clipplane; + while (map) { - if (changed->clipplane & (1u << i)) - wined3d_device_set_clip_plane(device, i, &state->clip_planes[i]); + i = wined3d_bit_scan(&map); + wined3d_device_set_clip_plane(device, i, &state->clip_planes[i]); } memset(&stateblock->changed, 0, sizeof(stateblock->changed)); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 15e376c832..744e647008 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3926,7 +3926,7 @@ struct wined3d_saved_states DWORD renderState[(WINEHIGHEST_RENDER_STATE >> 5) + 1]; DWORD textureState[WINED3D_MAX_TEXTURES]; /* WINED3D_HIGHEST_TEXTURE_STATE + 1, 18 */ WORD samplerState[WINED3D_MAX_COMBINED_SAMPLERS]; /* WINED3D_HIGHEST_SAMPLER_STATE + 1, 14 */ - DWORD clipplane; /* WINED3D_MAX_USER_CLIP_PLANES, 32 */ + DWORD clipplane; /* WINED3D_MAX_CLIP_DISTANCES, 8 */ DWORD textures : 20; /* WINED3D_MAX_COMBINED_SAMPLERS, 20 */ DWORD indices : 1; DWORD material : 1;

1 0

Nikolay Sivov : include: Add more Media Foundation error codes.
by Alexandre Julliard 28 Feb '20

28 Feb '20

Module: wine Branch: master Commit: 0e8ea983bc8ae96d98b695400ca1353d88ea4e1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e8ea983bc8ae96d98b69540… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 28 15:00:51 2020 +0300 include: Add more Media Foundation error codes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mferror.h | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/include/mferror.h b/include/mferror.h index 6341d832ab..523800d7f0 100644 --- a/include/mferror.h +++ b/include/mferror.h @@ -166,4 +166,46 @@ #define MF_E_CLOCK_NOT_SIMPLE _HRESULT_TYPEDEF_(0xc00d9c43) #define MF_S_CLOCK_STOPPED _HRESULT_TYPEDEF_(0x000d9c44) +#define MF_E_NO_MORE_DROP_MODES _HRESULT_TYPEDEF_(0xc00da028) +#define MF_E_NO_MORE_QUALITY_LEVELS _HRESULT_TYPEDEF_(0xc00da029) +#define MF_E_DROPTIME_NOT_SUPPORTED _HRESULT_TYPEDEF_(0xc00da02a) +#define MF_E_QUALITYKNOB_WAIT_LONGER _HRESULT_TYPEDEF_(0xc00da02b) +#define MF_E_QM_INVALIDSTATE _HRESULT_TYPEDEF_(0xc00da02c) + +#define MF_E_TRANSCODE_NO_CONTAINERTYPE _HRESULT_TYPEDEF_(0xc00da410) +#define MF_E_TRANSCODE_PROFILE_NO_MATCHING_STREAMS _HRESULT_TYPEDEF_(0xc00da411) +#define MF_E_TRANSCODE_NO_MATCHING_ENCODER _HRESULT_TYPEDEF_(0xc00da412) +#define MF_E_TRANSCODE_INVALID_PROFILE _HRESULT_TYPEDEF_(0xc00da413) + +#define MF_E_ALLOCATOR_NOT_INITIALIZED _HRESULT_TYPEDEF_(0xc00da7f8) +#define MF_E_ALLOCATOR_NOT_COMMITED _HRESULT_TYPEDEF_(0xc00da7f9) +#define MF_E_ALLOCATOR_ALREADY_COMMITED _HRESULT_TYPEDEF_(0xc00da7fa) +#define MF_E_STREAM_ERROR _HRESULT_TYPEDEF_(0xc00da7fb) +#define MF_E_INVALID_STREAM_STATE _HRESULT_TYPEDEF_(0xc00da7fc) +#define MF_E_HW_STREAM_NOT_CONNECTED _HRESULT_TYPEDEF_(0xc00da7fd) + +#define MF_E_NO_CAPTURE_DEVICES_AVAILABLE _HRESULT_TYPEDEF_(0xc00dabe0) +#define MF_E_CAPTURE_SINK_OUTPUT_NOT_SET _HRESULT_TYPEDEF_(0xc00dabe1) +#define MF_E_CAPTURE_SINK_MIRROR_ERROR _HRESULT_TYPEDEF_(0xc00dabe2) +#define MF_E_CAPTURE_SINK_ROTATE_ERROR _HRESULT_TYPEDEF_(0xc00dabe3) +#define MF_E_CAPTURE_ENGINE_INVALID_OP _HRESULT_TYPEDEF_(0xc00dabe4) +#define MF_E_CAPTURE_ENGINE_ALL_EFFECTS_REMOVED _HRESULT_TYPEDEF_(0xc00dabe5) +#define MF_E_CAPTURE_SOURCE_NO_INDEPENDENT_PHOTO_STREAM_PRESENT _HRESULT_TYPEDEF_(0xc00dabe6) +#define MF_E_CAPTURE_SOURCE_NO_VIDEO_STREAM_PRESENT _HRESULT_TYPEDEF_(0xc00dabe7) +#define MF_E_CAPTURE_SOURCE_NO_AUDIO_STREAM_PRESENT _HRESULT_TYPEDEF_(0xc00dabe8) +#define MF_E_CAPTURE_SOURCE_DEVICE_EXTENDEDPROP_OP_IN_PROGRESS _HRESULT_TYPEDEF_(0xc00dabe9) +#define MF_E_CAPTURE_PROPERTY_SET_DURING_PHOTO _HRESULT_TYPEDEF_(0xc00dabea) +#define MF_E_CAPTURE_NO_SAMPLES_IN_QUEUE _HRESULT_TYPEDEF_(0xc00dabeb) +#define MF_E_HW_ACCELERATED_THUMBNAIL_NOT_SUPPORTED _HRESULT_TYPEDEF_(0xc00dabec) +#define MF_E_UNSUPPORTED_CAPTURE_DEVICE_PRESENT _HRESULT_TYPEDEF_(0xc00dabed) + +#define MF_E_TIMELINECONTROLLER_UNSUPPORTED_SOURCE_TYPE _HRESULT_TYPEDEF_(0xc00dafc8) +#define MF_E_TIMELINECONTROLLER_NOT_ALLOWED _HRESULT_TYPEDEF_(0xc00dafc9) +#define MF_E_TIMELINECONTROLLER_CANNOT_ATTACH _HRESULT_TYPEDEF_(0xc00dafca) + +#define MF_E_MEDIA_EXTENSION_APPSERVICE_CONNECTION_FAILED _HRESULT_TYPEDEF_(0xc00db3b0) +#define MF_E_MEDIA_EXTENSION_APPSERVICE_REQUEST_FAILED _HRESULT_TYPEDEF_(0xc00db3b1) +#define MF_E_MEDIA_EXTENSION_PACKAGE_INTEGRITY_CHECK_FAILED _HRESULT_TYPEDEF_(0xc00db3b2) +#define MF_E_MEDIA_EXTENSION_PACKAGE_LICENSE_INVALID _HRESULT_TYPEDEF_(0xc00db3b3) + #endif /* __WINE_MFERROR_H */

1 0

Nikolay Sivov : mf: Add support for returning slowest/fastest rates for session.
by Alexandre Julliard 28 Feb '20

28 Feb '20

Module: wine Branch: master Commit: f4280cc04defcf9404e74f702a010f35d9ffdfb2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4280cc04defcf9404e74f70… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 28 15:00:52 2020 +0300 mf: Add support for returning slowest/fastest rates for session. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 58 insertions(+), 4 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 5ee4074379..2ef4b01028 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -17,6 +17,7 @@ */ #include <stdarg.h> +#include <math.h> #define COBJMACROS @@ -1447,20 +1448,73 @@ static ULONG WINAPI session_rate_support_Release(IMFRateSupport *iface) return IMFMediaSession_Release(&session->IMFMediaSession_iface); } +static void session_presentation_object_get_rate(IUnknown *object, MFRATE_DIRECTION direction, + BOOL thin, BOOL fastest, float *result) +{ + IMFRateSupport *rate_support; + float rate; + + if (SUCCEEDED(MFGetService(object, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, (void **)&rate_support))) + { + rate = 0.0f; + if (fastest) + { + if (SUCCEEDED(IMFRateSupport_GetFastestRate(rate_support, direction, thin, &rate))) + *result = min(fabsf(rate), *result); + } + else + { + if (SUCCEEDED(IMFRateSupport_GetSlowestRate(rate_support, direction, thin, &rate))) + *result = max(fabsf(rate), *result); + } + + IMFRateSupport_Release(rate_support); + } +} + +static HRESULT session_get_presentation_rate(struct media_session *session, MFRATE_DIRECTION direction, + BOOL thin, BOOL fastest, float *result) +{ + struct media_source *source; + struct media_sink *sink; + + *result = 0.0f; + + EnterCriticalSection(&session->cs); + + LIST_FOR_EACH_ENTRY(source, &session->presentation.sources, struct media_source, entry) + { + session_presentation_object_get_rate((IUnknown *)source->source, direction, thin, fastest, result); + } + + LIST_FOR_EACH_ENTRY(sink, &session->presentation.sinks, struct media_sink, entry) + { + session_presentation_object_get_rate((IUnknown *)sink->sink, direction, thin, fastest, result); + } + + LeaveCriticalSection(&session->cs); + + return S_OK; +} + static HRESULT WINAPI session_rate_support_GetSlowestRate(IMFRateSupport *iface, MFRATE_DIRECTION direction, BOOL thin, float *rate) { - FIXME("%p, %d, %d, %p.\n", iface, direction, thin, rate); + struct media_session *session = impl_session_from_IMFRateSupport(iface); - return E_NOTIMPL; + TRACE("%p, %d, %d, %p.\n", iface, direction, thin, rate); + + return session_get_presentation_rate(session, direction, thin, FALSE, rate); } static HRESULT WINAPI session_rate_support_GetFastestRate(IMFRateSupport *iface, MFRATE_DIRECTION direction, BOOL thin, float *rate) { - FIXME("%p, %d, %d, %p.\n", iface, direction, thin, rate); + struct media_session *session = impl_session_from_IMFRateSupport(iface); - return E_NOTIMPL; + TRACE("%p, %d, %d, %p.\n", iface, direction, thin, rate); + + return session_get_presentation_rate(session, direction, thin, TRUE, rate); } static HRESULT WINAPI session_rate_support_IsRateSupported(IMFRateSupport *iface, BOOL thin, float rate,

1 0