wine-commits August 2022

wine-commits@winehq.org

1 participants
596 discussions

Rémi Bernon : mf: Implement SAR media type required attributes checks.
by Alexandre Julliard 02 Aug '22

02 Aug '22

Module: wine Branch: master Commit: c806c4eed541a6b9e39b20fb2484edea4cf26eba URL: https://gitlab.winehq.org/wine/wine/-/commit/c806c4eed541a6b9e39b20fb2484ed… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jul 29 18:11:15 2022 +0200 mf: Implement SAR media type required attributes checks. --- dlls/mf/sar.c | 49 +++++++++++++++++++++++++++++++++++++++++-------- dlls/mf/tests/mf.c | 2 -- 2 files changed, 41 insertions(+), 10 deletions(-) diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c index 2aabb1fe10f..84824f954dd 100644 --- a/dlls/mf/sar.c +++ b/dlls/mf/sar.c @@ -1499,20 +1499,57 @@ static ULONG WINAPI audio_renderer_stream_type_handler_Release(IMFMediaTypeHandl return IMFStreamSink_Release(&renderer->IMFStreamSink_iface); } +static HRESULT check_media_type(IMFMediaType *type, IMFMediaType *current) +{ + static const GUID *required_attrs[] = + { + &MF_MT_AUDIO_SAMPLES_PER_SECOND, + &MF_MT_AUDIO_NUM_CHANNELS, + &MF_MT_AUDIO_BITS_PER_SAMPLE, + &MF_MT_AUDIO_BLOCK_ALIGNMENT, + &MF_MT_AUDIO_AVG_BYTES_PER_SECOND, + }; + PROPVARIANT value; + BOOL result; + HRESULT hr; + GUID major; + int i; + + if (FAILED(hr = IMFMediaType_GetGUID(type, &MF_MT_MAJOR_TYPE, &major))) + return hr; + if (!IsEqualGUID(&major, &MFMediaType_Audio)) + return MF_E_INVALIDMEDIATYPE; + + for (i = 0; SUCCEEDED(hr) && i < ARRAY_SIZE(required_attrs); ++i) + { + PropVariantInit(&value); + hr = IMFMediaType_GetItem(type, required_attrs[i], &value); + if (SUCCEEDED(hr)) + hr = IMFMediaType_CompareItem(current, required_attrs[i], &value, &result); + if (SUCCEEDED(hr) && !result) + hr = MF_E_INVALIDMEDIATYPE; + PropVariantClear(&value); + } + + if (FAILED(hr)) + return MF_E_INVALIDMEDIATYPE; + + return S_OK; +} + static HRESULT WINAPI audio_renderer_stream_type_handler_IsMediaTypeSupported(IMFMediaTypeHandler *iface, IMFMediaType *in_type, IMFMediaType **out_type) { struct audio_renderer *renderer = impl_from_IMFMediaTypeHandler(iface); - DWORD flags; HRESULT hr; TRACE("%p, %p, %p.\n", iface, in_type, out_type); EnterCriticalSection(&renderer->cs); - hr = IMFMediaType_IsEqual(renderer->media_type, in_type, &flags); + hr = check_media_type(in_type, renderer->media_type); LeaveCriticalSection(&renderer->cs); - return hr != S_OK ? MF_E_INVALIDMEDIATYPE : hr; + return hr; } static HRESULT WINAPI audio_renderer_stream_type_handler_GetMediaTypeCount(IMFMediaTypeHandler *iface, DWORD *count) @@ -1625,10 +1662,8 @@ static HRESULT WINAPI audio_renderer_stream_type_handler_SetCurrentMediaType(IMF IMFMediaType *media_type) { struct audio_renderer *renderer = impl_from_IMFMediaTypeHandler(iface); - const unsigned int test_flags = MF_MEDIATYPE_EQUAL_MAJOR_TYPES | MF_MEDIATYPE_EQUAL_FORMAT_TYPES; BOOL compare_result; HRESULT hr = S_OK; - DWORD flags; TRACE("%p, %p.\n", iface, media_type); @@ -1636,7 +1671,7 @@ static HRESULT WINAPI audio_renderer_stream_type_handler_SetCurrentMediaType(IMF return E_POINTER; EnterCriticalSection(&renderer->cs); - if (SUCCEEDED(IMFMediaType_IsEqual(renderer->media_type, media_type, &flags)) && ((flags & test_flags) == test_flags)) + if (SUCCEEDED(hr = check_media_type(media_type, renderer->media_type))) { if (renderer->current_media_type) IMFMediaType_Release(renderer->current_media_type); @@ -1745,8 +1780,6 @@ static HRESULT audio_renderer_collect_supported_types(struct audio_renderer *ren return hr; } - IMFMediaType_DeleteItem(renderer->media_type, &MF_MT_AUDIO_PREFER_WAVEFORMATEX); - return hr; } diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 4638edbec76..10f69e73a8b 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -4651,13 +4651,11 @@ if (SUCCEEDED(hr)) hr = MFCreateMediaType(&mediatype); ok(hr == S_OK, "MFCreateMediaType returned %#lx\n", hr); hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, mediatype, NULL); - todo_wine ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#lx.\n", hr); init_media_type(mediatype, rate == 44100 ? input_type_desc_44100 : input_type_desc_48000, 2); for (int i = 1; i < (rate == 44100 ? ARRAY_SIZE(input_type_desc_44100) : ARRAY_SIZE(input_type_desc_48000)) - 1; ++i) { hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, mediatype, NULL); - todo_wine ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#lx.\n", hr); init_media_type(mediatype, rate == 44100 ? input_type_desc_44100 : input_type_desc_48000, i + 1); }

