April 2024 - Wine-Commits - list.winehq.org

Rémi Bernon : winegstreamer/video_processor: Allow clearing input / output types.
by Alexandre Julliard April 29, 2024

April 29, 2024

Module: wine Branch: master Commit: c91211f315e8f3a42b2c626355eb99e9f22263f2 URL: https://gitlab.winehq.org/wine/wine/-/commit/c91211f315e8f3a42b2c626355eb99… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Apr 12 16:45:37 2024 +0200 winegstreamer/video_processor: Allow clearing input / output types. --- dlls/winegstreamer/video_processor.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/winegstreamer/video_processor.c b/dlls/winegstreamer/video_processor.c index 3075bf997d2..cce077ae63b 100644 --- a/dlls/winegstreamer/video_processor.c +++ b/dlls/winegstreamer/video_processor.c @@ -347,6 +347,22 @@ static HRESULT WINAPI video_processor_SetInputType(IMFTransform *iface, DWORD id TRACE("iface %p, id %#lx, type %p, flags %#lx.\n", iface, id, type, flags); + if (!type) + { + if (impl->input_type) + { + IMFMediaType_Release(impl->input_type); + impl->input_type = NULL; + } + if (impl->wg_transform) + { + wg_transform_destroy(impl->wg_transform); + impl->wg_transform = 0; + } + + return S_OK; + } + if (FAILED(IMFMediaType_GetGUID(type, &MF_MT_MAJOR_TYPE, &major)) || !IsEqualGUID(&major, &MFMediaType_Video)) return E_INVALIDARG; @@ -390,6 +406,22 @@ static HRESULT WINAPI video_processor_SetOutputType(IMFTransform *iface, DWORD i TRACE("iface %p, id %#lx, type %p, flags %#lx.\n", iface, id, type, flags); + if (!type) + { + if (impl->output_type) + { + IMFMediaType_Release(impl->output_type); + impl->output_type = NULL; + } + if (impl->wg_transform) + { + wg_transform_destroy(impl->wg_transform); + impl->wg_transform = 0; + } + + return S_OK; + } + if (FAILED(IMFMediaType_GetGUID(type, &MF_MT_MAJOR_TYPE, &major)) || !IsEqualGUID(&major, &MFMediaType_Video)) return E_INVALIDARG;

1 0

Rémi Bernon : mf/tests: Move the video processor input bitmap names to the test list.
by Alexandre Julliard April 29, 2024

April 29, 2024

Module: wine Branch: master Commit: b51b6efb9618a1a7e76676e8155b5e2f371ea079 URL: https://gitlab.winehq.org/wine/wine/-/commit/b51b6efb9618a1a7e76676e8155b5e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Apr 25 10:21:18 2024 +0200 mf/tests: Move the video processor input bitmap names to the test list. --- dlls/mf/tests/transform.c | 120 +++++++++++++++++++++++----------------------- 1 file changed, 60 insertions(+), 60 deletions(-)

1 0

Rémi Bernon : mf/tests: Use a separate field for buffer_desc image size and compare rect.
by Alexandre Julliard April 29, 2024

April 29, 2024

Module: wine Branch: master Commit: f5c9dea15e3fe4bc0b55c3a1b69bd164170e4eac URL: https://gitlab.winehq.org/wine/wine/-/commit/f5c9dea15e3fe4bc0b55c3a1b69bd1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Apr 12 15:49:03 2024 +0200 mf/tests: Use a separate field for buffer_desc image size and compare rect. --- dlls/mf/tests/mf.c | 8 ++- dlls/mf/tests/mf_test.h | 29 +++++----- dlls/mf/tests/transform.c | 143 +++++++++++++++++++++++++--------------------- 3 files changed, 98 insertions(+), 82 deletions(-)

1 0

Esme Povirk : windowscodecs: Check for overflow in jpeg_decoder_initialize.
by Alexandre Julliard April 29, 2024

April 29, 2024

