November 2020 - Wine-commits

Piotr Caban : msvcrt: Remove traces from printf.
by Alexandre Julliard 23 Nov '20

23 Nov '20

Module: wine Branch: master Commit: 1b053519755242a561feec91df4a60f07c322c3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b053519755242a561feec91… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 23 14:01:27 2020 +0100 msvcrt: Remove traces from printf. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/printf.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index f8b200c7e54..3be60db369b 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -601,8 +601,6 @@ static inline int FUNC_NAME(pf_output_fp)(FUNC_NAME(puts_clbk) pf_puts, void *pu ULONGLONG m; DWORD l; - TRACE("floating point argument: %.16le\n", v); - if(flags->Precision == -1) flags->Precision = 6; @@ -973,8 +971,6 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API BOOL standard_rounding = FALSE; #endif - TRACE("Format is: %s\n", FUNC_NAME(debugstr)(fmt)); - if (!MSVCRT_CHECK_PMT(fmt != NULL)) return -1;

1 0

Robert Wilhelm : vbscript: Support property set with parameters.
by Alexandre Julliard 23 Nov '20

23 Nov '20

Module: wine Branch: master Commit: c39cd37383f402286c79a58e064adb98c0e7c6dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=c39cd37383f402286c79a58e… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Sat Nov 21 10:27:32 2020 +0100 vbscript: Support property set with parameters. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=33996 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/interp.c | 11 +++-------- dlls/vbscript/parser.y | 2 +- dlls/vbscript/tests/lang.vbs | 16 ++++++++++++++++ 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 560d3b16e69..11d95e57758 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -988,12 +988,7 @@ static HRESULT interp_set_member(exec_ctx_t *ctx) TRACE("%s\n", debugstr_w(identifier)); - if(arg_cnt) { - FIXME("arguments not supported\n"); - return E_NOTIMPL; - } - - hres = stack_assume_disp(ctx, 1, &obj); + hres = stack_assume_disp(ctx, arg_cnt+1, &obj); if(FAILED(hres)) return hres; @@ -1002,7 +997,7 @@ static HRESULT interp_set_member(exec_ctx_t *ctx) return E_FAIL; } - hres = stack_assume_disp(ctx, 0, NULL); + hres = stack_assume_disp(ctx, arg_cnt, NULL); if(FAILED(hres)) return hres; @@ -1014,7 +1009,7 @@ static HRESULT interp_set_member(exec_ctx_t *ctx) if(FAILED(hres)) return hres; - stack_popn(ctx, 2); + stack_popn(ctx, arg_cnt+2); return S_OK; } diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 8f1c1307794..034baffa4dd 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -456,7 +456,7 @@ PropertyDecl { $$ = new_function_decl(ctx, $4, FUNC_PROPGET, $1, $5, $7); CHECK_ERROR; } | Storage_opt tPROPERTY tLET Identifier '(' ArgumentDeclList ')' StSep BodyStatements tEND tPROPERTY { $$ = new_function_decl(ctx, $4, FUNC_PROPLET, $1, $6, $9); CHECK_ERROR; } - | Storage_opt tPROPERTY tSET Identifier '(' ArgumentDecl ')' StSep BodyStatements tEND tPROPERTY + | Storage_opt tPROPERTY tSET Identifier '(' ArgumentDeclList ')' StSep BodyStatements tEND tPROPERTY { $$ = new_function_decl(ctx, $4, FUNC_PROPSET, $1, $6, $9); CHECK_ERROR; } FunctionDecl diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index ed89906c9cf..419a4349896 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1772,6 +1772,17 @@ end class Class TestPropParam Public oDict + Public gotNothing + Public m_obj + + Public Property Set bar(obj) + Set m_obj = obj + End Property + Public Property Set foo(par,obj) + Set m_obj = obj + if obj is Nothing Then gotNothing = True + oDict = par + End Property Public Property Let Key(oldKey,newKey) oDict = oldKey & newKey End Property @@ -1790,6 +1801,11 @@ x.three(1,2) = 3 call ok(x.oDict = "123","x.oDict = " & x.oDict & " expected 123") x.ten(1,2,3,4,5,6,7,8,9) = 0 call ok(x.oDict = "1234567890","x.oDict = " & x.oDict & " expected 1234567890") +Set x.bar = Nothing +call ok(x.gotNothing=Empty,"x.gotNothing = " & x.gotNothing & " expected Empty") +Set x.foo("123") = Nothing +call ok(x.oDict = "123","x.oDict = " & x.oDict & " expected 123") +call ok(x.gotNothing=True,"x.gotNothing = " & x.gotNothing & " expected true") set x = new TestPropSyntax set x.prop = new TestPropSyntax

