October 2023 - Wine-gitlab - list.winehq.org

Re: [PATCH v20 0/14] MR3938: winegstreamer: Implement CLSID_CMpegVideoCodec
by Zebediah Figura (＠zfigura) 31 Oct '23

31 Oct '23

Thanks, this is looking almost right now, just a few more nitpicks. And again sorry about the late review :-/ -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3938#note_50378

1 0

Re: [PATCH v20 0/14] MR3938: winegstreamer: Implement CLSID_CMpegVideoCodec
by Zebediah Figura (＠zfigura) 31 Oct '23

31 Oct '23

Zebediah Figura (@zfigura) commented about dlls/quartz/tests/mpegsplit.c: > + LPWSTR name; > + HRESULT hr; > + LCID lcid; > + > + IAMStreamSelect_QueryInterface(sel, &IID_IBaseFilter, (void **)&filter); > + IBaseFilter_FindPin(filter, L"Video", &pin_video); > + IBaseFilter_FindPin(filter, L"Audio", &pin_audio); > + IPin_QueryInterface(pin_video, &IID_IUnknown, (void **)&unk_video); > + IPin_QueryInterface(pin_audio, &IID_IUnknown, (void **)&unk_audio); > + > + hr = IAMStreamSelect_Count(sel, &stream_count); > + ok(hr == S_OK, "Got hr %#lx.\n", hr); > + ok(stream_count == 2, "Got %lu streams.\n", stream_count); > + > + hr = IAMStreamSelect_Info(sel, 0, &mt, &flags, &lcid, &group, &name, &object, &unk); > + ok(hr == S_OK, "Got hr %#lx.\n", hr); Since we've implemented "mt", can we check its contents? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3938#note_50377

1 0

Re: [PATCH v20 0/14] MR3938: winegstreamer: Implement CLSID_CMpegVideoCodec
by Zebediah Figura (＠zfigura) 31 Oct '23

31 Oct '23

Zebediah Figura (@zfigura) commented about dlls/quartz/tests/mpegsplit.c: > + ok(hr == S_OK, "Got hr %#lx.\n", hr); > + todo_wine ok(flags == AMSTREAMSELECTINFO_ENABLED, "Got flags %lx.\n", flags); > + ok(lcid == 0, "Got LCID %lx.\n", lcid); > + ok(group == 0, "Got group %lx.\n", group); > + todo_wine ok(name && !wcscmp(name, L"Stream(E0)"), "Got name %ls.\n", name ? name : L"(null)"); > + todo_wine ok(object == unk_video, "Got object %p, expected %p.\n", object, unk_video); > + ok(unk == NULL, "Got unknown %p.\n", unk); > + > + if (name) > + CoTaskMemFree(name); > + if (mt) > + DeleteMediaType(mt); > + if (object) > + IUnknown_Release(object); > + if (unk) > + IUnknown_Release(unk); We can delete this line. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3938#note_50376

1 0

Re: [PATCH v20 0/14] MR3938: winegstreamer: Implement CLSID_CMpegVideoCodec
by Zebediah Figura (＠zfigura) 31 Oct '23

31 Oct '23

Zebediah Figura (@zfigura) commented about dlls/winegstreamer/quartz_parser.c: > > #define ALIGN(n, alignment) (((n) + (alignment) - 1) & ~((alignment) - 1)) > > +unsigned int wg_format_get_bytes_for_uncompressed(wg_video_format format, unsigned int width, unsigned int height) This can be static now. Let's use enum wg_video_format instead of wg_video_format; the latter is a typedef of UINT32 and therefore the compiler won't recognize it as an enum. I don't particularly like the naming "get_bytes"; that sounds like it's retrieving the actual data in some sense. How about "wg_format_get_max_size_video_raw()", matching the naming scheme for wg_format_to_caps()? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3938#note_50375

1 0

Re: [PATCH v20 0/14] MR3938: winegstreamer: Implement CLSID_CMpegVideoCodec
by Zebediah Figura (＠zfigura) 31 Oct '23

31 Oct '23

