October 2023 - Wine-Commits

Ziqing Hui : winegstreamer: Introduce factory_create_element.
by Alexandre Julliard Oct. 31, 2023

Oct. 31, 2023

Module: wine Branch: master Commit: 1173a2e0126ebc4dc53dad6fc48bd5a28c1bf0eb URL: https://gitlab.winehq.org/wine/wine/-/commit/1173a2e0126ebc4dc53dad6fc48bd5… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Oct 25 10:11:03 2023 +0800 winegstreamer: Introduce factory_create_element. --- dlls/winegstreamer/unix_private.h | 1 + dlls/winegstreamer/unixlib.c | 20 +++++++++++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/winegstreamer/unix_private.h b/dlls/winegstreamer/unix_private.h index ea9803e6003..823fab908be 100644 --- a/dlls/winegstreamer/unix_private.h +++ b/dlls/winegstreamer/unix_private.h @@ -35,6 +35,7 @@ extern NTSTATUS wg_init_gstreamer(void *args) DECLSPEC_HIDDEN; extern GstStreamType stream_type_from_caps(GstCaps *caps) DECLSPEC_HIDDEN; extern GstElement *create_element(const char *name, const char *plugin_set) DECLSPEC_HIDDEN; +GstElement *factory_create_element(GstElementFactory *factory) DECLSPEC_HIDDEN; extern GList *find_element_factories(GstElementFactoryListType type, GstRank min_rank, GstCaps *element_sink_caps, GstCaps *element_src_caps) DECLSPEC_HIDDEN; extern GstElement *find_element(GstElementFactoryListType type, diff --git a/dlls/winegstreamer/unixlib.c b/dlls/winegstreamer/unixlib.c index ad92ff230f8..db9d1eb114f 100644 --- a/dlls/winegstreamer/unixlib.c +++ b/dlls/winegstreamer/unixlib.c @@ -78,6 +78,19 @@ GstElement *create_element(const char *name, const char *plugin_set) return element; } +GstElement *factory_create_element(GstElementFactory *factory) +{ + GstElement *element; + + if ((element = gst_element_factory_create(factory, NULL))) + GST_INFO("Created element %"GST_PTR_FORMAT" from factory %"GST_PTR_FORMAT".", + element, factory); + else + GST_WARNING("Failed to create element from factory %"GST_PTR_FORMAT".", factory); + + return element; +} + GList *find_element_factories(GstElementFactoryListType type, GstRank min_rank, GstCaps *element_sink_caps, GstCaps *element_src_caps) { @@ -135,15 +148,12 @@ GstElement *find_element(GstElementFactoryListType type, GstCaps *element_sink_c continue; } - if (!(element = gst_element_factory_create(GST_ELEMENT_FACTORY(tmp->data), NULL))) - GST_WARNING("Failed to create %s element.", name); + element = factory_create_element(GST_ELEMENT_FACTORY(tmp->data)); } gst_plugin_feature_list_free(transforms); - if (element) - GST_DEBUG("Created %s element %p.", name, element); - else + if (!element) GST_WARNING("Failed to create element matching caps %"GST_PTR_FORMAT" / %"GST_PTR_FORMAT".", element_sink_caps, element_src_caps);

1 0

Ziqing Hui : winegstreamer: Introduce find_element_factories.
by Alexandre Julliard Oct. 31, 2023

Oct. 31, 2023