Module: wine Branch: master Commit: 538ef6a5e00b1aeff5c397cbc6dcc4f4d09fc723 URL: https://gitlab.winehq.org/wine/wine/-/commit/538ef6a5e00b1aeff5c397cbc6dcc4… Author: Esme Povirk <esme(a)codeweavers.com> Date: Sat Apr 27 16:32:11 2024 +0000 windowscodecs: Check for overflow in jpeg_decoder_initialize. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56590 --- dlls/windowscodecs/libjpeg.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/windowscodecs/libjpeg.c b/dlls/windowscodecs/libjpeg.c index 3d8caac065c..22903ae4340 100644 --- a/dlls/windowscodecs/libjpeg.c +++ b/dlls/windowscodecs/libjpeg.c @@ -248,6 +248,10 @@ static HRESULT CDECL jpeg_decoder_initialize(struct decoder* iface, IStream *str This->stride = (This->frame.bpp * This->cinfo.output_width + 7) / 8; data_size = This->stride * This->cinfo.output_height; + if (data_size / This->stride < This->cinfo.output_height) + /* overflow in multiplication */ + return E_OUTOFMEMORY; + This->image_data = malloc(data_size); if (!This->image_data) return E_OUTOFMEMORY;

1 0

Brendan Shanks : widl: Use hardcoded build time in TLB custom data.
by Alexandre Julliard April 29, 2024

April 29, 2024

Module: wine Branch: master Commit: 563ef82416e9059f29c10eab2e48fa324170a4fb URL: https://gitlab.winehq.org/wine/wine/-/commit/563ef82416e9059f29c10eab2e48fa… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Apr 24 13:08:52 2024 -0700 widl: Use hardcoded build time in TLB custom data. This makes builds reproducible, and matches the current MIDL behavior (except that MIDL's string representation will vary with the build machine timezone). --- tools/widl/write_msft.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 31e340e6bcd..b9a3d6664f2 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -2757,7 +2757,6 @@ int create_msft_typelib(typelib_t *typelib) const statement_t *stmt; const attr_t *attr; time_t cur_time; - char *time_override; unsigned int version = 7 << 24 | 555; /* 7.00.0555 */ static const struct uuid midl_time_guid = {0xde77ba63,0x517c,0x11d1,{0xa2,0xda,0x00,0x00,0xf8,0x77,0x3c,0xe9}}; static const struct uuid midl_version_guid = {0xde77ba64,0x517c,0x11d1,{0xa2,0xda,0x00,0x00,0xf8,0x77,0x3c,0xe9}}; @@ -2813,11 +2812,13 @@ int create_msft_typelib(typelib_t *typelib) } } - /* midl adds two sets of custom data to the library: the current unix time - and midl's version number */ - time_override = getenv( "WIDL_TIME_OVERRIDE"); - cur_time = time_override ? atol( time_override) : time(NULL); - sprintf(info_string, "Created by WIDL version %s at %s", PACKAGE_VERSION, ctime(&cur_time)); + /* midl adds three sets of custom data to the library: + * - 2147483647 (INT_MAX, previously the current Unix time) + * - midl's version number + * - a string representation of those + */ + cur_time = 2147483647; + sprintf(info_string, "Created by WIDL version %s at %s", PACKAGE_VERSION, asctime(gmtime(&cur_time))); set_custdata(msft, &midl_info_guid, VT_BSTR, info_string, &msft->typelib_header.CustomDataOffset); set_custdata(msft, &midl_time_guid, VT_UI4, &cur_time, &msft->typelib_header.CustomDataOffset); set_custdata(msft, &midl_version_guid, VT_UI4, &version, &msft->typelib_header.CustomDataOffset);

1 0

Ziqing Hui : winegstreamer/video_decoder: Use video_decoder to implement wmv decoder.
by Alexandre Julliard April 29, 2024

April 29, 2024

Module: wine Branch: master Commit: e7225aaa94509ba7521993af597dee14510c506e URL: https://gitlab.winehq.org/wine/wine/-/commit/e7225aaa94509ba7521993af597dee… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Apr 11 15:50:21 2024 +0800 winegstreamer/video_decoder: Use video_decoder to implement wmv decoder. --- dlls/mf/tests/transform.c | 69 ++- dlls/winegstreamer/Makefile.in | 3 +- dlls/winegstreamer/video_decoder.c | 750 ++++++++++++++++++++++++++++- dlls/winegstreamer/wmv_decoder.c | 942 ------------------------------------- 4 files changed, 793 insertions(+), 971 deletions(-)

1 0

Ziqing Hui : winegstreamer/video_decoder: Add wg_transform_attrs member.
by Alexandre Julliard April 29, 2024

April 29, 2024

