June 2023 - Wine-commits - list.winehq.org

Andrey Gusev : include: Add flags in D3D11_RESOURCE_MISC_FLAG.
by Alexandre Julliard 19 Jun '23

19 Jun '23

Module: wine Branch: master Commit: a5ea2c57c9acabbd368a2d0f78c9d2b3270c7edc URL: https://gitlab.winehq.org/wine/wine/-/commit/a5ea2c57c9acabbd368a2d0f78c9d2… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sat Jun 17 15:05:28 2023 +0300 include: Add flags in D3D11_RESOURCE_MISC_FLAG. --- include/d3d11.idl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/d3d11.idl b/include/d3d11.idl index 3aff03448c4..7a2a84a8b77 100644 --- a/include/d3d11.idl +++ b/include/d3d11.idl @@ -1036,7 +1036,9 @@ typedef enum D3D11_RESOURCE_MISC_FLAG D3D11_RESOURCE_MISC_GUARDED = 0x00008000L, D3D11_RESOURCE_MISC_TILE_POOL = 0x00020000L, D3D11_RESOURCE_MISC_TILED = 0x00040000L, - D3D11_RESOURCE_MISC_HW_PROTECTED = 0x00080000L + D3D11_RESOURCE_MISC_HW_PROTECTED = 0x00080000L, + D3D11_RESOURCE_MISC_SHARED_DISPLAYABLE = 0x00100000L, + D3D11_RESOURCE_MISC_SHARED_EXCLUSIVE_WRITER = 0x00200000L } D3D11_RESOURCE_MISC_FLAG; typedef struct D3D11_QUERY_DESC

1 0

Zebediah Figura : xaudio2/tests: Fix the IID_IXAudio28 declaration.
by Alexandre Julliard 19 Jun '23

19 Jun '23

Module: wine Branch: master Commit: e8b0e7c1fcf090ba80c543f68b0bdae185316327 URL: https://gitlab.winehq.org/wine/wine/-/commit/e8b0e7c1fcf090ba80c543f68b0bda… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jun 16 15:13:14 2023 -0500 xaudio2/tests: Fix the IID_IXAudio28 declaration. This was accidentally copied from the 2.9 version instead in 14c44d0b0. --- dlls/xaudio2_7/tests/xaudio2.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/xaudio2_7/tests/xaudio2.c b/dlls/xaudio2_7/tests/xaudio2.c index f72350494a5..759bf5b00af 100644 --- a/dlls/xaudio2_7/tests/xaudio2.c +++ b/dlls/xaudio2_7/tests/xaudio2.c @@ -38,7 +38,7 @@ #include "ksmedia.h" static const GUID IID_IXAudio27 = {0x8bcf1f58, 0x9fe7, 0x4583, {0x8a, 0xc6, 0xe2, 0xad, 0xc4, 0x65, 0xc8, 0xbb}}; -static const GUID IID_IXAudio28 = {0x2b02e3cf, 0x2e0b, 0x4ec3, {0xbe, 0x45, 0x1b, 0x2a, 0x3f, 0xe7, 0x21, 0x0d}}; +static const GUID IID_IXAudio28 = {0x60d8dac8, 0x5aa1, 0x4e8e, {0xb5, 0x97, 0x2f, 0x5e, 0x28, 0x83, 0xd4, 0x84}}; static const GUID CLSID_AudioVolumeMeter20 = {0xc0c56f46, 0x29b1, 0x44e9, {0x99, 0x39, 0xa3, 0x2c, 0xe8, 0x68, 0x67, 0xe2}}; static const GUID CLSID_AudioVolumeMeter21 = {0xc1e3f122, 0xa2ea, 0x442c, {0x85, 0x4f, 0x20, 0xd9, 0x8f, 0x83, 0x57, 0xa1}}; @@ -1214,8 +1214,7 @@ START_TEST(xaudio2) if (hr == S_OK) IXAudio2_Release(audio2); hr = IXAudio2_QueryInterface(audio, &IID_IXAudio28, (void **)&audio2); - todo_wine_if (!xaudio27) - ok(hr == (xaudio27 ? E_NOINTERFACE : S_OK), "Got hr %#lx.\n", hr); + ok(hr == (xaudio27 ? E_NOINTERFACE : S_OK), "Got hr %#lx.\n", hr); if (hr == S_OK) IXAudio2_Release(audio2);