1 0

Rémi Bernon : winegstreamer: Set the MF_MT_AUDIO_AVG_BYTES_PER_SECOND attribute.
by Alexandre Julliard 02 Aug '22

02 Aug '22

Module: wine Branch: master Commit: e5a512eb93663238f0ea85a19bdfec662b101134 URL: https://gitlab.winehq.org/wine/wine/-/commit/e5a512eb93663238f0ea85a19bdfec… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 27 11:38:57 2022 +0200 winegstreamer: Set the MF_MT_AUDIO_AVG_BYTES_PER_SECOND attribute. This is required by the Resampler transform, and will be used in next patch as well as for session buffer size heuristic. --- dlls/winegstreamer/mfplat.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index 33557211243..9c27c5c7d60 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -698,8 +698,8 @@ static inline UINT64 make_uint64(UINT32 high, UINT32 low) static IMFMediaType *mf_media_type_from_wg_format_audio(const struct wg_format *format) { + unsigned int i, block_align; IMFMediaType *type; - unsigned int i; for (i = 0; i < ARRAY_SIZE(audio_formats); ++i) { @@ -715,7 +715,10 @@ static IMFMediaType *mf_media_type_from_wg_format_audio(const struct wg_format * IMFMediaType_SetUINT32(type, &MF_MT_AUDIO_NUM_CHANNELS, format->u.audio.channels); IMFMediaType_SetUINT32(type, &MF_MT_AUDIO_CHANNEL_MASK, format->u.audio.channel_mask); IMFMediaType_SetUINT32(type, &MF_MT_ALL_SAMPLES_INDEPENDENT, TRUE); - IMFMediaType_SetUINT32(type, &MF_MT_AUDIO_BLOCK_ALIGNMENT, format->u.audio.channels * audio_formats[i].depth / 8); + + block_align = format->u.audio.channels * audio_formats[i].depth / 8; + IMFMediaType_SetUINT32(type, &MF_MT_AUDIO_BLOCK_ALIGNMENT, block_align); + IMFMediaType_SetUINT32(type, &MF_MT_AUDIO_AVG_BYTES_PER_SECOND, block_align * format->u.audio.rate); return type; }

1 0