Module: wine Branch: master Commit: eb7571c8b1c40784b50fe75eb1110ec3b0d3c1b8 URL: https://gitlab.winehq.org/wine/wine/-/commit/eb7571c8b1c40784b50fe75eb1110e… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Oct 20 10:40:30 2023 +0800 winegstreamer: Introduce find_element_factories. --- dlls/winegstreamer/unix_private.h | 5 +++- dlls/winegstreamer/unixlib.c | 58 +++++++++++++++++++++++---------------- 2 files changed, 39 insertions(+), 24 deletions(-) diff --git a/dlls/winegstreamer/unix_private.h b/dlls/winegstreamer/unix_private.h index eefd3cdb259..ea9803e6003 100644 --- a/dlls/winegstreamer/unix_private.h +++ b/dlls/winegstreamer/unix_private.h @@ -35,7 +35,10 @@ extern NTSTATUS wg_init_gstreamer(void *args) DECLSPEC_HIDDEN; extern GstStreamType stream_type_from_caps(GstCaps *caps) DECLSPEC_HIDDEN; extern GstElement *create_element(const char *name, const char *plugin_set) DECLSPEC_HIDDEN; -extern GstElement *find_element(GstElementFactoryListType type, GstCaps *src_caps, GstCaps *sink_caps) DECLSPEC_HIDDEN; +extern GList *find_element_factories(GstElementFactoryListType type, GstRank min_rank, + GstCaps *element_sink_caps, GstCaps *element_src_caps) DECLSPEC_HIDDEN; +extern GstElement *find_element(GstElementFactoryListType type, + GstCaps *element_sink_caps, GstCaps *element_src_caps) DECLSPEC_HIDDEN; extern bool append_element(GstElement *container, GstElement *element, GstElement **first, GstElement **last) DECLSPEC_HIDDEN; extern bool link_src_to_sink(GstPad *src_pad, GstPad *sink_pad) DECLSPEC_HIDDEN; extern bool link_src_to_element(GstPad *src_pad, GstElement *element) DECLSPEC_HIDDEN; diff --git a/dlls/winegstreamer/unixlib.c b/dlls/winegstreamer/unixlib.c index d0d50b34004..ad92ff230f8 100644 --- a/dlls/winegstreamer/unixlib.c +++ b/dlls/winegstreamer/unixlib.c @@ -78,32 +78,50 @@ GstElement *create_element(const char *name, const char *plugin_set) return element; } -GstElement *find_element(GstElementFactoryListType type, GstCaps *src_caps, GstCaps *sink_caps) +GList *find_element_factories(GstElementFactoryListType type, GstRank min_rank, + GstCaps *element_sink_caps, GstCaps *element_src_caps) { - GstElement *element = NULL; - GList *tmp, *transforms; - const gchar *name; + GList *tmp, *factories = NULL; - if (!(transforms = gst_element_factory_list_get_elements(type, GST_RANK_MARGINAL))) + if (!(factories = gst_element_factory_list_get_elements(type, min_rank))) goto done; - if (src_caps) + if (element_sink_caps) { - tmp = gst_element_factory_list_filter(transforms, src_caps, GST_PAD_SINK, FALSE); - gst_plugin_feature_list_free(transforms); - if (!(transforms = tmp)) + tmp = gst_element_factory_list_filter(factories, element_sink_caps, GST_PAD_SINK, FALSE); + gst_plugin_feature_list_free(factories); + if (!(factories = tmp)) goto done; } - if (sink_caps) + if (element_src_caps) { - tmp = gst_element_factory_list_filter(transforms, sink_caps, GST_PAD_SRC, FALSE); - gst_plugin_feature_list_free(transforms); - if (!(transforms = tmp)) + tmp = gst_element_factory_list_filter(factories, element_src_caps, GST_PAD_SRC, FALSE); + gst_plugin_feature_list_free(factories); + if (!(factories = tmp)) goto done; } - transforms = g_list_sort(transforms, gst_plugin_feature_rank_compare_func); + factories = g_list_sort(factories, gst_plugin_feature_rank_compare_func); + +done: + if (!factories) + GST_WARNING("Failed to find any element factory matching " + "type %"G_GUINT64_FORMAT"x, caps %"GST_PTR_FORMAT" / %"GST_PTR_FORMAT".", + type, element_sink_caps, element_src_caps); + + return factories; +} + +GstElement *find_element(GstElementFactoryListType type, GstCaps *element_sink_caps, GstCaps *element_src_caps) +{ + GstElement *element = NULL; + GList *tmp, *transforms; + const gchar *name; + + if (!(transforms = find_element_factories(type, GST_RANK_MARGINAL, element_sink_caps, element_src_caps))) + return NULL; + for (tmp = transforms; tmp != NULL && element == NULL; tmp = tmp->next) { name = gst_plugin_feature_get_name(GST_PLUGIN_FEATURE(tmp->data)); @@ -120,20 +138,14 @@ GstElement *find_element(GstElementFactoryListType type, GstCaps *src_caps, GstC if (!(element = gst_element_factory_create(GST_ELEMENT_FACTORY(tmp->data), NULL))) GST_WARNING("Failed to create %s element.", name); } + gst_plugin_feature_list_free(transforms); -done: if (element) - { GST_DEBUG("Created %s element %p.", name, element); - } else - { - gchar *src_str = gst_caps_to_string(src_caps), *sink_str = gst_caps_to_string(sink_caps); - GST_WARNING("Failed to create element matching caps %s / %s.", src_str, sink_str); - g_free(sink_str); - g_free(src_str); - } + GST_WARNING("Failed to create element matching caps %"GST_PTR_FORMAT" / %"GST_PTR_FORMAT".", + element_sink_caps, element_src_caps); return element; }