Module: wine Branch: master Commit: 930eabfff9d38de0e8804eb00c73eda0de776293 URL: https://gitlab.winehq.org/wine/wine/-/commit/930eabfff9d38de0e8804eb00c73ed… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Mon Apr 15 11:01:44 2024 +0800 winegstreamer/video_decoder: Add wg_transform_attrs member. --- dlls/winegstreamer/video_decoder.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/winegstreamer/video_decoder.c b/dlls/winegstreamer/video_decoder.c index 2aedbdf1402..065f2608ef8 100644 --- a/dlls/winegstreamer/video_decoder.c +++ b/dlls/winegstreamer/video_decoder.c @@ -64,6 +64,7 @@ struct video_decoder IMFMediaType *stream_type; wg_transform_t wg_transform; + struct wg_transform_attrs wg_transform_attrs; struct wg_sample_queue *wg_sample_queue; IMFVideoSampleAllocatorEx *allocator; @@ -84,12 +85,6 @@ static HRESULT try_create_wg_transform(struct video_decoder *decoder) * transform to be able to queue its input buffers. We need to use a buffer list * to match its expectations. */ - struct wg_transform_attrs attrs = - { - .output_plane_align = 15, - .input_queue_length = 15, - .allow_size_change = TRUE, - }; struct wg_format input_format; struct wg_format output_format; UINT32 low_latency; @@ -107,9 +102,9 @@ static HRESULT try_create_wg_transform(struct video_decoder *decoder) return MF_E_INVALIDMEDIATYPE; if (SUCCEEDED(IMFAttributes_GetUINT32(decoder->attributes, &MF_LOW_LATENCY, &low_latency))) - attrs.low_latency = !!low_latency; + decoder->wg_transform_attrs.low_latency = !!low_latency; - if (!(decoder->wg_transform = wg_transform_create(&input_format, &output_format, &attrs))) + if (!(decoder->wg_transform = wg_transform_create(&input_format, &output_format, &decoder->wg_transform_attrs))) { ERR("Failed to create transform with input major_type %u.\n", input_format.major_type); return E_FAIL; @@ -851,6 +846,9 @@ static HRESULT video_decoder_create_with_types(const GUID *const *input_types, U if (FAILED(hr = MFCreateSampleCopierMFT(&decoder->copier))) goto failed; + decoder->wg_transform_attrs.output_plane_align = 15; + decoder->wg_transform_attrs.input_queue_length = 15; + *ret = &decoder->IMFTransform_iface; TRACE("Created decoder %p\n", *ret); return S_OK; @@ -922,6 +920,8 @@ HRESULT h264_decoder_create(REFIID riid, void **out) | MFT_OUTPUT_STREAM_FIXED_SAMPLE_SIZE; decoder->output_info.cbSize = 1920 * 1088 * 2; + decoder->wg_transform_attrs.allow_size_change = TRUE; + hr = IMFTransform_QueryInterface(iface, riid, out); IMFTransform_Release(iface); return hr;

1 0

Ziqing Hui : winegstreamer/video_decoder: Change decoder attributes.
by Alexandre Julliard April 29, 2024

April 29, 2024