Rémi Bernon : mf: Return MF_E_NO_MORE_TYPE from AudioRenderer GetMediaTypeByIndex.
by Alexandre Julliard 02 Aug '22

02 Aug '22

Module: wine Branch: master Commit: 180572129fb9ad5ca736ac1ba5d78094dc2c68db URL: https://gitlab.winehq.org/wine/wine/-/commit/180572129fb9ad5ca736ac1ba5d780… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 29 17:34:29 2022 +0200 mf: Return MF_E_NO_MORE_TYPE from AudioRenderer GetMediaTypeByIndex. --- dlls/mf/sar.c | 9 ++++----- dlls/mf/tests/mf.c | 1 - 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c index 5504cc17472..2aabb1fe10f 100644 --- a/dlls/mf/sar.c +++ b/dlls/mf/sar.c @@ -1531,12 +1531,11 @@ static HRESULT WINAPI audio_renderer_stream_type_handler_GetMediaTypeByIndex(IMF TRACE("%p, %lu, %p.\n", iface, index, media_type); - if (index == 0) - { - *media_type = renderer->media_type; - IMFMediaType_AddRef(*media_type); - } + if (index > 0) + return MF_E_NO_MORE_TYPES; + *media_type = renderer->media_type; + IMFMediaType_AddRef(*media_type); return S_OK; } diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index c3d80c3dccc..4638edbec76 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -4636,7 +4636,6 @@ if (SUCCEEDED(hr)) ok(!!count, "Unexpected type count %lu.\n", count); hr = IMFMediaTypeHandler_GetMediaTypeByIndex(handler, count, &mediatype); - todo_wine ok(hr == MF_E_NO_MORE_TYPES, "Unexpected hr %#lx.\n", hr); hr = IMFMediaTypeHandler_GetMediaTypeByIndex(handler, 0, &mediatype);

1 0

Rémi Bernon : mf/tests: Add required SAR media type attributes tests.
by Alexandre Julliard 02 Aug '22

02 Aug '22