Zebediah Figura (@zfigura) commented about dlls/winegstreamer/quartz_parser.c: > { > - FIXME("iface %p, index %ld, mt %p, flags %p, lcid %p, group %p, name %p, object %p, unknown %p, stub!\n", > - iface, index, mt, flags, lcid, group, name, object, unknown); > - return E_NOTIMPL; > + struct parser *filter = impl_from_IAMStreamSelect(iface); > + wg_parser_stream_t stream = wg_parser_get_stream(filter->wg_parser, index); > + HRESULT hr = S_OK; > + > + FIXME("filter %p, index %ld, mt %p, flags %p, lcid %p, group %p, name %p, object %p, unknown %p, semi-stub!\n", > + filter, index, mt, flags, lcid, group, name, object, unknown); > + EnterCriticalSection(&filter->filter.filter_cs); > + > + if (!filter->sink.pin.peer) > + return VFW_E_NOT_CONNECTED; > + if (index < 0 || index >= wg_parser_get_stream_count(filter->wg_parser)) > + return S_FALSE; We need to leave the CS on these return paths. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3938#note_50374

1 0

Re: [PATCH v20 0/14] MR3938: winegstreamer: Implement CLSID_CMpegVideoCodec
by Zebediah Figura (＠zfigura) 31 Oct '23

31 Oct '23

On Tue Oct 31 18:32:42 2023 +0000, Alfred Agrell wrote: > No, sorry, my bad, I cleaned up those logs too hard. > ``` > 01e4:trace:quartz:source_quality_control_Notify filter 00379A98, sender > 0AAB11EC, type 0, proportion 1000, late -0.4180444, timestamp -0.2. > 01e4:trace:quartz:wg_parser_stream_notify_qos stream 0x7fba100afe30, > underflow 0, proportion 1.0000000000000000e+00, diff 0, timestamp 0. > 0:00:00.153596244 5139 0x7fba10037860 ERROR WINE > dlls/winegstreamer/wg_parser.c:477:wg_parser_stream_notify_qos: > timestamp*100=0 stream_time=-1 diff=0 > 01dc:trace:quartz:source_quality_control_Notify filter 00379A98, sender > 0AAB11EC, type 0, proportion 1000, late -0.4443777, timestamp -0.193. > 01dc:trace:quartz:wg_parser_stream_notify_qos stream 0x7fba100afe30, > underflow 0, proportion 1.0000000000000000e+00, diff 0, timestamp 0. > 0:00:00.160425790 5139 0x7fba1004a2f0 ERROR WINE > dlls/winegstreamer/wg_parser.c:477:wg_parser_stream_notify_qos: > timestamp*100=0 stream_time=-1 diff=0 > 01dc:trace:quartz:source_quality_control_Notify filter 00379A98, sender > 0AAB11EC, type 0, proportion 2000, late -0.063711, timestamp 0.221. > 01dc:trace:quartz:wg_parser_stream_notify_qos stream 0x7fba100afe30, > underflow 0, proportion 5.0000000000000000e-01, diff -637110, timestamp 2210000. > 0:00:00.574499800 5139 0x7fba1004a2f0 ERROR WINE > dlls/winegstreamer/wg_parser.c:477:wg_parser_stream_notify_qos: > timestamp*100=221000000 stream_time=-1 diff=-63711000 > 01dc:trace:quartz:source_quality_control_Notify filter 00379A98, sender > 0AAB11EC, type 0, proportion 2000, late -0.0640444, timestamp 0.254. > 01dc:trace:quartz:wg_parser_stream_notify_qos stream 0x7fba100afe30, > underflow 0, proportion 5.0000000000000000e-01, diff -640444, timestamp 2540000. > 0:00:00.607456059 5139 0x7fba1004a2f0 ERROR WINE > dlls/winegstreamer/wg_parser.c:477:wg_parser_stream_notify_qos: > timestamp*100=254000000 stream_time=27955556 diff=-64044400 > 01dc:trace:quartz:source_quality_control_Notify filter 00379A98, sender > 0AAB11EC, type 0, proportion 2000, late -0.0633777, timestamp 0.288. > 01dc:trace:quartz:wg_parser_stream_notify_qos stream 0x7fba100afe30, > underflow 0, proportion 5.0000000000000000e-01, diff -633777, timestamp 2880000. > 0:00:00.640834761 5139 0x7fba1004a2f0 ERROR WINE > dlls/winegstreamer/wg_parser.c:477:wg_parser_stream_notify_qos: > timestamp*100=288000000 stream_time=61955556 diff=-63377700 > 01dc:trace:quartz:source_quality_control_Notify filter 00379A98, sender > 0AAB11EC, type 0, proportion 2000, late -0.062711, timestamp 0.322. > 01dc:trace:quartz:wg_parser_stream_notify_qos stream 0x7fba100afe30, > underflow 0, proportion 5.0000000000000000e-01, diff -627110, timestamp 3220000. > 0:00:00.674681804 5139 0x7fba1004a2f0 ERROR WINE > dlls/winegstreamer/wg_parser.c:477:wg_parser_stream_notify_qos: > timestamp*100=322000000 stream_time=95955556 diff=-62711000 > 01dc:trace:quartz:source_quality_control_Notify filter 00379A98, sender > 0AAB11EC, type 0, proportion 2000, late -0.0640444, timestamp 0.354. > 01dc:trace:quartz:wg_parser_stream_notify_qos stream 0x7fba100afe30, > underflow 0, proportion 5.0000000000000000e-01, diff -640444, timestamp 3540000. > 0:00:00.707600604 5139 0x7fba1004a2f0 ERROR WINE > dlls/winegstreamer/wg_parser.c:477:wg_parser_stream_notify_qos: > timestamp*100=354000000 stream_time=127955556 diff=-64044400 > 01dc:trace:quartz:source_quality_control_Notify filter 00379A98, sender > 0AAB11EC, type 0, proportion 2000, late -0.0633777, timestamp 0.388. > 01dc:trace:quartz:wg_parser_stream_notify_qos stream 0x7fba100afe30, > underflow 0, proportion 5.0000000000000000e-01, diff -633777, timestamp 3880000. > 0:00:00.741135357 5139 0x7fba1004a2f0 ERROR WINE > dlls/winegstreamer/wg_parser.c:477:wg_parser_stream_notify_qos: > timestamp*100=388000000 stream_time=161955556 diff=-63377700 > 01dc:trace:quartz:source_quality_control_Notify filter 00379A98, sender > 0AAB11EC, type 0, proportion 2000, late -0.063711, timestamp 0.421. > 01dc:trace:quartz:wg_parser_stream_notify_qos stream 0x7fba100afe30, > underflow 0, proportion 5.0000000000000000e-01, diff -637110, timestamp 4210000. > 0:00:00.774577068 5139 0x7fba1004a2f0 ERROR WINE > dlls/winegstreamer/wg_parser.c:477:wg_parser_stream_notify_qos: > timestamp*100=421000000 stream_time=194955556 diff=-63711000 > 01dc:trace:quartz:source_quality_control_Notify filter 00379A98, sender > 0AAB11EC, type 0, proportion 2000, late -0.0590443, timestamp 0.459. > 01dc:trace:quartz:wg_parser_stream_notify_qos stream 0x7fba100afe30, > underflow 0, proportion 5.0000000000000000e-01, diff -590443, timestamp 4590000. > 0:00:00.812276144 5139 0x7fba1004a2f0 ERROR WINE > dlls/winegstreamer/wg_parser.c:477:wg_parser_stream_notify_qos: > timestamp*100=459000000 stream_time=232955556 diff=-59044300 > 01dc:trace:quartz:source_quality_control_Notify filter 00379A98, sender > 0AAB11EC, type 0, proportion 2000, late -0.0553776, timestamp 0.496. > 01dc:trace:quartz:wg_parser_stream_notify_qos stream 0x7fba100afe30, > underflow 0, proportion 5.0000000000000000e-01, diff -553776, timestamp 4960000. > 0:00:00.849423973 5139 0x7fba1004a2f0 ERROR WINE > dlls/winegstreamer/wg_parser.c:477:wg_parser_stream_notify_qos: > timestamp*100=496000000 stream_time=269955556 diff=-55377600 > ``` > The third wg_parser_stream_notify_qos call has timestamp\*100 = > 221000000, 0.221 seconds. But the stream_time is only 27955556, which is > 0.027 seconds; adding a -0.063 seconds diff to that goes out of bounds. > I have the offending mpeg file extracted; should I upload it somewhere, > or is that copyrightly improper? It's 518148 bytes. Copying offline discussion here; yes, this is coming from the application sink, not ours, and I think clamping is probably the right thing to do. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3938#note_50373

1 0

[PATCH v2 0/1] MR4111: winegstreamer: Implement IWMResamplerProps
by Fabian Maurer (＠DarkShadow44) 31 Oct '23

31 Oct '23

Some programs just assume this interface exists, this fixes the resulting crash. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55789 -- v2: winegstreamer: Implement IWMResamplerProps https://gitlab.winehq.org/wine/wine/-/merge_requests/4111

3 7

[PATCH v2 0/6] MR4195: winegstreamer: Introduce some helper functions and implement add_stream.
by Ziqing Hui (＠zhui) 31 Oct '23

31 Oct '23

This MR is splitted from !3810 -- v2: winegstreamer: Implement wg_muxer_add_stream. winegstreamer: Introduce factory_create_element. winegstreamer: Introduce find_element_factories. https://gitlab.winehq.org/wine/wine/-/merge_requests/4195

3 7

[PATCH 0/2] MR4240: server: Only set sock->event when the event is first noticed.
by Zebediah Figura (＠zfigura) 31 Oct '23

31 Oct '23

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/4240

3 3

Re: [PATCH v4 0/1] MR423: ieframe fix - approved
by Zebediah Figura (＠zfigura) 31 Oct '23

31 Oct '23

This merge request was approved by Zebediah Figura. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/423

1 0