1 0

Anton Baskanov : dmsynth: Handle pitch bend events.
by Alexandre Julliard Oct. 31, 2023

Oct. 31, 2023

Module: wine Branch: master Commit: beb4a09116eabab41f20edd521edc3f398811f63 URL: https://gitlab.winehq.org/wine/wine/-/commit/beb4a09116eabab41f20edd521edc3… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Mon Oct 23 12:59:50 2023 +0700 dmsynth: Handle pitch bend events. --- dlls/dmsynth/synth.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index 31adf3df1c1..2b0c5b45ea5 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -1080,6 +1080,9 @@ static HRESULT WINAPI synth_Render(IDirectMusicSynth8 *iface, short *buffer, case MIDI_PROGRAM_CHANGE: fluid_synth_program_change(This->fluid_synth, chan, event->midi[1]); break; + case MIDI_PITCH_BEND_CHANGE: + fluid_synth_pitch_bend(This->fluid_synth, chan, event->midi[1] | (event->midi[2] << 7)); + break; default: FIXME("MIDI event not implemented: %#x %#x %#x\n", event->midi[0], event->midi[1], event->midi[2]); break;

1 0

Fabian Maurer : winegstreamer: Implement IWMResamplerProps.
by Alexandre Julliard Oct. 31, 2023

Oct. 31, 2023