Module: wine Branch: master Commit: 3dbb6c7470b7a54e078763501c0db38e4040b047 URL: https://gitlab.winehq.org/wine/wine/-/commit/3dbb6c7470b7a54e078763501c0db3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jul 29 17:48:16 2022 +0200 mf/tests: Add required SAR media type attributes tests. --- dlls/mf/tests/mf.c | 74 +++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 57 insertions(+), 17 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 996829c5e9a..c3d80c3dccc 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -4434,6 +4434,29 @@ static void check_sar_rate_support(IMFMediaSink *sink) static void test_sar(void) { + static const struct attribute_desc input_type_desc_48000[] = + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Audio), + ATTR_GUID(MF_MT_SUBTYPE, MFAudioFormat_Float), + ATTR_UINT32(MF_MT_AUDIO_SAMPLES_PER_SECOND, 48000), + ATTR_UINT32(MF_MT_AUDIO_NUM_CHANNELS, 2), + ATTR_UINT32(MF_MT_AUDIO_BITS_PER_SAMPLE, 32), + ATTR_UINT32(MF_MT_AUDIO_BLOCK_ALIGNMENT, 8), + ATTR_UINT32(MF_MT_AUDIO_AVG_BYTES_PER_SECOND, 8 * 48000), + {0}, + }; + static const struct attribute_desc input_type_desc_44100[] = + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Audio), + ATTR_GUID(MF_MT_SUBTYPE, MFAudioFormat_Float), + ATTR_UINT32(MF_MT_AUDIO_SAMPLES_PER_SECOND, 44100), + ATTR_UINT32(MF_MT_AUDIO_NUM_CHANNELS, 2), + ATTR_UINT32(MF_MT_AUDIO_BITS_PER_SAMPLE, 32), + ATTR_UINT32(MF_MT_AUDIO_BLOCK_ALIGNMENT, 8), + ATTR_UINT32(MF_MT_AUDIO_AVG_BYTES_PER_SECOND, 8 * 44100), + {0}, + }; + IMFPresentationClock *present_clock, *present_clock2; IMFMediaType *mediatype, *mediatype2, *mediatype3; IMFClockStateSink *state_sink, *state_sink2; @@ -4443,17 +4466,16 @@ static void test_sar(void) IMFAudioStreamVolume *stream_volume; IMFMediaSink *sink, *sink2; IMFStreamSink *stream_sink; + UINT32 channel_count, rate; IMFAttributes *attributes; - DWORD i, id, flags, count; + DWORD id, flags, count; IMFActivate *activate; - UINT32 channel_count; MFCLOCK_STATE state; IMFClock *clock; IUnknown *unk; HRESULT hr; GUID guid; BOOL mute; - int found; LONG ref; hr = CoInitialize(NULL); @@ -4613,21 +4635,40 @@ if (SUCCEEDED(hr)) ok(hr == S_OK, "Failed to get type count, hr %#lx.\n", hr); ok(!!count, "Unexpected type count %lu.\n", count); - /* A number of same major/subtype entries are returned, with different degrees of finer format - details. Some incomplete types are not accepted, check that at least one of them is considered supported. */ + hr = IMFMediaTypeHandler_GetMediaTypeByIndex(handler, count, &mediatype); + todo_wine + ok(hr == MF_E_NO_MORE_TYPES, "Unexpected hr %#lx.\n", hr); + + hr = IMFMediaTypeHandler_GetMediaTypeByIndex(handler, 0, &mediatype); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_SAMPLES_PER_SECOND, &rate); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(rate == 48000 || rate == 44100, "got rate %u.\n", rate); + IMFMediaType_Release(mediatype); - for (i = 0, found = -1; i < count; ++i) - { - hr = IMFMediaTypeHandler_GetMediaTypeByIndex(handler, i, &mediatype); - ok(hr == S_OK, "Failed to get media type, hr %#lx.\n", hr); - if (SUCCEEDED(IMFMediaTypeHandler_IsMediaTypeSupported(handler, mediatype, NULL))) - found = i; - IMFMediaType_Release(mediatype); + /* check required output media type attributes */ - if (found != -1) break; + hr = MFCreateMediaType(&mediatype); + ok(hr == S_OK, "MFCreateMediaType returned %#lx\n", hr); + hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, mediatype, NULL); + todo_wine + ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#lx.\n", hr); + init_media_type(mediatype, rate == 44100 ? input_type_desc_44100 : input_type_desc_48000, 2); + for (int i = 1; i < (rate == 44100 ? ARRAY_SIZE(input_type_desc_44100) : ARRAY_SIZE(input_type_desc_48000)) - 1; ++i) + { + hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, mediatype, NULL); + todo_wine + ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#lx.\n", hr); + init_media_type(mediatype, rate == 44100 ? input_type_desc_44100 : input_type_desc_48000, i + 1); } - ok(found != -1, "Haven't found a supported type.\n"); + hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, mediatype, NULL); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + init_media_type(mediatype, rate == 44100 ? input_type_desc_44100 : input_type_desc_48000, -1); + hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, mediatype, NULL); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + IMFMediaType_Release(mediatype); + hr = IMFMediaTypeHandler_GetCurrentMediaType(handler, &mediatype); ok(hr == MF_E_NOT_INITIALIZED, "Unexpected hr %#lx.\n", hr); @@ -4652,10 +4693,9 @@ if (SUCCEEDED(hr)) hr = IMFMediaTypeHandler_SetCurrentMediaType(handler, mediatype); ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#lx.\n", hr); - hr = IMFMediaTypeHandler_GetMediaTypeByIndex(handler, found, &mediatype2); + hr = IMFMediaTypeHandler_GetMediaTypeByIndex(handler, count - 1, &mediatype2); ok(hr == S_OK, "Failed to get media type, hr %#lx.\n", hr); - - hr = IMFMediaTypeHandler_GetMediaTypeByIndex(handler, found, &mediatype3); + hr = IMFMediaTypeHandler_GetMediaTypeByIndex(handler, count - 1, &mediatype3); ok(hr == S_OK, "Failed to get media type, hr %#lx.\n", hr); ok(mediatype2 == mediatype3, "Unexpected instance.\n"); IMFMediaType_Release(mediatype3);