Module: wine Branch: master Commit: 08fa6367b05dc1ff7ef4310e91c3e5cc29ec035f URL: https://gitlab.winehq.org/wine/wine/-/commit/08fa6367b05dc1ff7ef4310e91c3e5… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Apr 24 10:31:51 2024 +0800 winegstreamer/video_decoder: Change decoder attributes. --- dlls/mf/tests/transform.c | 4 ++-- dlls/winegstreamer/video_decoder.c | 16 +++++++++++----- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index d1d52d62458..2a90c49f96e 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -3932,9 +3932,9 @@ static void test_h264_decoder(void) static const struct attribute_desc expect_transform_attributes[] = { ATTR_UINT32(MF_LOW_LATENCY, 0), - ATTR_UINT32(MF_SA_D3D_AWARE, 1, .todo = TRUE), + ATTR_UINT32(MF_SA_D3D_AWARE, 1), ATTR_UINT32(MF_SA_D3D11_AWARE, 1), - ATTR_UINT32(MFT_DECODER_EXPOSE_OUTPUT_TYPES_IN_NATIVE_ORDER, 0, .todo = TRUE), + ATTR_UINT32(MFT_DECODER_EXPOSE_OUTPUT_TYPES_IN_NATIVE_ORDER, 0), /* more H264 decoder specific attributes from CODECAPI */ ATTR_UINT32(AVDecVideoAcceleration_H264, 1), {0}, diff --git a/dlls/winegstreamer/video_decoder.c b/dlls/winegstreamer/video_decoder.c index 61ae579686e..2aedbdf1402 100644 --- a/dlls/winegstreamer/video_decoder.c +++ b/dlls/winegstreamer/video_decoder.c @@ -835,11 +835,11 @@ static HRESULT video_decoder_create_with_types(const GUID *const *input_types, U goto failed; if (FAILED(hr = MFCreateAttributes(&decoder->attributes, 16))) goto failed; - if (FAILED(hr = IMFAttributes_SetUINT32(decoder->attributes, &MF_LOW_LATENCY, 0))) - goto failed; - if (FAILED(hr = IMFAttributes_SetUINT32(decoder->attributes, &MF_SA_D3D11_AWARE, TRUE))) - goto failed; - if (FAILED(hr = IMFAttributes_SetUINT32(decoder->attributes, &AVDecVideoAcceleration_H264, TRUE))) + if (FAILED(hr = IMFAttributes_SetUINT32(decoder->attributes, &MF_LOW_LATENCY, FALSE)) + || FAILED(hr = IMFAttributes_SetUINT32(decoder->attributes, &MF_SA_D3D_AWARE, TRUE)) + || FAILED(hr = IMFAttributes_SetUINT32(decoder->attributes, &MF_SA_D3D11_AWARE, TRUE)) + || FAILED(hr = IMFAttributes_SetUINT32(decoder->attributes, + &MFT_DECODER_EXPOSE_OUTPUT_TYPES_IN_NATIVE_ORDER, FALSE))) goto failed; if (FAILED(hr = MFCreateAttributes(&decoder->output_attributes, 0))) @@ -909,6 +909,12 @@ HRESULT h264_decoder_create(REFIID riid, void **out) return hr; decoder = impl_from_IMFTransform(iface); + if (FAILED(hr = IMFAttributes_SetUINT32(decoder->attributes, &AVDecVideoAcceleration_H264, TRUE))) + { + IMFTransform_Release(iface); + return hr; + } + decoder->input_info.dwFlags = MFT_INPUT_STREAM_WHOLE_SAMPLES | MFT_INPUT_STREAM_SINGLE_SAMPLE_PER_BUFFER | MFT_INPUT_STREAM_FIXED_SAMPLE_SIZE; decoder->input_info.cbSize = 0x1000;

1 0

Ziqing Hui : winegstreamer/video_decoder: Set input/output infos in h264_decoder_create.
by Alexandre Julliard April 29, 2024

April 29, 2024

Module: wine Branch: master Commit: 2d5ec70958866c7e63ce6c35c985aaba5a25b56e URL: https://gitlab.winehq.org/wine/wine/-/commit/2d5ec70958866c7e63ce6c35c985aa… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Apr 12 17:44:40 2024 +0800 winegstreamer/video_decoder: Set input/output infos in h264_decoder_create. --- dlls/winegstreamer/video_decoder.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/winegstreamer/video_decoder.c b/dlls/winegstreamer/video_decoder.c index 9184a86b7f4..61ae579686e 100644 --- a/dlls/winegstreamer/video_decoder.c +++ b/dlls/winegstreamer/video_decoder.c @@ -831,13 +831,6 @@ static HRESULT video_decoder_create_with_types(const GUID *const *input_types, U decoder->output_type_count = output_type_count; decoder->output_types = output_types; - decoder->input_info.dwFlags = MFT_INPUT_STREAM_WHOLE_SAMPLES | MFT_INPUT_STREAM_SINGLE_SAMPLE_PER_BUFFER - | MFT_INPUT_STREAM_FIXED_SAMPLE_SIZE; - decoder->input_info.cbSize = 0x1000; - decoder->output_info.dwFlags = MFT_OUTPUT_STREAM_WHOLE_SAMPLES | MFT_OUTPUT_STREAM_SINGLE_SAMPLE_PER_BUFFER - | MFT_OUTPUT_STREAM_FIXED_SAMPLE_SIZE; - decoder->output_info.cbSize = 1920 * 1088 * 2; - if (FAILED(hr = MFCreateMediaType(&decoder->stream_type))) goto failed; if (FAILED(hr = MFCreateAttributes(&decoder->attributes, 16))) @@ -897,6 +890,7 @@ HRESULT h264_decoder_create(REFIID riid, void **out) }; static const struct wg_format input_format = {.major_type = WG_MAJOR_TYPE_VIDEO_H264}; struct wg_transform_attrs attrs = {0}; + struct video_decoder *decoder; wg_transform_t transform; IMFTransform *iface; HRESULT hr; @@ -913,6 +907,14 @@ HRESULT h264_decoder_create(REFIID riid, void **out) if (FAILED(hr = video_decoder_create_with_types(h264_decoder_input_types, ARRAY_SIZE(h264_decoder_input_types), video_decoder_output_types, ARRAY_SIZE(video_decoder_output_types), &iface))) return hr; + decoder = impl_from_IMFTransform(iface); + + decoder->input_info.dwFlags = MFT_INPUT_STREAM_WHOLE_SAMPLES | MFT_INPUT_STREAM_SINGLE_SAMPLE_PER_BUFFER + | MFT_INPUT_STREAM_FIXED_SAMPLE_SIZE; + decoder->input_info.cbSize = 0x1000; + decoder->output_info.dwFlags = MFT_OUTPUT_STREAM_WHOLE_SAMPLES | MFT_OUTPUT_STREAM_SINGLE_SAMPLE_PER_BUFFER + | MFT_OUTPUT_STREAM_FIXED_SAMPLE_SIZE; + decoder->output_info.cbSize = 1920 * 1088 * 2; hr = IMFTransform_QueryInterface(iface, riid, out); IMFTransform_Release(iface);