Module: wine Branch: master Commit: 015eb45a7b3ddc617d59beb6ae53852b91343c4b URL: https://gitlab.winehq.org/wine/wine/-/commit/015eb45a7b3ddc617d59beb6ae5385… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Oct 16 22:47:38 2023 +0200 winegstreamer: Implement IWMResamplerProps. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55789 --- dlls/winegstreamer/resampler.c | 45 ++++++++++++++++++++++++++++++++++++++++++ include/wmcodecdsp.idl | 13 ++++++++++++ 2 files changed, 58 insertions(+) diff --git a/dlls/winegstreamer/resampler.c b/dlls/winegstreamer/resampler.c index df39d1a1e07..b5b62d58800 100644 --- a/dlls/winegstreamer/resampler.c +++ b/dlls/winegstreamer/resampler.c @@ -41,6 +41,7 @@ struct resampler IMediaObject IMediaObject_iface; IPropertyBag IPropertyBag_iface; IPropertyStore IPropertyStore_iface; + IWMResamplerProps IWMResamplerProps_iface; IUnknown *outer; LONG refcount; @@ -97,6 +98,8 @@ static HRESULT WINAPI unknown_QueryInterface(IUnknown *iface, REFIID iid, void * *out = &impl->IPropertyBag_iface; else if (IsEqualIID(iid, &IID_IPropertyStore)) *out = &impl->IPropertyStore_iface; + else if (IsEqualIID(iid, &IID_IWMResamplerProps)) + *out = &impl->IWMResamplerProps_iface; else { *out = NULL; @@ -872,6 +875,47 @@ static const IPropertyStoreVtbl property_store_vtbl = property_store_Commit, }; +static inline struct resampler *impl_from_IWMResamplerProps(IWMResamplerProps *iface) +{ + return CONTAINING_RECORD(iface, struct resampler, IWMResamplerProps_iface); +} + +static HRESULT WINAPI resampler_props_QueryInterface(IWMResamplerProps *iface, REFIID iid, void **out) +{ + return IUnknown_QueryInterface(impl_from_IWMResamplerProps(iface)->outer, iid, out); +} + +static ULONG WINAPI resampler_props_AddRef(IWMResamplerProps *iface) +{ + return IUnknown_AddRef(impl_from_IWMResamplerProps(iface)->outer); +} + +static ULONG WINAPI resampler_props_Release(IWMResamplerProps *iface) +{ + return IUnknown_Release(impl_from_IWMResamplerProps(iface)->outer); +} + +static HRESULT WINAPI resampler_props_SetHalfFilterLength(IWMResamplerProps *iface, LONG length) +{ + FIXME("iface %p, count %lu stub!\n", iface, length); + return E_NOTIMPL; +} + +static HRESULT WINAPI resampler_props_SetUserChannelMtx(IWMResamplerProps *iface, ChMtxType *conversion_matrix) +{ + FIXME("iface %p, userChannelMtx %p stub!\n", iface, conversion_matrix); + return E_NOTIMPL; +} + +static const IWMResamplerPropsVtbl resampler_props_vtbl = +{ + resampler_props_QueryInterface, + resampler_props_AddRef, + resampler_props_Release, + resampler_props_SetHalfFilterLength, + resampler_props_SetUserChannelMtx, +}; + HRESULT resampler_create(IUnknown *outer, IUnknown **out) { static const struct wg_format input_format = @@ -924,6 +968,7 @@ HRESULT resampler_create(IUnknown *outer, IUnknown **out) impl->IMediaObject_iface.lpVtbl = &media_object_vtbl; impl->IPropertyBag_iface.lpVtbl = &property_bag_vtbl; impl->IPropertyStore_iface.lpVtbl = &property_store_vtbl; + impl->IWMResamplerProps_iface.lpVtbl = &resampler_props_vtbl; impl->refcount = 1; impl->outer = outer ? outer : &impl->IUnknown_inner; diff --git a/include/wmcodecdsp.idl b/include/wmcodecdsp.idl index 5769b0e011e..a6f350ea2fc 100644 --- a/include/wmcodecdsp.idl +++ b/include/wmcodecdsp.idl @@ -91,3 +91,16 @@ coclass CWMVDecMediaObject {} uuid(7e320092-596a-41b2-bbeb-175d10504eb6) ] coclass CWMVXEncMediaObject {} + +typedef float ChMtxType; + +[ + local, + object, + uuid(e7e9984f-f09f-4da4-903f-6e2e0efe56b5), +] +interface IWMResamplerProps : IUnknown +{ + HRESULT SetHalfFilterLength(LONG length); + HRESULT SetUserChannelMtx(ChMtxType *conversion_matrix); +}

1 0

Ziqing Hui : winegstreamer: Use gst_element_get_compatible_pad.
by Alexandre Julliard Oct. 31, 2023

Oct. 31, 2023