1 0

Conor McCarthy : vkd3d-shader/spirv: Take ownership of the shader signatures in spirv_compiler_create().
by Alexandre Julliard 19 Jun '23

19 Jun '23

Module: vkd3d Branch: master Commit: bce2a898b3a61e1bbff97d047f9edb56ed46bd49 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/bce2a898b3a61e1bbff97d047f9ed… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Jun 16 21:44:50 2023 +1000 vkd3d-shader/spirv: Take ownership of the shader signatures in spirv_compiler_create(). Fixes leakage of the replacement elements in shader_signature_merge(). --- libs/vkd3d-shader/ir.c | 3 +-- libs/vkd3d-shader/spirv.c | 11 +++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index d542fbb0..9eefb82c 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -715,8 +715,7 @@ static bool shader_signature_merge(struct shader_signature *s, uint8_t range_map } } element_count = new_count; - /* Signature 's' is a copy of the original signature struct, so we can replace - * the 'elements' pointer without freeing it. */ + vkd3d_free(s->elements); s->elements = elements; s->element_count = element_count; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index a6700e66..080b2204 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2324,11 +2324,15 @@ static void spirv_compiler_destroy(struct spirv_compiler *compiler) vkd3d_string_buffer_cache_cleanup(&compiler->string_buffers); + shader_signature_cleanup(&compiler->input_signature); + shader_signature_cleanup(&compiler->output_signature); + shader_signature_cleanup(&compiler->patch_constant_signature); + vkd3d_free(compiler); } static struct spirv_compiler *spirv_compiler_create(const struct vkd3d_shader_version *shader_version, - const struct vkd3d_shader_desc *shader_desc, const struct vkd3d_shader_compile_info *compile_info, + struct vkd3d_shader_desc *shader_desc, const struct vkd3d_shader_compile_info *compile_info, const struct vkd3d_shader_scan_descriptor_info *scan_descriptor_info, struct vkd3d_shader_message_context *message_context, const struct vkd3d_shader_location *location) { @@ -2428,6 +2432,9 @@ static struct spirv_compiler *spirv_compiler_create(const struct vkd3d_shader_ve compiler->input_signature = shader_desc->input_signature; compiler->output_signature = shader_desc->output_signature; compiler->patch_constant_signature = shader_desc->patch_constant_signature; + memset(&shader_desc->input_signature, 0, sizeof(shader_desc->input_signature)); + memset(&shader_desc->output_signature, 0, sizeof(shader_desc->output_signature)); + memset(&shader_desc->patch_constant_signature, 0, sizeof(shader_desc->patch_constant_signature)); if ((shader_interface = vkd3d_find_struct(compile_info->next, INTERFACE_INFO))) { @@ -9451,7 +9458,7 @@ static int spirv_compiler_generate_spirv(struct spirv_compiler *compiler, && (result = instruction_array_flatten_hull_shader_phases(&instructions)) >= 0) { result = instruction_array_normalise_hull_shader_control_point_io(&instructions, - &parser->shader_desc.input_signature); + &compiler->input_signature); } if (result >= 0) result = instruction_array_normalise_io_registers(&instructions, parser->shader_version.type,

1 0

Alex Henrie : msi: Fix memory leaks in HANDLE_CustomType23 (scan-build).
by Alexandre Julliard 16 Jun '23

16 Jun '23

Module: wine Branch: master Commit: 993f4d48d23477e70e92256890c77687a1c4ba08 URL: https://gitlab.winehq.org/wine/wine/-/commit/993f4d48d23477e70e92256890c776… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jun 13 00:17:14 2023 -0600 msi: Fix memory leaks in HANDLE_CustomType23 (scan-build). --- dlls/msi/custom.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 8b020db260d..d1e064f5b65 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -1021,6 +1021,7 @@ static UINT HANDLE_CustomType23( MSIPACKAGE *package, const WCHAR *source, const if (!(args = build_msiexec_args( filename, target ))) { free( dir ); + free( filename ); return ERROR_OUTOFMEMORY; } @@ -1028,6 +1029,7 @@ static UINT HANDLE_CustomType23( MSIPACKAGE *package, const WCHAR *source, const handle = execute_command( L"msiexec", args, dir ); free( dir ); + free( filename ); free( args ); if (handle == INVALID_HANDLE_VALUE) return ERROR_SUCCESS; return wait_process_handle( package, type, handle, action );

1 0

Rémi Bernon : winegstreamer: Introduce new stream_descriptor_set_tag helper.
by Alexandre Julliard 16 Jun '23

16 Jun '23

Module: wine Branch: master Commit: 694c33453626290792c991c3f7cce482439d9405 URL: https://gitlab.winehq.org/wine/wine/-/commit/694c33453626290792c991c3f7cce4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Apr 29 12:20:42 2023 +0200 winegstreamer: Introduce new stream_descriptor_set_tag helper. --- dlls/winegstreamer/media_source.c | 82 ++++++++++++++++++++++----------------- 1 file changed, 46 insertions(+), 36 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 700ab59bc7f..9a061a43e3c 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -293,6 +293,32 @@ static IMFStreamDescriptor *stream_descriptor_from_id(IMFPresentationDescriptor return NULL; } +static HRESULT stream_descriptor_set_tag(IMFStreamDescriptor *descriptor, struct wg_parser_stream *stream, + const GUID *attr, enum wg_parser_tag tag) +{ + WCHAR *strW; + HRESULT hr; + DWORD len; + char *str; + + if (!(str = wg_parser_stream_get_tag(stream, tag)) + || !(len = MultiByteToWideChar(CP_UTF8, 0, str, -1, NULL, 0))) + hr = S_OK; + else if (!(strW = malloc(len * sizeof(*strW)))) + hr = E_OUTOFMEMORY; + else + { + if (MultiByteToWideChar(CP_UTF8, 0, str, -1, strW, len)) + hr = IMFStreamDescriptor_SetString(descriptor, attr, strW); + else + hr = E_FAIL; + free(strW); + } + + free(str); + return hr; +} + static BOOL enqueue_token(struct media_stream *stream, IUnknown *token) { if (stream->token_queue_count == stream->token_queue_cap) @@ -1476,6 +1502,25 @@ static const IMFMediaSourceVtbl IMFMediaSource_vtbl = media_source_Shutdown, }; +static void media_source_init_descriptors(struct media_source *source) +{ + HRESULT hr = S_OK; + UINT i; + + for (i = 0; i < source->stream_count; i++) + { + struct media_stream *stream = source->streams[i]; + IMFStreamDescriptor *descriptor = stream->descriptor; + + if (FAILED(hr = stream_descriptor_set_tag(descriptor, stream->wg_stream, + &MF_SD_LANGUAGE, WG_PARSER_TAG_LANGUAGE))) + WARN("Failed to set stream descriptor language, hr %#lx\n", hr); + if (FAILED(hr = stream_descriptor_set_tag(descriptor, stream->wg_stream, + &MF_SD_STREAM_NAME, WG_PARSER_TAG_NAME))) + WARN("Failed to set stream descriptor name, hr %#lx\n", hr); + } +} + static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_source **out_media_source) { unsigned int stream_count = UINT_MAX; @@ -1574,42 +1619,7 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ object->stream_count++; } - /* init presentation descriptor */ - - for (i = 0; i < object->stream_count; i++) - { - static const struct - { - enum wg_parser_tag tag; - const GUID *mf_attr; - } - tags[] = - { - {WG_PARSER_TAG_LANGUAGE, &MF_SD_LANGUAGE}, - {WG_PARSER_TAG_NAME, &MF_SD_STREAM_NAME}, - }; - unsigned int j; - WCHAR *strW; - DWORD len; - char *str; - - for (j = 0; j < ARRAY_SIZE(tags); ++j) - { - if (!(str = wg_parser_stream_get_tag(object->streams[i]->wg_stream, tags[j].tag))) - continue; - if (!(len = MultiByteToWideChar(CP_UTF8, 0, str, -1, NULL, 0))) - { - free(str); - continue; - } - strW = malloc(len * sizeof(*strW)); - if (MultiByteToWideChar(CP_UTF8, 0, str, -1, strW, len)) - IMFStreamDescriptor_SetString(object->descriptors[i], tags[j].mf_attr, strW); - free(strW); - free(str); - } - } - + media_source_init_descriptors(object); object->state = SOURCE_STOPPED; *out_media_source = object;

1 0

Rémi Bernon : winegstreamer: Pass a struct wg_parser_stream to media_stream_create.
by Alexandre Julliard 16 Jun '23

16 Jun '23

Module: wine Branch: master Commit: 82b1cc3cbe61dd9ff7afacd1a3a2f74245ec3d3e URL: https://gitlab.winehq.org/wine/wine/-/commit/82b1cc3cbe61dd9ff7afacd1a3a2f7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 1 08:32:50 2023 +0200 winegstreamer: Pass a struct wg_parser_stream to media_stream_create. --- dlls/winegstreamer/media_source.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 9a061a43e3c..d4a08b84787 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -881,13 +881,12 @@ static const IMFMediaStreamVtbl media_stream_vtbl = }; static HRESULT media_stream_create(IMFMediaSource *source, DWORD id, - struct media_stream **out) + struct wg_parser_stream *wg_stream, struct media_stream **out) { - struct wg_parser *wg_parser = impl_from_IMFMediaSource(source)->wg_parser; struct media_stream *object; HRESULT hr; - TRACE("source %p, id %lu.\n", source, id); + TRACE("source %p, id %lu, wg_stream %p.\n", source, id, wg_stream); if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; @@ -907,7 +906,7 @@ static HRESULT media_stream_create(IMFMediaSource *source, DWORD id, object->active = TRUE; object->eos = FALSE; - object->wg_stream = wg_parser_get_stream(wg_parser, id); + object->wg_stream = wg_stream; TRACE("Created stream object %p.\n", object); @@ -1599,9 +1598,10 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ for (i = 0; i < stream_count; ++i) { + struct wg_parser_stream *wg_stream = wg_parser_get_stream(object->wg_parser, i); struct media_stream *stream; - if (FAILED(hr = media_stream_create(&object->IMFMediaSource_iface, i, &stream))) + if (FAILED(hr = media_stream_create(&object->IMFMediaSource_iface, i, wg_stream, &stream))) goto fail; if (FAILED(hr = media_stream_init_desc(stream))) { @@ -1612,7 +1612,7 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ goto fail; } - object->duration = max(object->duration, wg_parser_stream_get_duration(stream->wg_stream)); + object->duration = max(object->duration, wg_parser_stream_get_duration(wg_stream)); IMFStreamDescriptor_AddRef(stream->descriptor); object->descriptors[i] = stream->descriptor; object->streams[i] = stream;

1 0

Rémi Bernon : winegstreamer: Factor the creation of the first stream media type.
by Alexandre Julliard 16 Jun '23

16 Jun '23

Module: wine Branch: master Commit: b0ecfc96df7488d401e9e0a115ff03f8ff83e740 URL: https://gitlab.winehq.org/wine/wine/-/commit/b0ecfc96df7488d401e9e0a115ff03… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 1 08:58:45 2023 +0200 winegstreamer: Factor the creation of the first stream media type. --- dlls/winegstreamer/media_source.c | 31 +++++-------------------------- 1 file changed, 5 insertions(+), 26 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index d4a08b84787..97c1599b7ca 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -925,6 +925,10 @@ static HRESULT media_stream_init_desc(struct media_stream *stream) wg_parser_stream_get_preferred_format(stream->wg_stream, &format); + if (!(stream_types[0] = mf_media_type_from_wg_format(&format))) + return MF_E_INVALIDMEDIATYPE; + type_count = 1; + if (format.major_type == WG_MAJOR_TYPE_VIDEO) { /* Try to prefer YUV formats over RGB ones. Most decoders output in the @@ -937,20 +941,9 @@ static HRESULT media_stream_init_desc(struct media_stream *stream) WG_VIDEO_FORMAT_YUY2, WG_VIDEO_FORMAT_I420, }; - - IMFMediaType *base_type = mf_media_type_from_wg_format(&format); GUID base_subtype; - if (!base_type) - { - hr = MF_E_INVALIDMEDIATYPE; - goto done; - } - - IMFMediaType_GetGUID(base_type, &MF_MT_SUBTYPE, &base_subtype); - - stream_types[0] = base_type; - type_count = 1; + IMFMediaType_GetGUID(stream_types[0], &MF_MT_SUBTYPE, &base_subtype); for (i = 0; i < ARRAY_SIZE(video_formats); ++i) { @@ -990,9 +983,6 @@ static HRESULT media_stream_init_desc(struct media_stream *stream) WG_AUDIO_FORMAT_F32LE, }; - if ((stream_types[0] = mf_media_type_from_wg_format(&format))) - type_count = 1; - for (i = 0; i < ARRAY_SIZE(audio_types); i++) { struct wg_format new_format; @@ -1004,20 +994,9 @@ static HRESULT media_stream_init_desc(struct media_stream *stream) type_count++; } } - else - { - if ((stream_types[0] = mf_media_type_from_wg_format(&format))) - type_count = 1; - } assert(type_count <= ARRAY_SIZE(stream_types)); - if (!type_count) - { - ERR("Failed to establish an IMFMediaType from any of the possible stream caps!\n"); - return E_FAIL; - } - if (FAILED(hr = MFCreateStreamDescriptor(stream->stream_id, type_count, stream_types, &stream->descriptor))) goto done;

1 0

Rémi Bernon : winegstreamer: Introduce new init_video_media_types helper.
by Alexandre Julliard 16 Jun '23

16 Jun '23

Module: wine Branch: master Commit: 3a603357bcc83908ef22f0bed8f5990b1527fcd3 URL: https://gitlab.winehq.org/wine/wine/-/commit/3a603357bcc83908ef22f0bed8f599… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 1 09:04:12 2023 +0200 winegstreamer: Introduce new init_video_media_types helper. --- dlls/winegstreamer/media_source.c | 95 ++++++++++++++++++++++----------------- 1 file changed, 54 insertions(+), 41 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 97c1599b7ca..ea34eb22fcf 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -319,6 +319,58 @@ static HRESULT stream_descriptor_set_tag(IMFStreamDescriptor *descriptor, struct return hr; } +static HRESULT init_video_media_types(struct wg_format *format, IMFMediaType *types[6], DWORD *types_count) +{ + /* Try to prefer YUV formats over RGB ones. Most decoders output in the + * YUV color space, and it's generally much less expensive for + * videoconvert to do YUV -> YUV transformations. */ + static const enum wg_video_format video_formats[] = + { + WG_VIDEO_FORMAT_NV12, + WG_VIDEO_FORMAT_YV12, + WG_VIDEO_FORMAT_YUY2, + WG_VIDEO_FORMAT_I420, + }; + UINT count = *types_count, i; + GUID base_subtype; + HRESULT hr; + + if (FAILED(hr = IMFMediaType_GetGUID(types[0], &MF_MT_SUBTYPE, &base_subtype))) + return hr; + + for (i = 0; i < ARRAY_SIZE(video_formats); ++i) + { + struct wg_format new_format = *format; + IMFMediaType *new_type; + + new_format.u.video.format = video_formats[i]; + + if (!(new_type = mf_media_type_from_wg_format(&new_format))) + { + hr = E_OUTOFMEMORY; + goto done; + } + types[count++] = new_type; + + if (video_formats[i] == WG_VIDEO_FORMAT_I420) + { + IMFMediaType *iyuv_type; + + if (FAILED(hr = MFCreateMediaType(&iyuv_type))) + goto done; + if (FAILED(hr = IMFMediaType_CopyAllItems(new_type, (IMFAttributes *)iyuv_type))) + goto done; + if (FAILED(hr = IMFMediaType_SetGUID(iyuv_type, &MF_MT_SUBTYPE, &MFVideoFormat_IYUV))) + goto done; + types[count++] = iyuv_type; + } + } + +done: + *types_count = count; + return hr; +} + static BOOL enqueue_token(struct media_stream *stream, IUnknown *token) { if (stream->token_queue_count == stream->token_queue_cap) @@ -931,47 +983,8 @@ static HRESULT media_stream_init_desc(struct media_stream *stream) if (format.major_type == WG_MAJOR_TYPE_VIDEO) { - /* Try to prefer YUV formats over RGB ones. Most decoders output in the - * YUV color space, and it's generally much less expensive for - * videoconvert to do YUV -> YUV transformations. */ - static const enum wg_video_format video_formats[] = - { - WG_VIDEO_FORMAT_NV12, - WG_VIDEO_FORMAT_YV12, - WG_VIDEO_FORMAT_YUY2, - WG_VIDEO_FORMAT_I420, - }; - GUID base_subtype; - - IMFMediaType_GetGUID(stream_types[0], &MF_MT_SUBTYPE, &base_subtype); - - for (i = 0; i < ARRAY_SIZE(video_formats); ++i) - { - struct wg_format new_format = format; - IMFMediaType *new_type; - - new_format.u.video.format = video_formats[i]; - - if (!(new_type = mf_media_type_from_wg_format(&new_format))) - { - hr = E_OUTOFMEMORY; - goto done; - } - stream_types[type_count++] = new_type; - - if (video_formats[i] == WG_VIDEO_FORMAT_I420) - { - IMFMediaType *iyuv_type; - - if (FAILED(hr = MFCreateMediaType(&iyuv_type))) - goto done; - if (FAILED(hr = IMFMediaType_CopyAllItems(new_type, (IMFAttributes *)iyuv_type))) - goto done; - if (FAILED(hr = IMFMediaType_SetGUID(iyuv_type, &MF_MT_SUBTYPE, &MFVideoFormat_IYUV))) - goto done; - stream_types[type_count++] = iyuv_type; - } - } + if (FAILED(hr = init_video_media_types(&format, stream_types, &type_count))) + goto done; } else if (format.major_type == WG_MAJOR_TYPE_AUDIO) {

1 0

Rémi Bernon : winegstreamer: Introduce new init_audio_media_types helper.
by Alexandre Julliard 16 Jun '23

16 Jun '23

Module: wine Branch: master Commit: 43ea59fdf92b440178f61503664a21f63ac0b2f6 URL: https://gitlab.winehq.org/wine/wine/-/commit/43ea59fdf92b440178f61503664a21… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 1 09:04:34 2023 +0200 winegstreamer: Introduce new init_audio_media_types helper. --- dlls/winegstreamer/media_source.c | 45 +++++++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 18 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index ea34eb22fcf..de7094781f2 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -371,6 +371,31 @@ done: return hr; } +static HRESULT init_audio_media_types(struct wg_format *format, IMFMediaType *types[6], DWORD *types_count) +{ + /* Expose at least one PCM and one floating point type for the + consumer to pick from. */ + static const enum wg_audio_format audio_types[] = + { + WG_AUDIO_FORMAT_S16LE, + WG_AUDIO_FORMAT_F32LE, + }; + UINT count = *types_count, i; + + for (i = 0; i < ARRAY_SIZE(audio_types); i++) + { + struct wg_format new_format = *format; + if (new_format.u.audio.format == audio_types[i]) + continue; + new_format.u.audio.format = audio_types[i]; + if ((types[count] = mf_media_type_from_wg_format(&new_format))) + count++; + } + + *types_count = count; + return S_OK; +} + static BOOL enqueue_token(struct media_stream *stream, IUnknown *token) { if (stream->token_queue_count == stream->token_queue_cap) @@ -988,24 +1013,8 @@ static HRESULT media_stream_init_desc(struct media_stream *stream) } else if (format.major_type == WG_MAJOR_TYPE_AUDIO) { - /* Expose at least one PCM and one floating point type for the - consumer to pick from. */ - static const enum wg_audio_format audio_types[] = - { - WG_AUDIO_FORMAT_S16LE, - WG_AUDIO_FORMAT_F32LE, - }; - - for (i = 0; i < ARRAY_SIZE(audio_types); i++) - { - struct wg_format new_format; - if (format.u.audio.format == audio_types[i]) - continue; - new_format = format; - new_format.u.audio.format = audio_types[i]; - if ((stream_types[type_count] = mf_media_type_from_wg_format(&new_format))) - type_count++; - } + if (FAILED(hr = init_audio_media_types(&format, stream_types, &type_count))) + goto done; } assert(type_count <= ARRAY_SIZE(stream_types));

1 0

Rémi Bernon : winegstreamer: Pass the stream descriptor to media_stream_create.
by Alexandre Julliard 16 Jun '23

16 Jun '23

Module: wine Branch: master Commit: 330827a0112e15dbde92096e072ab3a090605d40 URL: https://gitlab.winehq.org/wine/wine/-/commit/330827a0112e15dbde92096e072ab3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jun 6 09:23:54 2023 +0200 winegstreamer: Pass the stream descriptor to media_stream_create. --- dlls/winegstreamer/media_source.c | 117 ++++++++++++++++++-------------------- 1 file changed, 55 insertions(+), 62 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index de7094781f2..d404662e5bb 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -396,6 +396,49 @@ static HRESULT init_audio_media_types(struct wg_format *format, IMFMediaType *ty return S_OK; } +static HRESULT stream_descriptor_create(UINT32 id, struct wg_format *format, IMFStreamDescriptor **out) +{ + IMFStreamDescriptor *descriptor; + IMFMediaTypeHandler *handler; + IMFMediaType *types[6]; + DWORD count = 0; + HRESULT hr; + + if (!(types[0] = mf_media_type_from_wg_format(format))) + return MF_E_INVALIDMEDIATYPE; + count = 1; + + if (format->major_type == WG_MAJOR_TYPE_VIDEO) + { + if (FAILED(hr = init_video_media_types(format, types, &count))) + goto done; + } + else if (format->major_type == WG_MAJOR_TYPE_AUDIO) + { + if (FAILED(hr = init_audio_media_types(format, types, &count))) + goto done; + } + + assert(count <= ARRAY_SIZE(types)); + + if (FAILED(hr = MFCreateStreamDescriptor(id, count, types, &descriptor))) + goto done; + + if (FAILED(hr = IMFStreamDescriptor_GetMediaTypeHandler(descriptor, &handler))) + IMFStreamDescriptor_Release(descriptor); + else + { + hr = IMFMediaTypeHandler_SetCurrentMediaType(handler, types[0]); + IMFMediaTypeHandler_Release(handler); + } + +done: + while (count--) + IMFMediaType_Release(types[count]); + *out = SUCCEEDED(hr) ? descriptor : NULL; + return hr; +} + static BOOL enqueue_token(struct media_stream *stream, IUnknown *token) { if (stream->token_queue_count == stream->token_queue_cap) @@ -957,13 +1000,13 @@ static const IMFMediaStreamVtbl media_stream_vtbl = media_stream_RequestSample }; -static HRESULT media_stream_create(IMFMediaSource *source, DWORD id, +static HRESULT media_stream_create(IMFMediaSource *source, IMFStreamDescriptor *descriptor, struct wg_parser_stream *wg_stream, struct media_stream **out) { struct media_stream *object; HRESULT hr; - TRACE("source %p, id %lu, wg_stream %p.\n", source, id, wg_stream); + TRACE("source %p, descriptor %p, wg_stream %p.\n", source, descriptor, wg_stream); if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; @@ -979,7 +1022,8 @@ static HRESULT media_stream_create(IMFMediaSource *source, DWORD id, IMFMediaSource_AddRef(source); object->media_source = source; - object->stream_id = id; + IMFStreamDescriptor_AddRef(descriptor); + object->descriptor = descriptor; object->active = TRUE; object->eos = FALSE; @@ -991,57 +1035,6 @@ static HRESULT media_stream_create(IMFMediaSource *source, DWORD id, return S_OK; } -static HRESULT media_stream_init_desc(struct media_stream *stream) -{ - IMFMediaTypeHandler *type_handler = NULL; - IMFMediaType *stream_types[6]; - struct wg_format format; - DWORD type_count = 0; - unsigned int i; - HRESULT hr; - - wg_parser_stream_get_preferred_format(stream->wg_stream, &format); - - if (!(stream_types[0] = mf_media_type_from_wg_format(&format))) - return MF_E_INVALIDMEDIATYPE; - type_count = 1; - - if (format.major_type == WG_MAJOR_TYPE_VIDEO) - { - if (FAILED(hr = init_video_media_types(&format, stream_types, &type_count))) - goto done; - } - else if (format.major_type == WG_MAJOR_TYPE_AUDIO) - { - if (FAILED(hr = init_audio_media_types(&format, stream_types, &type_count))) - goto done; - } - - assert(type_count <= ARRAY_SIZE(stream_types)); - - if (FAILED(hr = MFCreateStreamDescriptor(stream->stream_id, type_count, stream_types, &stream->descriptor))) - goto done; - - if (FAILED(hr = IMFStreamDescriptor_GetMediaTypeHandler(stream->descriptor, &type_handler))) - { - IMFStreamDescriptor_Release(stream->descriptor); - goto done; - } - - if (FAILED(hr = IMFMediaTypeHandler_SetCurrentMediaType(type_handler, stream_types[0]))) - { - IMFStreamDescriptor_Release(stream->descriptor); - goto done; - } - -done: - if (type_handler) - IMFMediaTypeHandler_Release(type_handler); - for (i = 0; i < type_count; i++) - IMFMediaType_Release(stream_types[i]); - return hr; -} - static HRESULT WINAPI media_source_get_service_QueryInterface(IMFGetService *iface, REFIID riid, void **obj) { struct media_source *source = impl_from_IMFGetService(iface); @@ -1600,22 +1593,22 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ for (i = 0; i < stream_count; ++i) { struct wg_parser_stream *wg_stream = wg_parser_get_stream(object->wg_parser, i); + IMFStreamDescriptor *descriptor; struct media_stream *stream; + struct wg_format format; - if (FAILED(hr = media_stream_create(&object->IMFMediaSource_iface, i, wg_stream, &stream))) + wg_parser_stream_get_preferred_format(wg_stream, &format); + if (FAILED(hr = stream_descriptor_create(i, &format, &descriptor))) goto fail; - if (FAILED(hr = media_stream_init_desc(stream))) + if (FAILED(hr = media_stream_create(&object->IMFMediaSource_iface, descriptor, wg_stream, &stream))) { - ERR("Failed to finish initialization of media stream %p, hr %#lx.\n", stream, hr); - IMFMediaSource_Release(stream->media_source); - IMFMediaEventQueue_Release(stream->event_queue); - free(stream); + IMFStreamDescriptor_Release(descriptor); goto fail; } object->duration = max(object->duration, wg_parser_stream_get_duration(wg_stream)); - IMFStreamDescriptor_AddRef(stream->descriptor); - object->descriptors[i] = stream->descriptor; + IMFStreamDescriptor_AddRef(descriptor); + object->descriptors[i] = descriptor; object->streams[i] = stream; object->stream_count++; }

1 0