1 0

Rémi Bernon : winegstreamer: Introduce a new wg_transform_create_quartz helper.
by Alexandre Julliard April 29, 2024

April 29, 2024

Module: wine Branch: master Commit: cc395ce83f1e2dd64b0dff75a36ad421e02ed572 URL: https://gitlab.winehq.org/wine/wine/-/commit/cc395ce83f1e2dd64b0dff75a36ad4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 5 23:03:31 2024 +0100 winegstreamer: Introduce a new wg_transform_create_quartz helper. --- dlls/winegstreamer/gst_private.h | 2 ++ dlls/winegstreamer/main.c | 15 +++++++++++++++ dlls/winegstreamer/quartz_transform.c | 13 +++---------- 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 4bdef90e045..92805818ff4 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -83,6 +83,8 @@ void wg_parser_stream_seek(wg_parser_stream_t stream, double rate, wg_transform_t wg_transform_create(const struct wg_format *input_format, const struct wg_format *output_format, const struct wg_transform_attrs *attrs); +HRESULT wg_transform_create_quartz(const AM_MEDIA_TYPE *input_format, const AM_MEDIA_TYPE *output_format, + const struct wg_transform_attrs *attrs, wg_transform_t *transform); void wg_transform_destroy(wg_transform_t transform); bool wg_transform_set_output_format(wg_transform_t transform, struct wg_format *format); bool wg_transform_get_status(wg_transform_t transform, bool *accepts_input); diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index 4d38a2bf66c..8c5ad931e83 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -357,6 +357,21 @@ wg_transform_t wg_transform_create(const struct wg_format *input_format, return params.transform; } +HRESULT wg_transform_create_quartz(const AM_MEDIA_TYPE *input_type, const AM_MEDIA_TYPE *output_type, + const struct wg_transform_attrs *attrs, wg_transform_t *transform) +{ + struct wg_format input_format, output_format; + + if (!amt_to_wg_format(input_type, &input_format)) + return E_FAIL; + if (!amt_to_wg_format(output_type, &output_format)) + return E_FAIL; + + if (!(*transform = wg_transform_create(&input_format, &output_format, attrs))) + return E_FAIL; + return S_OK; +} + void wg_transform_destroy(wg_transform_t transform) { TRACE("transform %#I64x.\n", transform); diff --git a/dlls/winegstreamer/quartz_transform.c b/dlls/winegstreamer/quartz_transform.c index ad0c3077733..b85b24f4278 100644 --- a/dlls/winegstreamer/quartz_transform.c +++ b/dlls/winegstreamer/quartz_transform.c @@ -98,26 +98,19 @@ static HRESULT transform_query_interface(struct strmbase_filter *iface, REFIID i static HRESULT transform_init_stream(struct strmbase_filter *iface) { struct transform *filter = impl_from_strmbase_filter(iface); - struct wg_format input_format, output_format; struct wg_transform_attrs attrs = {0}; HRESULT hr; if (filter->source.pin.peer) { - if (!amt_to_wg_format(&filter->sink.pin.mt, &input_format)) - return E_FAIL; - - if (!amt_to_wg_format(&filter->source.pin.mt, &output_format)) - return E_FAIL; - if (FAILED(hr = wg_sample_queue_create(&filter->sample_queue))) return hr; - filter->transform = wg_transform_create(&input_format, &output_format, &attrs); - if (!filter->transform) + if (FAILED(hr = wg_transform_create_quartz(&filter->sink.pin.mt, &filter->source.pin.mt, + &attrs, &filter->transform))) { wg_sample_queue_destroy(filter->sample_queue); - return E_FAIL; + return hr; } hr = IMemAllocator_Commit(filter->source.pAllocator);

1 0