Module: wine Branch: master Commit: ebc8a45968e7e218010ce96a8c496a7ec34af45e URL: https://gitlab.winehq.org/wine/wine/-/commit/ebc8a45968e7e218010ce96a8c496a… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Oct 27 10:09:55 2023 +0800 winegstreamer: Use gst_element_get_compatible_pad. gst_element_get_compatible_pad supports request pad. --- dlls/winegstreamer/unixlib.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/winegstreamer/unixlib.c b/dlls/winegstreamer/unixlib.c index 4a204478ade..d0d50b34004 100644 --- a/dlls/winegstreamer/unixlib.c +++ b/dlls/winegstreamer/unixlib.c @@ -181,11 +181,10 @@ bool link_src_to_element(GstPad *src_pad, GstElement *element) GstPadLinkReturn ret; GstPad *sink_pad; - if (!(sink_pad = gst_element_get_static_pad(element, "sink"))) + if (!(sink_pad = gst_element_get_compatible_pad(element, src_pad, NULL))) { - gchar *name = gst_element_get_name(element); - GST_ERROR("Failed to find sink pad on %s", name); - g_free(name); + GST_ERROR("Failed to find sink pad compatible to %"GST_PTR_FORMAT" on %"GST_PTR_FORMAT".", + src_pad, element); return false; } ret = link_src_to_sink(src_pad, sink_pad); @@ -198,11 +197,10 @@ bool link_element_to_sink(GstElement *element, GstPad *sink_pad) GstPadLinkReturn ret; GstPad *src_pad; - if (!(src_pad = gst_element_get_static_pad(element, "src"))) + if (!(src_pad = gst_element_get_compatible_pad(element, sink_pad, NULL))) { - gchar *name = gst_element_get_name(element); - GST_ERROR("Failed to find src pad on %s", name); - g_free(name); + GST_ERROR("Failed to find src pad compatible to %"GST_PTR_FORMAT" on %"GST_PTR_FORMAT".", + sink_pad, element); return false; } ret = link_src_to_sink(src_pad, sink_pad);

1 0

Ziqing Hui : winegstreamer: Use NTSTATUS value in wg_muxer_create.
by Alexandre Julliard Oct. 31, 2023

Oct. 31, 2023

Module: wine Branch: master Commit: 29b35f6bb7cc26d6ddfc5140dd0fba5889f650bd URL: https://gitlab.winehq.org/wine/wine/-/commit/29b35f6bb7cc26d6ddfc5140dd0fba… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Sep 15 16:05:22 2023 +0800 winegstreamer: Use NTSTATUS value in wg_muxer_create. --- dlls/winegstreamer/main.c | 8 ++++++-- dlls/winegstreamer/wg_muxer.c | 6 +++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index 853907e1825..beb48fa3731 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -466,13 +466,17 @@ HRESULT wg_muxer_create(const char *format, wg_muxer_t *muxer) TRACE("format %p, muxer %p.\n", format, muxer); - if (SUCCEEDED(status = WINE_UNIX_CALL(unix_wg_muxer_create, &params))) + if (!(status = WINE_UNIX_CALL(unix_wg_muxer_create, &params))) { *muxer = params.muxer; TRACE("Created wg_muxer %#I64x.\n", params.muxer); } + else + { + WARN("Failed to create muxer, status %#lx.\n", status); + } - return status; + return HRESULT_FROM_NT(status); } void wg_muxer_destroy(wg_muxer_t muxer) diff --git a/dlls/winegstreamer/wg_muxer.c b/dlls/winegstreamer/wg_muxer.c index 6887bc015ba..601c5f03d31 100644 --- a/dlls/winegstreamer/wg_muxer.c +++ b/dlls/winegstreamer/wg_muxer.c @@ -61,14 +61,14 @@ NTSTATUS wg_muxer_create(void *args) { struct wg_muxer_create_params *params = args; GstElement *first = NULL, *last = NULL; + NTSTATUS status = STATUS_UNSUCCESSFUL; GstPadTemplate *template = NULL; GstCaps *sink_caps = NULL; - NTSTATUS status = E_FAIL; struct wg_muxer *muxer; /* Create wg_muxer object. */ if (!(muxer = calloc(1, sizeof(*muxer)))) - return E_OUTOFMEMORY; + return STATUS_NO_MEMORY; if (!(muxer->container = gst_bin_new("wg_muxer"))) goto out; @@ -110,7 +110,7 @@ NTSTATUS wg_muxer_create(void *args) GST_INFO("Created winegstreamer muxer %p.", muxer); params->muxer = (wg_transform_t)(ULONG_PTR)muxer; - return S_OK; + return STATUS_SUCCESS; out: if (muxer->my_sink)