1 0

Alexandre Julliard : testbot/web: Fix undefined variable error.
by Alexandre Julliard 02 Aug '22

02 Aug '22

Module: tools Branch: master Commit: b1882b9ccad8f04ce860adcc23a3225a43c07188 URL: https://gitlab.winehq.org/winehq/tools/-/commit/b1882b9ccad8f04ce860adcc23a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 2 13:44:56 2022 +0200 testbot/web: Fix undefined variable error. This partially reverts 88bb46d5991d2c12925d08a861271da2cd41f96d. --- testbot/web/ResetPassword.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/ResetPassword.pl b/testbot/web/ResetPassword.pl index b6c0ae9c..4b77e245 100644 --- a/testbot/web/ResetPassword.pl +++ b/testbot/web/ResetPassword.pl @@ -127,7 +127,7 @@ sub OnChangePassword($) } my $Sessions = CreateSessions(); - ($ErrMessage, my $_Session) = $Sessions->NewSession($User, defined $self->GetParam("AutoLogin")); + ($ErrMessage, my $Session) = $Sessions->NewSession($User, defined $self->GetParam("AutoLogin")); if ($ErrMessage) { $self->AddError($ErrMessage, "Name");

1 0

Alexandre Julliard : packaging: Remove Ubuntu 21.10.
by Alexandre Julliard 02 Aug '22

02 Aug '22

Module: tools Branch: master Commit: f7a155105ba3d6cb5a8a92c223ea43d688ce1aa1 URL: https://gitlab.winehq.org/winehq/tools/-/commit/f7a155105ba3d6cb5a8a92c223e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jul 30 09:11:46 2022 +0200 packaging: Remove Ubuntu 21.10. --- packaging/obs/apt-mirror.cfg | 4 ---- packaging/obs/obs-sync | 3 +-- packaging/obs/rsync-filter | 1 - 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/packaging/obs/apt-mirror.cfg b/packaging/obs/apt-mirror.cfg index 613acb98..a2dd2782 100644 --- a/packaging/obs/apt-mirror.cfg +++ b/packaging/obs/apt-mirror.cfg @@ -34,10 +34,6 @@ deb-amd64 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUb deb-i386 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ deb-src https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ -deb-amd64 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ -deb-i386 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ -deb-src https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ - deb-amd64 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ deb-i386 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ deb-src https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ diff --git a/packaging/obs/obs-sync b/packaging/obs/obs-sync index 226da8a9..4167d1b8 100755 --- a/packaging/obs/obs-sync +++ b/packaging/obs/obs-sync @@ -199,7 +199,7 @@ publish_files () cd $basedir -distros="35 36 buster bullseye bookworm bionic focal impish jammy" +distros="35 36 buster bullseye bookworm bionic focal jammy" dry_run= build=1 @@ -258,7 +258,6 @@ do bookworm) add_deb debian $i Debian_Testing_standard testing ;; bionic) add_deb ubuntu $i xUbuntu_18.04 ;; focal) add_deb ubuntu $i xUbuntu_20.04 ;; - impish) add_deb ubuntu $i xUbuntu_21.10 ;; jammy) add_deb ubuntu $i xUbuntu_22.04 ;; *) echo "Unknown distro $i"; exit 1 ;; esac diff --git a/packaging/obs/rsync-filter b/packaging/obs/rsync-filter index 80331b28..2675716a 100644 --- a/packaging/obs/rsync-filter +++ b/packaging/obs/rsync-filter @@ -18,7 +18,6 @@ + /ubuntu/dists + /ubuntu/dists/bionic + /ubuntu/dists/focal -+ /ubuntu/dists/impish + /ubuntu/dists/jammy - /ubuntu/dists/* - /ubuntu/*

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2022