1 0

Liam Middlebrook : winevulkan: Make_vulkan handle VkDeviceAddress basetype.
by Alexandre Julliard 23 Nov '20

23 Nov '20

Module: wine Branch: master Commit: b84d11d18e867ab78bb7a28cdd37e46e385a84e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b84d11d18e867ab78bb7a28c… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Mon Nov 23 05:56:48 2020 -0800 winevulkan: Make_vulkan handle VkDeviceAddress basetype. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Daniel Koch <dkoch(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 6675a813c05..336f09f125e 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1387,7 +1387,7 @@ class VkParam(object): self.format_conv = "wine_dbgstr_longlong({0})" elif self.type in ["uint16_t", "uint32_t", "VkBool32"]: self.format_str = "%u" - elif self.type in ["uint64_t", "VkDeviceSize"]: + elif self.type in ["uint64_t", "VkDeviceAddress", "VkDeviceSize"]: self.format_str = "0x%s" self.format_conv = "wine_dbgstr_longlong({0})" elif self.type == "HANDLE":

1 0

Liam Middlebrook : winevulkan: Update to VK spec version 1.2.162.
by Alexandre Julliard 23 Nov '20

23 Nov '20

Module: wine Branch: master Commit: 7d8c50e4371f2fc5300b90b323210c922d80d4e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d8c50e4371f2fc5300b90b3… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Mon Nov 23 05:56:49 2020 -0800 winevulkan: Update to VK spec version 1.2.162. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Daniel Koch <dkoch(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.c | 616 +++++++++- dlls/winevulkan/vulkan_thunks.h | 245 +++- dlls/winevulkan/winevulkan.json | 2 +- include/wine/vulkan.h | 2552 +++++++++++++++++++++++---------------- 5 files changed, 2317 insertions(+), 1100 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7d8c50e4371f2fc5300b…

1 0

Nikolay Sivov : mf/tests: Relax error code test for IsMediaTypeSupported() of SAR.
by Alexandre Julliard 23 Nov '20

23 Nov '20

Module: wine Branch: master Commit: 73c3c8e0315182acfc3cd3154e0b6ff9b3012a2d URL: https://source.winehq.org/git/wine.git/?a=commit;h=73c3c8e0315182acfc3cd315… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 23 17:34:34 2020 +0300 mf/tests: Relax error code test for IsMediaTypeSupported() of SAR. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 27e859fa82d..117e2d2e785 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -3106,11 +3106,17 @@ todo_wine hr = MFCreateMediaType(&mediatype); ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); + /* Actual return value is MF_E_ATRIBUTENOTFOUND triggered by missing MF_MT_MAJOR_TYPE */ hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, mediatype, NULL); -todo_wine - ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#x.\n", hr); + ok(FAILED(hr), "Unexpected hr %#x.\n", hr); - IMFMediaType_SetGUID(mediatype, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); + hr = IMFMediaType_SetGUID(mediatype, &MF_MT_MAJOR_TYPE, &MFMediaType_Video); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, mediatype, NULL); + ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaType_SetGUID(mediatype, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, mediatype, NULL); ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#x.\n", hr);

1 0

Nikolay Sivov : mf/tests: Add another test for SAR time source.
by Alexandre Julliard 23 Nov '20

23 Nov '20

Module: wine Branch: master Commit: 95f3bed3266ccb5618074e5785535730abaf1acc URL: https://source.winehq.org/git/wine.git/?a=commit;h=95f3bed3266ccb5618074e57… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 23 17:34:35 2020 +0300 mf/tests: Add another test for SAR time source. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 117e2d2e785..41ca385cc2b 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2925,11 +2925,11 @@ static void test_sar(void) { IMFPresentationClock *present_clock, *present_clock2; IMFMediaType *mediatype, *mediatype2, *mediatype3; + IMFClockStateSink *state_sink, *state_sink2; IMFMediaTypeHandler *handler, *handler2; IMFPresentationTimeSource *time_source; IMFSimpleAudioVolume *simple_volume; IMFAudioStreamVolume *stream_volume; - IMFClockStateSink *state_sink; IMFMediaSink *sink, *sink2; IMFStreamSink *stream_sink; IMFAttributes *attributes; @@ -2967,6 +2967,14 @@ todo_wine if (SUCCEEDED(hr)) { + hr = IMFPresentationTimeSource_QueryInterface(time_source, &IID_IMFClockStateSink, (void **)&state_sink2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFPresentationTimeSource_QueryInterface(time_source, &IID_IMFClockStateSink, (void **)&state_sink); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(state_sink == state_sink2, "Unexpected clock sink.\n"); + IMFClockStateSink_Release(state_sink2); + IMFClockStateSink_Release(state_sink); + hr = IMFPresentationTimeSource_GetUnderlyingClock(time_source, &clock); ok(hr == MF_E_NO_CLOCK, "Unexpected hr %#x.\n", hr); @@ -3008,6 +3016,9 @@ if (SUCCEEDED(hr)) check_interface(sink, &IID_IMFMediaSinkPreroll, TRUE); check_interface(sink, &IID_IMFMediaEventGenerator, TRUE); check_interface(sink, &IID_IMFClockStateSink, TRUE); + check_interface(sink, &IID_IMFGetService, TRUE); + todo_wine check_interface(sink, &IID_IMFPresentationTimeSource, TRUE); + check_service_interface(sink, &MR_POLICY_VOLUME_SERVICE, &IID_IMFSimpleAudioVolume, TRUE); /* Clock */ hr = IMFMediaSink_QueryInterface(sink, &IID_IMFClockStateSink, (void **)&state_sink); @@ -3057,6 +3068,8 @@ todo_wine ok(hr == S_OK, "Failed to get a stream, hr %#x.\n", hr); check_interface(stream_sink, &IID_IMFMediaEventGenerator, TRUE); + check_interface(stream_sink, &IID_IMFMediaTypeHandler, TRUE); + todo_wine check_interface(stream_sink, &IID_IMFGetService, TRUE); hr = IMFStreamSink_GetIdentifier(stream_sink, &id); ok(hr == S_OK, "Unexpected hr %#x.\n", hr);

1 0

Nikolay Sivov : mf/session: Fix comment for the stop helper.
by Alexandre Julliard 23 Nov '20

23 Nov '20

Module: wine Branch: master Commit: 98f5112c1a57e4eb2dd0d09a12d3db2651586d8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=98f5112c1a57e4eb2dd0d09a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 23 17:34:36 2020 +0300 mf/session: Fix comment for the stop helper. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 19da9a24464..6d4b58289d8 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -1022,7 +1022,7 @@ static void session_pause(struct media_session *session) { case SESSION_STATE_STARTED: - /* Transition in two steps - pause clock, wait for sinks and pause sources. */ + /* Transition in two steps - pause the clock, wait for sinks, then pause sources. */ if (SUCCEEDED(hr = IMFPresentationClock_Pause(session->clock))) session->state = SESSION_STATE_PAUSING_SINKS; @@ -1061,7 +1061,7 @@ static void session_stop(struct media_session *session) case SESSION_STATE_STARTED: case SESSION_STATE_PAUSED: - /* Transition in two steps - pause clock, wait for sinks and pause sources. */ + /* Transition in two steps - stop the clock, wait for sinks, then stop sources. */ IMFPresentationClock_GetTime(session->clock, &session->presentation.clock_stop_time); if (SUCCEEDED(hr = IMFPresentationClock_Stop(session->clock))) session->state = SESSION_STATE_STOPPING_SINKS;

1 0

Nikolay Sivov : mf/evr: Translate EC_DISPLAY_CHANGED notification to MEStreamSinkDeviceChanged events.
by Alexandre Julliard 23 Nov '20

23 Nov '20

Module: wine Branch: master Commit: d19467a8b3b2aed880cd6215b6dce47bf651e5d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d19467a8b3b2aed880cd6215… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 23 17:34:37 2020 +0300 mf/evr: Translate EC_DISPLAY_CHANGED notification to MEStreamSinkDeviceChanged events. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 47a506a94c6..3479bade251 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -2137,6 +2137,12 @@ static HRESULT WINAPI video_renderer_event_sink_Notify(IMediaEventSink *iface, L MEStreamSinkRequestSample, &GUID_NULL, S_OK, NULL); } } + else if (event == EC_DISPLAY_CHANGED) + { + for (idx = 0; idx < renderer->stream_count; ++idx) + IMFMediaEventQueue_QueueEventParamVar(renderer->streams[idx]->event_queue, + MEStreamSinkDeviceChanged, &GUID_NULL, S_OK, NULL); + } else if (event >= EC_USER) { PROPVARIANT code;

1 0

Nikolay Sivov : evr/tests: Add some tests for presenter quality control.
by Alexandre Julliard 23 Nov '20

23 Nov '20

Module: wine Branch: master Commit: 22d77e4327212dbd4df572850f3aee12cc67d40e URL: https://source.winehq.org/git/wine.git/?a=commit;h=22d77e4327212dbd4df57285… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 23 17:35:03 2020 +0300 evr/tests: Add some tests for presenter quality control. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/tests/evr.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index bebffada509..2740f2263f0 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1165,6 +1165,7 @@ static void test_default_presenter(void) check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFGetService, TRUE); check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoDeviceID, TRUE); check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFQualityAdvise, TRUE); + todo_wine check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFQualityAdviseLimits, TRUE); check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFTransform, FALSE); check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IDirect3DDeviceManager9, TRUE); check_service_interface(presenter, &MR_VIDEO_ACCELERATION_SERVICE, &IID_IDirect3DDeviceManager9, TRUE); @@ -2010,6 +2011,67 @@ static void test_presenter_video_window(void) DestroyWindow(window); } +static void test_presenter_quality_control(void) +{ + IMFQualityAdviseLimits *qa_limits; + IMFVideoPresenter *presenter; + MF_QUALITY_DROP_MODE mode; + IMFQualityAdvise *advise; + MF_QUALITY_LEVEL level; + HRESULT hr; + + hr = MFCreateVideoPresenter(NULL, &IID_IDirect3DDevice9, &IID_IMFVideoPresenter, (void **)&presenter); + ok(hr == S_OK, "Failed to create default presenter, hr %#x.\n", hr); + + hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFQualityAdviseLimits, (void **)&qa_limits); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFQualityAdvise, (void **)&advise); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + +if (qa_limits) +{ + hr = IMFQualityAdviseLimits_GetMaximumDropMode(qa_limits, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFQualityAdviseLimits_GetMaximumDropMode(qa_limits, &mode); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(mode == MF_DROP_MODE_NONE, "Unexpected mode %d.\n", mode); + + hr = IMFQualityAdviseLimits_GetMinimumQualityLevel(qa_limits, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFQualityAdviseLimits_GetMinimumQualityLevel(qa_limits, &level); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(level == MF_QUALITY_NORMAL, "Unexpected level %d.\n", level); + + IMFQualityAdviseLimits_Release(qa_limits); +} + +todo_wine { + mode = 1; + hr = IMFQualityAdvise_GetDropMode(advise, &mode); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(mode == MF_DROP_MODE_NONE, "Unexpected mode %d.\n", mode); + + level = 1; + hr = IMFQualityAdvise_GetQualityLevel(advise, &level); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(level == MF_QUALITY_NORMAL, "Unexpected mode %d.\n", level); + + hr = IMFQualityAdvise_SetDropMode(advise, MF_DROP_MODE_1); + ok(hr == MF_E_NO_MORE_DROP_MODES, "Unexpected hr %#x.\n", hr); + + hr = IMFQualityAdvise_SetQualityLevel(advise, MF_QUALITY_NORMAL_MINUS_1); + ok(hr == MF_E_NO_MORE_QUALITY_LEVELS, "Unexpected hr %#x.\n", hr); +} + + IMFQualityAdvise_Release(advise); + + IMFVideoPresenter_Release(presenter); +} + static void test_mixer_output_rectangle(void) { IMFVideoMixerControl *mixer_control; @@ -2511,6 +2573,7 @@ START_TEST(evr) test_presenter_native_video_size(); test_presenter_ar_mode(); test_presenter_video_window(); + test_presenter_quality_control(); test_mixer_output_rectangle(); test_mixer_zorder(); test_mixer_samples();

1 0

Nikolay Sivov : mfreadwrite/reader: Alternate between selected streams for MF_SOURCE_READER_ANY_STREAM requests.
by Alexandre Julliard 23 Nov '20

23 Nov '20

Module: wine Branch: master Commit: 1fceb1213992b79aa7f1a5dc0a72ab3756ee524d URL: https://source.winehq.org/git/wine.git/?a=commit;h=1fceb1213992b79aa7f1a5dc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 23 17:35:56 2020 +0300 mfreadwrite/reader: Alternate between selected streams for MF_SOURCE_READER_ANY_STREAM requests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/reader.c | 68 +++++++++++++++++------------------------ dlls/mfreadwrite/tests/mfplat.c | 10 +++--- 2 files changed, 32 insertions(+), 46 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index cc1b29a2b6a..7aa8f65df7a 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -101,7 +101,6 @@ enum media_stream_flags STREAM_FLAG_SAMPLE_REQUESTED = 0x1, /* Protects from making multiple sample requests. */ STREAM_FLAG_SELECTED = 0x2, /* Mirrors descriptor, used to simplify tests when starting the source. */ STREAM_FLAG_PRESENTED = 0x4, /* Set if stream was selected last time Start() was called. */ - STREAM_FLAG_REQUESTED_ONCE = 0x8, /* Used for MF_SOURCE_READER_ANY_STREAM in synchronous mode. */ }; struct media_stream @@ -109,7 +108,7 @@ struct media_stream IMFMediaStream *stream; IMFMediaType *current; IMFTransform *decoder; - DWORD id; + unsigned int id; unsigned int index; enum media_stream_state state; unsigned int flags; @@ -169,13 +168,14 @@ struct source_reader LONG refcount; IMFMediaSource *source; IMFPresentationDescriptor *descriptor; - DWORD first_audio_stream_index; - DWORD first_video_stream_index; IMFSourceReaderCallback *async_callback; + unsigned int first_audio_stream_index; + unsigned int first_video_stream_index; + unsigned int last_read_index; + unsigned int stream_count; unsigned int flags; enum media_source_state source_state; struct media_stream *streams; - DWORD stream_count; struct list responses; CRITICAL_SECTION cs; CONDITION_VARIABLE sample_event; @@ -393,7 +393,7 @@ static HRESULT source_reader_request_sample(struct source_reader *reader, struct WARN("Sample request failed, hr %#x.\n", hr); else { - stream->flags |= (STREAM_FLAG_SAMPLE_REQUESTED | STREAM_FLAG_REQUESTED_ONCE); + stream->flags |= STREAM_FLAG_SAMPLE_REQUESTED; } } @@ -988,39 +988,42 @@ static BOOL source_reader_get_read_result(struct source_reader *reader, struct m return !request_sample; } -static HRESULT source_reader_get_first_selected_stream(struct source_reader *reader, unsigned int flags, - unsigned int *stream_index) +static HRESULT source_reader_get_next_selected_stream(struct source_reader *reader, unsigned int *stream_index) { - unsigned int i, first_selected = ~0u; + unsigned int i, start_idx, stop_idx, first_selected = ~0u, requests = ~0u; BOOL selected, stream_drained; - for (i = 0; i < reader->stream_count; ++i) + start_idx = (reader->last_read_index + 1) % reader->stream_count; + stop_idx = reader->last_read_index == ~0u ? reader->stream_count : reader->last_read_index; + + for (i = start_idx; i < reader->stream_count && i != stop_idx; i = (i + 1) % (reader->stream_count + 1)) { stream_drained = reader->streams[i].state == STREAM_STATE_EOS && !reader->streams[i].responses; selected = SUCCEEDED(source_reader_get_stream_selection(reader, i, &selected)) && selected; - if (selected && !(reader->streams[i].flags & flags)) + if (selected) { if (first_selected == ~0u) first_selected = i; - if (!stream_drained) + /* Try to balance pending reads. */ + if (!stream_drained && reader->streams[i].requests < requests) { + requests = reader->streams[i].requests; *stream_index = i; - break; } } } - /* If all selected streams reached EOS, use first selected. This fallback only applies after reader went through all - selected streams once. */ - if (i == reader->stream_count && first_selected != ~0u && !flags) + /* If all selected streams reached EOS, use first selected. */ + if (first_selected != ~0u) { - *stream_index = first_selected; - i = first_selected; + if (requests == ~0u) + *stream_index = first_selected; + reader->last_read_index = *stream_index; } - return i == reader->stream_count ? MF_E_MEDIA_SOURCE_NO_STREAMS_SELECTED : S_OK; + return first_selected == ~0u ? MF_E_MEDIA_SOURCE_NO_STREAMS_SELECTED : S_OK; } static HRESULT source_reader_get_stream_read_index(struct source_reader *reader, unsigned int index, unsigned int *stream_index) @@ -1037,18 +1040,7 @@ static HRESULT source_reader_get_stream_read_index(struct source_reader *reader, *stream_index = reader->first_audio_stream_index; break; case MF_SOURCE_READER_ANY_STREAM: - if (reader->async_callback) - { - /* Pick first selected stream. */ - hr = source_reader_get_first_selected_stream(reader, 0, stream_index); - } - else - { - /* Cycle through all selected streams once, next pick first selected. */ - if (FAILED(hr = source_reader_get_first_selected_stream(reader, STREAM_FLAG_REQUESTED_ONCE, stream_index))) - hr = source_reader_get_first_selected_stream(reader, 0, stream_index); - } - return hr; + return source_reader_get_next_selected_stream(reader, stream_index); default: *stream_index = index; } @@ -1339,8 +1331,7 @@ static HRESULT WINAPI src_reader_SetStreamSelection(IMFSourceReader *iface, DWOR if (!selection_changed) { source_reader_get_stream_selection(reader, i, &selected); - if (selected ^ selection) - selection_changed = TRUE; + selection_changed = !!(selected ^ selection); } if (selection) @@ -1364,8 +1355,7 @@ static HRESULT WINAPI src_reader_SetStreamSelection(IMFSourceReader *iface, DWOR } source_reader_get_stream_selection(reader, index, &selected); - if (selected ^ selection) - selection_changed = TRUE; + selection_changed = !!(selected ^ selection); if (selection) hr = IMFPresentationDescriptor_SelectStream(reader->descriptor, index); @@ -1373,11 +1363,8 @@ static HRESULT WINAPI src_reader_SetStreamSelection(IMFSourceReader *iface, DWOR hr = IMFPresentationDescriptor_DeselectStream(reader->descriptor, index); } - if (SUCCEEDED(hr) && selection_changed) - { - for (i = 0; i < reader->stream_count; ++i) - reader->streams[i].flags &= ~STREAM_FLAG_REQUESTED_ONCE; - } + if (selection_changed) + reader->last_read_index = ~0u; LeaveCriticalSection(&reader->cs); @@ -2135,6 +2122,7 @@ static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttri /* At least one major type has to be set. */ object->first_audio_stream_index = reader_get_first_stream_index(object->descriptor, &MFMediaType_Audio); object->first_video_stream_index = reader_get_first_stream_index(object->descriptor, &MFMediaType_Video); + object->last_read_index = ~0u; if (object->first_audio_stream_index == MF_SOURCE_READER_INVALID_STREAM_INDEX && object->first_video_stream_index == MF_SOURCE_READER_INVALID_STREAM_INDEX) diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index 2a6e3a1cc36..8455ac64688 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -886,13 +886,12 @@ static void test_source_reader_from_media_source(void) hr = IMFSourceReader_SetStreamSelection(reader, 2, TRUE); ok(hr == S_OK, "Failed to select a stream, hr %#x.\n", hr); - for (i = 0; i < 2 * TEST_SOURCE_NUM_STREAMS; ++i) + for (i = 0; i < TEST_SOURCE_NUM_STREAMS + 1; ++i) { hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_ANY_STREAM, 0, &actual_index, &stream_flags, &timestamp, &sample); ok(hr == S_OK, "Failed to get a sample, hr %#x.\n", hr); - ok(actual_index == (i < TEST_SOURCE_NUM_STREAMS ? i : 0), "%d: Unexpected stream index %u\n", - i, actual_index); + ok(actual_index == i % TEST_SOURCE_NUM_STREAMS, "%d: Unexpected stream index %u\n", i, actual_index); ok(!stream_flags, "Unexpected stream flags %#x.\n", stream_flags); ok(timestamp == 123, "Unexpected timestamp.\n"); ok(!!sample, "Expected sample object.\n"); @@ -905,13 +904,12 @@ static void test_source_reader_from_media_source(void) hr = IMFSourceReader_SetStreamSelection(reader, 0, TRUE); ok(hr == S_OK, "Failed to select a stream, hr %#x.\n", hr); - for (i = 0; i < 2 * TEST_SOURCE_NUM_STREAMS; ++i) + for (i = 0; i < TEST_SOURCE_NUM_STREAMS + 1; ++i) { hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_ANY_STREAM, 0, &actual_index, &stream_flags, &timestamp, &sample); ok(hr == S_OK, "Failed to get a sample, hr %#x.\n", hr); - ok(actual_index == (i < TEST_SOURCE_NUM_STREAMS ? i : 0), "%d: Unexpected stream index %u\n", - i, actual_index); + ok(actual_index == i % TEST_SOURCE_NUM_STREAMS, "%d: Unexpected stream index %u\n", i, actual_index); ok(!stream_flags, "Unexpected stream flags %#x.\n", stream_flags); ok(timestamp == 123, "Unexpected timestamp.\n"); ok(!!sample, "Expected sample object.\n");

1 0