1 0

Nikolay Sivov : mf/samplegrabber: Release current media type on shutdown.
by Alexandre Julliard Oct. 31, 2023

Oct. 31, 2023

Module: wine Branch: master Commit: c45ae2c680f0d6789d4fee495e17e7027be3c1b5 URL: https://gitlab.winehq.org/wine/wine/-/commit/c45ae2c680f0d6789d4fee495e17e7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 31 09:45:46 2023 +0100 mf/samplegrabber: Release current media type on shutdown. --- dlls/mf/samplegrabber.c | 33 ++++++++++++++++++++++++++------- dlls/mf/tests/mf.c | 5 ++--- 2 files changed, 28 insertions(+), 10 deletions(-) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index deb1ce09a55..5e5b6ad6d0e 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -655,34 +655,50 @@ static HRESULT WINAPI sample_grabber_stream_type_handler_GetCurrentMediaType(IMF IMFMediaType **media_type) { struct sample_grabber *grabber = impl_from_IMFMediaTypeHandler(iface); + HRESULT hr = S_OK; TRACE("%p, %p.\n", iface, media_type); if (!media_type) return E_POINTER; + EnterCriticalSection(&grabber->cs); + if (grabber->is_shut_down) - return MF_E_STREAMSINK_REMOVED; + { + hr = MF_E_STREAMSINK_REMOVED; + } + else + { + *media_type = grabber->current_media_type; + IMFMediaType_AddRef(*media_type); + } - *media_type = grabber->current_media_type; - IMFMediaType_AddRef(*media_type); + LeaveCriticalSection(&grabber->cs); - return S_OK; + return hr; } static HRESULT WINAPI sample_grabber_stream_type_handler_GetMajorType(IMFMediaTypeHandler *iface, GUID *type) { struct sample_grabber *grabber = impl_from_IMFMediaTypeHandler(iface); + HRESULT hr; TRACE("%p, %p.\n", iface, type); if (!type) return E_POINTER; + EnterCriticalSection(&grabber->cs); + if (grabber->is_shut_down) - return MF_E_STREAMSINK_REMOVED; + hr = MF_E_STREAMSINK_REMOVED; + else + hr = IMFMediaType_GetMajorType(grabber->current_media_type, type); - return IMFMediaType_GetMajorType(grabber->current_media_type, type); + LeaveCriticalSection(&grabber->cs); + + return hr; } static const IMFMediaTypeHandlerVtbl sample_grabber_stream_type_handler_vtbl = @@ -867,7 +883,8 @@ static ULONG WINAPI sample_grabber_sink_Release(IMFMediaSink *iface) IMFSampleGrabberSinkCallback_Release(grabber->callback); if (grabber->callback2) IMFSampleGrabberSinkCallback2_Release(grabber->callback2); - IMFMediaType_Release(grabber->current_media_type); + if (grabber->current_media_type) + IMFMediaType_Release(grabber->current_media_type); IMFMediaType_Release(grabber->media_type); if (grabber->event_queue) IMFMediaEventQueue_Release(grabber->event_queue); @@ -1091,6 +1108,8 @@ static HRESULT WINAPI sample_grabber_sink_Shutdown(IMFMediaSink *iface) if (SUCCEEDED(hr = IMFSampleGrabberSinkCallback_OnShutdown(sample_grabber_get_callback(grabber)))) { sample_grabber_set_presentation_clock(grabber, NULL); + IMFMediaType_Release(grabber->current_media_type); + grabber->current_media_type = NULL; IMFMediaEventQueue_Shutdown(grabber->stream_event_queue); IMFMediaEventQueue_Shutdown(grabber->event_queue); } diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 18c97b93593..8ec379be991 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -4697,10 +4697,9 @@ static void test_sample_grabber(void) ok(hr == S_OK, "Failed to get type count, hr %#lx.\n", hr); ref = IMFMediaType_Release(media_type2); - todo_wine - ok(ref == 0, "Release returned %ld\n", ref); + ok(!ref, "Unexpected refcount %ld.\n", ref); ref = IMFMediaType_Release(media_type); - ok(ref == 0, "Release returned %ld\n", ref); + ok(!ref, "Unexpected refcount %ld.\n", ref); hr = IMFMediaTypeHandler_GetMediaTypeByIndex(handler, 0, &media_type); ok(hr == MF_E_NO_MORE_TYPES, "Unexpected hr %#lx.\n", hr);

1 0

Nikolay Sivov : mf/samplegrabber: Use OnSetPresentationClock() on shutdown as well.
by Alexandre Julliard Oct. 31, 2023

Oct. 31, 2023

Module: wine Branch: master Commit: 729ed419ae4e8083a1a188b6dce08a20d13c5abd URL: https://gitlab.winehq.org/wine/wine/-/commit/729ed419ae4e8083a1a188b6dce08a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 31 13:04:01 2023 +0100 mf/samplegrabber: Use OnSetPresentationClock() on shutdown as well. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/samplegrabber.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index 66ac7808cc7..de599139736 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -1019,8 +1019,13 @@ static void sample_grabber_cancel_timer(struct sample_grabber *grabber) } } -static void sample_grabber_set_presentation_clock(struct sample_grabber *grabber, IMFPresentationClock *clock) +static HRESULT sample_grabber_set_presentation_clock(struct sample_grabber *grabber, IMFPresentationClock *clock) { + HRESULT hr; + + if (FAILED(hr = IMFSampleGrabberSinkCallback_OnSetPresentationClock(sample_grabber_get_callback(grabber), clock))) + return hr; + if (grabber->clock) { sample_grabber_cancel_timer(grabber); @@ -1043,6 +1048,8 @@ static void sample_grabber_set_presentation_clock(struct sample_grabber *grabber grabber->timer = NULL; } } + + return hr; } static HRESULT WINAPI sample_grabber_sink_SetPresentationClock(IMFMediaSink *iface, IMFPresentationClock *clock) @@ -1058,10 +1065,9 @@ static HRESULT WINAPI sample_grabber_sink_SetPresentationClock(IMFMediaSink *ifa { hr = MF_E_SHUTDOWN; } - else if (SUCCEEDED(hr = IMFSampleGrabberSinkCallback_OnSetPresentationClock(sample_grabber_get_callback(grabber), - clock))) + else { - sample_grabber_set_presentation_clock(grabber, clock); + hr = sample_grabber_set_presentation_clock(grabber, clock); } LeaveCriticalSection(&grabber->cs); @@ -1109,8 +1115,9 @@ static HRESULT WINAPI sample_grabber_sink_Shutdown(IMFMediaSink *iface) { grabber->is_shut_down = TRUE; sample_grabber_release_pending_items(grabber); - sample_grabber_set_presentation_clock(grabber, NULL); - if (SUCCEEDED(hr = IMFSampleGrabberSinkCallback_OnShutdown(sample_grabber_get_callback(grabber)))) + if (SUCCEEDED(hr = sample_grabber_set_presentation_clock(grabber, NULL))) + hr = IMFSampleGrabberSinkCallback_OnShutdown(sample_grabber_get_callback(grabber)); + if (SUCCEEDED(hr)) { IMFMediaType_Release(grabber->current_media_type); grabber->current_media_type = NULL;

1 0

Nikolay Sivov : mf/samplegrabber: Reset the clock before OnShutdown().
by Alexandre Julliard Oct. 31, 2023

Oct. 31, 2023

Module: wine Branch: master Commit: 09d949494b657402ba725448432d401dc44ad14d URL: https://gitlab.winehq.org/wine/wine/-/commit/09d949494b657402ba725448432d40… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 31 12:48:11 2023 +0100 mf/samplegrabber: Reset the clock before OnShutdown(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/samplegrabber.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index 332b1a6e71d..66ac7808cc7 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -1109,9 +1109,9 @@ static HRESULT WINAPI sample_grabber_sink_Shutdown(IMFMediaSink *iface) { grabber->is_shut_down = TRUE; sample_grabber_release_pending_items(grabber); + sample_grabber_set_presentation_clock(grabber, NULL); if (SUCCEEDED(hr = IMFSampleGrabberSinkCallback_OnShutdown(sample_grabber_get_callback(grabber)))) { - sample_grabber_set_presentation_clock(grabber, NULL); IMFMediaType_Release(grabber->current_media_type); grabber->current_media_type = NULL; IMFMediaEventQueue_Shutdown(grabber->stream_event_queue);

1 0

Nikolay Sivov : mf/samplegrabber: Check shutdown state when setting the clock.
by Alexandre Julliard Oct. 31, 2023

Oct. 31, 2023

Module: wine Branch: master Commit: 882d822900bdb08fd750e754b76094f7b4f65548 URL: https://gitlab.winehq.org/wine/wine/-/commit/882d822900bdb08fd750e754b76094… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 31 10:00:25 2023 +0100 mf/samplegrabber: Check shutdown state when setting the clock. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/samplegrabber.c | 6 +++++- dlls/mf/tests/mf.c | 13 ++++++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index 5e5b6ad6d0e..332b1a6e71d 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -1054,7 +1054,11 @@ static HRESULT WINAPI sample_grabber_sink_SetPresentationClock(IMFMediaSink *ifa EnterCriticalSection(&grabber->cs); - if (SUCCEEDED(hr = IMFSampleGrabberSinkCallback_OnSetPresentationClock(sample_grabber_get_callback(grabber), + if (grabber->is_shut_down) + { + hr = MF_E_SHUTDOWN; + } + else if (SUCCEEDED(hr = IMFSampleGrabberSinkCallback_OnSetPresentationClock(sample_grabber_get_callback(grabber), clock))) { sample_grabber_set_presentation_clock(grabber, clock); diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 8ec379be991..84f5e69ac25 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -4649,9 +4649,16 @@ static void test_sample_grabber(void) EXPECT_REF(clock, 3); hr = IMFMediaSink_Shutdown(sink); ok(hr == S_OK, "Failed to shut down, hr %#lx.\n", hr); + EXPECT_REF(clock, 1); + + hr = IMFMediaSink_SetPresentationClock(sink, NULL); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); + + hr = IMFMediaSink_SetPresentationClock(sink, clock); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); ref = IMFPresentationClock_Release(clock); - ok(ref == 0, "Release returned %ld\n", ref); + ok(!ref, "Unexpected refcount %ld.\n", ref); hr = IMFMediaEventGenerator_GetEvent(eg, MF_EVENT_FLAG_NO_WAIT, &event); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); @@ -4730,9 +4737,9 @@ static void test_sample_grabber(void) IMFStreamSink_Release(stream); ref = IMFActivate_Release(activate); - ok(ref == 0, "Release returned %ld\n", ref); + ok(!ref, "Unexpected refcount %ld.\n", ref); ref = IMFMediaSink_Release(sink); - ok(ref == 0, "Release returned %ld\n", ref); + ok(!ref, "Unexpected refcount %ld.\n", ref); /* Rateless mode with MF_SAMPLEGRABBERSINK_IGNORE_CLOCK. */ hr = MFCreateMediaType(&media_type);

1 0