September 2022 - Wine-commits

Rémi Bernon : winegstreamer: Set MFT_OUTPUT_DATA_BUFFER_INCOMPLETE in wg_transform_read_mf.
by Alexandre Julliard 15 Sep '22

15 Sep '22

Module: wine Branch: master Commit: 9e2a9e34cc6302936d79cab6d45165193936e8ad URL: https://gitlab.winehq.org/wine/wine/-/commit/9e2a9e34cc6302936d79cab6d45165… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Aug 9 09:21:44 2022 +0200 winegstreamer: Set MFT_OUTPUT_DATA_BUFFER_INCOMPLETE in wg_transform_read_mf. --- dlls/winegstreamer/color_convert.c | 4 +++- dlls/winegstreamer/gst_private.h | 2 +- dlls/winegstreamer/h264_decoder.c | 4 +++- dlls/winegstreamer/resampler.c | 7 ++----- dlls/winegstreamer/video_processor.c | 4 +++- dlls/winegstreamer/wg_sample.c | 7 +++++-- dlls/winegstreamer/wma_decoder.c | 7 ++----- 7 files changed, 19 insertions(+), 16 deletions(-) diff --git a/dlls/winegstreamer/color_convert.c b/dlls/winegstreamer/color_convert.c index 81067d052f7..2b8d06b991c 100644 --- a/dlls/winegstreamer/color_convert.c +++ b/dlls/winegstreamer/color_convert.c @@ -595,8 +595,10 @@ static HRESULT WINAPI transform_ProcessOutput(IMFTransform *iface, DWORD flags, return MF_E_BUFFERTOOSMALL; } - if (SUCCEEDED(hr = wg_transform_read_mf(impl->wg_transform, wg_sample, NULL))) + if (SUCCEEDED(hr = wg_transform_read_mf(impl->wg_transform, wg_sample, NULL, + &samples[0].dwStatus))) wg_sample_queue_flush(impl->wg_sample_queue, false); + wg_sample_release(wg_sample); if (hr == MF_E_TRANSFORM_STREAM_CHANGE) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 324d677ebe8..a7a1397873d 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -135,7 +135,7 @@ HRESULT wg_transform_push_mf(struct wg_transform *transform, struct wg_sample *s HRESULT wg_transform_push_quartz(struct wg_transform *transform, struct wg_sample *sample, struct wg_sample_queue *queue); HRESULT wg_transform_read_mf(struct wg_transform *transform, struct wg_sample *sample, - struct wg_format *format); + struct wg_format *format, DWORD *flags); HRESULT wg_transform_read_quartz(struct wg_transform *transform, struct wg_sample *sample); HRESULT winegstreamer_stream_handler_create(REFIID riid, void **obj); diff --git a/dlls/winegstreamer/h264_decoder.c b/dlls/winegstreamer/h264_decoder.c index 3e29a7bafd9..90ae4793392 100644 --- a/dlls/winegstreamer/h264_decoder.c +++ b/dlls/winegstreamer/h264_decoder.c @@ -641,8 +641,10 @@ static HRESULT WINAPI transform_ProcessOutput(IMFTransform *iface, DWORD flags, return MF_E_BUFFERTOOSMALL; } - if (SUCCEEDED(hr = wg_transform_read_mf(decoder->wg_transform, wg_sample, &wg_format))) + if (SUCCEEDED(hr = wg_transform_read_mf(decoder->wg_transform, wg_sample, &wg_format, + &samples[0].dwStatus))) wg_sample_queue_flush(decoder->wg_sample_queue, false); + wg_sample_release(wg_sample); if (hr == MF_E_TRANSFORM_STREAM_CHANGE) diff --git a/dlls/winegstreamer/resampler.c b/dlls/winegstreamer/resampler.c index 1d35775af68..122802d5413 100644 --- a/dlls/winegstreamer/resampler.c +++ b/dlls/winegstreamer/resampler.c @@ -565,12 +565,9 @@ static HRESULT WINAPI transform_ProcessOutput(IMFTransform *iface, DWORD flags, return MF_E_BUFFERTOOSMALL; } - if (SUCCEEDED(hr = wg_transform_read_mf(impl->wg_transform, wg_sample, NULL))) - { - if (wg_sample->flags & WG_SAMPLE_FLAG_INCOMPLETE) - samples[0].dwStatus |= MFT_OUTPUT_DATA_BUFFER_INCOMPLETE; + if (SUCCEEDED(hr = wg_transform_read_mf(impl->wg_transform, wg_sample, NULL, + &samples[0].dwStatus))) wg_sample_queue_flush(impl->wg_sample_queue, false); - } wg_sample_release(wg_sample); diff --git a/dlls/winegstreamer/video_processor.c b/dlls/winegstreamer/video_processor.c index b513b1e52b5..86aa2d269cf 100644 --- a/dlls/winegstreamer/video_processor.c +++ b/dlls/winegstreamer/video_processor.c @@ -571,8 +571,10 @@ static HRESULT WINAPI video_processor_ProcessOutput(IMFTransform *iface, DWORD f return MF_E_BUFFERTOOSMALL; } - if (SUCCEEDED(hr = wg_transform_read_mf(impl->wg_transform, wg_sample, NULL))) + if (SUCCEEDED(hr = wg_transform_read_mf(impl->wg_transform, wg_sample, NULL, + &samples[0].dwStatus))) wg_sample_queue_flush(impl->wg_sample_queue, false); + wg_sample_release(wg_sample); if (hr == MF_E_TRANSFORM_STREAM_CHANGE) diff --git a/dlls/winegstreamer/wg_sample.c b/dlls/winegstreamer/wg_sample.c index ae8a2d4d0c7..d8fe8662f65 100644 --- a/dlls/winegstreamer/wg_sample.c +++ b/dlls/winegstreamer/wg_sample.c @@ -20,6 +20,7 @@ #include "wmcodecdsp.h" #include "mfapi.h" +#include "mferror.h" #include "wine/debug.h" #include "wine/list.h" @@ -282,12 +283,12 @@ HRESULT wg_transform_push_mf(struct wg_transform *transform, struct wg_sample *w } HRESULT wg_transform_read_mf(struct wg_transform *transform, struct wg_sample *wg_sample, - struct wg_format *format) + struct wg_format *format, DWORD *flags) { struct sample *sample = unsafe_mf_from_wg_sample(wg_sample); HRESULT hr; - TRACE_(mfplat)("transform %p, wg_sample %p, format %p.\n", transform, wg_sample, format); + TRACE_(mfplat)("transform %p, wg_sample %p, format %p, flags %p.\n", transform, wg_sample, format, flags); if (FAILED(hr = wg_transform_read_data(transform, wg_sample, format))) return hr; @@ -295,6 +296,8 @@ HRESULT wg_transform_read_mf(struct wg_transform *transform, struct wg_sample *w if (FAILED(hr = IMFMediaBuffer_SetCurrentLength(sample->u.mf.buffer, wg_sample->size))) return hr; + if (wg_sample->flags & WG_SAMPLE_FLAG_INCOMPLETE) + *flags |= MFT_OUTPUT_DATA_BUFFER_INCOMPLETE; if (wg_sample->flags & WG_SAMPLE_FLAG_HAS_PTS) IMFSample_SetSampleTime(sample->u.mf.sample, wg_sample->pts); if (wg_sample->flags & WG_SAMPLE_FLAG_HAS_DURATION) diff --git a/dlls/winegstreamer/wma_decoder.c b/dlls/winegstreamer/wma_decoder.c index 31fb49df1f7..ceb5c523506 100644 --- a/dlls/winegstreamer/wma_decoder.c +++ b/dlls/winegstreamer/wma_decoder.c @@ -591,12 +591,9 @@ static HRESULT WINAPI transform_ProcessOutput(IMFTransform *iface, DWORD flags, return MF_E_BUFFERTOOSMALL; } - if (SUCCEEDED(hr = wg_transform_read_mf(decoder->wg_transform, wg_sample, NULL))) - { - if (wg_sample->flags & WG_SAMPLE_FLAG_INCOMPLETE) - samples[0].dwStatus |= MFT_OUTPUT_DATA_BUFFER_INCOMPLETE; + if (SUCCEEDED(hr = wg_transform_read_mf(decoder->wg_transform, wg_sample, NULL, + &samples[0].dwStatus))) wg_sample_queue_flush(decoder->wg_sample_queue, false); - } wg_sample_release(wg_sample);

1 0

Rémi Bernon : winegstreamer: Stop setting flags on unexpected MF_E_TRANSFORM_STREAM_CHANGE.
by Alexandre Julliard 15 Sep '22

15 Sep '22

Module: wine Branch: master Commit: 024eef2258efd6caf36d8aea52d50ea601ef802f URL: https://gitlab.winehq.org/wine/wine/-/commit/024eef2258efd6caf36d8aea52d50e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Aug 9 09:23:33 2022 +0200 winegstreamer: Stop setting flags on unexpected MF_E_TRANSFORM_STREAM_CHANGE. --- dlls/winegstreamer/color_convert.c | 4 ---- dlls/winegstreamer/resampler.c | 4 ---- dlls/winegstreamer/video_processor.c | 3 --- dlls/winegstreamer/wma_decoder.c | 4 ---- 4 files changed, 15 deletions(-) diff --git a/dlls/winegstreamer/color_convert.c b/dlls/winegstreamer/color_convert.c index 2b8d06b991c..7f3c558d21c 100644 --- a/dlls/winegstreamer/color_convert.c +++ b/dlls/winegstreamer/color_convert.c @@ -602,11 +602,7 @@ static HRESULT WINAPI transform_ProcessOutput(IMFTransform *iface, DWORD flags, wg_sample_release(wg_sample); if (hr == MF_E_TRANSFORM_STREAM_CHANGE) - { FIXME("Unexpected stream format change!\n"); - samples[0].dwStatus |= MFT_OUTPUT_DATA_BUFFER_FORMAT_CHANGE; - *status |= MFT_OUTPUT_DATA_BUFFER_FORMAT_CHANGE; - } return hr; } diff --git a/dlls/winegstreamer/resampler.c b/dlls/winegstreamer/resampler.c index 122802d5413..0ca2d714dc3 100644 --- a/dlls/winegstreamer/resampler.c +++ b/dlls/winegstreamer/resampler.c @@ -572,11 +572,7 @@ static HRESULT WINAPI transform_ProcessOutput(IMFTransform *iface, DWORD flags, wg_sample_release(wg_sample); if (hr == MF_E_TRANSFORM_STREAM_CHANGE) - { FIXME("Unexpected stream format change!\n"); - samples[0].dwStatus |= MFT_OUTPUT_DATA_BUFFER_FORMAT_CHANGE; - *status |= MFT_OUTPUT_DATA_BUFFER_FORMAT_CHANGE; - } return hr; } diff --git a/dlls/winegstreamer/video_processor.c b/dlls/winegstreamer/video_processor.c index 86aa2d269cf..8a0e141a365 100644 --- a/dlls/winegstreamer/video_processor.c +++ b/dlls/winegstreamer/video_processor.c @@ -578,10 +578,7 @@ static HRESULT WINAPI video_processor_ProcessOutput(IMFTransform *iface, DWORD f wg_sample_release(wg_sample); if (hr == MF_E_TRANSFORM_STREAM_CHANGE) - { FIXME("Unexpected stream format change!\n"); - samples[0].dwStatus |= MFT_OUTPUT_DATA_BUFFER_FORMAT_CHANGE; - } return hr; } diff --git a/dlls/winegstreamer/wma_decoder.c b/dlls/winegstreamer/wma_decoder.c index ceb5c523506..22b328479e3 100644 --- a/dlls/winegstreamer/wma_decoder.c +++ b/dlls/winegstreamer/wma_decoder.c @@ -598,11 +598,7 @@ static HRESULT WINAPI transform_ProcessOutput(IMFTransform *iface, DWORD flags, wg_sample_release(wg_sample); if (hr == MF_E_TRANSFORM_STREAM_CHANGE) - { FIXME("Unexpected stream format change!\n"); - samples[0].dwStatus |= MFT_OUTPUT_DATA_BUFFER_FORMAT_CHANGE; - *status |= MFT_OUTPUT_DATA_BUFFER_FORMAT_CHANGE; - } return hr; }

1 0

Rémi Bernon : winegstreamer: Check for unexpected format change in wg_transform_read helpers.
by Alexandre Julliard 15 Sep '22

15 Sep '22

Module: wine Branch: master Commit: 19df4f02de90e5f3c41f4b20e94a9da1262c1c0e URL: https://gitlab.winehq.org/wine/wine/-/commit/19df4f02de90e5f3c41f4b20e94a9d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 14 21:56:59 2022 +0200 winegstreamer: Check for unexpected format change in wg_transform_read helpers. --- dlls/winegstreamer/color_convert.c | 3 --- dlls/winegstreamer/quartz_transform.c | 2 -- dlls/winegstreamer/resampler.c | 3 --- dlls/winegstreamer/video_processor.c | 3 --- dlls/winegstreamer/wg_sample.c | 8 ++++++++ dlls/winegstreamer/wma_decoder.c | 3 --- 6 files changed, 8 insertions(+), 14 deletions(-) diff --git a/dlls/winegstreamer/color_convert.c b/dlls/winegstreamer/color_convert.c index 7f3c558d21c..763b7f241f4 100644 --- a/dlls/winegstreamer/color_convert.c +++ b/dlls/winegstreamer/color_convert.c @@ -601,9 +601,6 @@ static HRESULT WINAPI transform_ProcessOutput(IMFTransform *iface, DWORD flags, wg_sample_release(wg_sample); - if (hr == MF_E_TRANSFORM_STREAM_CHANGE) - FIXME("Unexpected stream format change!\n"); - return hr; } diff --git a/dlls/winegstreamer/quartz_transform.c b/dlls/winegstreamer/quartz_transform.c index 30cfb7b855b..b4640b497ec 100644 --- a/dlls/winegstreamer/quartz_transform.c +++ b/dlls/winegstreamer/quartz_transform.c @@ -342,8 +342,6 @@ static HRESULT WINAPI transform_sink_receive(struct strmbase_sink *pin, IMediaSa } if (FAILED(hr)) { - if (hr == MF_E_TRANSFORM_STREAM_CHANGE) - FIXME("Unexpected stream format change!\n"); IMediaSample_Release(output_sample); return hr; } diff --git a/dlls/winegstreamer/resampler.c b/dlls/winegstreamer/resampler.c index 0ca2d714dc3..f2c414e5661 100644 --- a/dlls/winegstreamer/resampler.c +++ b/dlls/winegstreamer/resampler.c @@ -571,9 +571,6 @@ static HRESULT WINAPI transform_ProcessOutput(IMFTransform *iface, DWORD flags, wg_sample_release(wg_sample); - if (hr == MF_E_TRANSFORM_STREAM_CHANGE) - FIXME("Unexpected stream format change!\n"); - return hr; } diff --git a/dlls/winegstreamer/video_processor.c b/dlls/winegstreamer/video_processor.c index 8a0e141a365..ba207a8bcde 100644 --- a/dlls/winegstreamer/video_processor.c +++ b/dlls/winegstreamer/video_processor.c @@ -577,9 +577,6 @@ static HRESULT WINAPI video_processor_ProcessOutput(IMFTransform *iface, DWORD f wg_sample_release(wg_sample); - if (hr == MF_E_TRANSFORM_STREAM_CHANGE) - FIXME("Unexpected stream format change!\n"); - return hr; } diff --git a/dlls/winegstreamer/wg_sample.c b/dlls/winegstreamer/wg_sample.c index d8fe8662f65..53a543fc625 100644 --- a/dlls/winegstreamer/wg_sample.c +++ b/dlls/winegstreamer/wg_sample.c @@ -291,7 +291,11 @@ HRESULT wg_transform_read_mf(struct wg_transform *transform, struct wg_sample *w TRACE_(mfplat)("transform %p, wg_sample %p, format %p, flags %p.\n", transform, wg_sample, format, flags); if (FAILED(hr = wg_transform_read_data(transform, wg_sample, format))) + { + if (hr == MF_E_TRANSFORM_STREAM_CHANGE && !format) + FIXME("Unexpected stream format change!\n"); return hr; + } if (FAILED(hr = IMFMediaBuffer_SetCurrentLength(sample->u.mf.buffer, wg_sample->size))) return hr; @@ -349,7 +353,11 @@ HRESULT wg_transform_read_quartz(struct wg_transform *transform, struct wg_sampl TRACE_(mfplat)("transform %p, wg_sample %p.\n", transform, wg_sample); if (FAILED(hr = wg_transform_read_data(transform, wg_sample, NULL))) + { + if (hr == MF_E_TRANSFORM_STREAM_CHANGE) + FIXME("Unexpected stream format change!\n"); return hr; + } if (FAILED(hr = IMediaSample_SetActualDataLength(sample->u.quartz.sample, wg_sample->size))) return hr; diff --git a/dlls/winegstreamer/wma_decoder.c b/dlls/winegstreamer/wma_decoder.c index 22b328479e3..2951d7cac4d 100644 --- a/dlls/winegstreamer/wma_decoder.c +++ b/dlls/winegstreamer/wma_decoder.c @@ -597,9 +597,6 @@ static HRESULT WINAPI transform_ProcessOutput(IMFTransform *iface, DWORD flags, wg_sample_release(wg_sample); - if (hr == MF_E_TRANSFORM_STREAM_CHANGE) - FIXME("Unexpected stream format change!\n"); - return hr; }

1 0

Rémi Bernon : winegstreamer: Check WMA sample size before wrapping the sample.
by Alexandre Julliard 15 Sep '22

15 Sep '22

Module: wine Branch: master Commit: 2c4fbd15316d46c1b856bd38670deda745167e41 URL: https://gitlab.winehq.org/wine/wine/-/commit/2c4fbd15316d46c1b856bd38670ded… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 14 21:59:51 2022 +0200 winegstreamer: Check WMA sample size before wrapping the sample. --- dlls/winegstreamer/wma_decoder.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/winegstreamer/wma_decoder.c b/dlls/winegstreamer/wma_decoder.c index 2951d7cac4d..4374f5bdcdf 100644 --- a/dlls/winegstreamer/wma_decoder.c +++ b/dlls/winegstreamer/wma_decoder.c @@ -531,6 +531,7 @@ static HRESULT WINAPI transform_ProcessInput(IMFTransform *iface, DWORD id, IMFS struct wma_decoder *decoder = impl_from_IMFTransform(iface); struct wg_sample *wg_sample; MFT_INPUT_STREAM_INFO info; + DWORD total_length; HRESULT hr; TRACE("iface %p, id %lu, sample %p, flags %#lx.\n", iface, id, sample, flags); @@ -538,18 +539,16 @@ static HRESULT WINAPI transform_ProcessInput(IMFTransform *iface, DWORD id, IMFS if (!decoder->wg_transform) return MF_E_TRANSFORM_TYPE_NOT_SET; - if (FAILED(hr = IMFTransform_GetInputStreamInfo(iface, 0, &info))) - return hr; - - if (FAILED(hr = wg_sample_create_mf(sample, &wg_sample))) + if (FAILED(hr = IMFTransform_GetInputStreamInfo(iface, 0, &info)) + || FAILED(hr = IMFSample_GetTotalLength(sample, &total_length))) return hr; /* WMA transform uses fixed size input samples and ignores samples with invalid sizes */ - if (wg_sample->size % info.cbSize) - { - wg_sample_release(wg_sample); + if (total_length % info.cbSize) return S_OK; - } + + if (FAILED(hr = wg_sample_create_mf(sample, &wg_sample))) + return hr; return wg_transform_push_mf(decoder->wg_transform, wg_sample, decoder->wg_sample_queue); }

1 0

Rémi Bernon : winegstreamer: Remove unnecessary IMFTransform_GetInputStreamInfo calls.
by Alexandre Julliard 15 Sep '22

15 Sep '22

Module: wine Branch: master Commit: 77a4b4b439e4abc4c587eba48888aa74bb6a534f URL: https://gitlab.winehq.org/wine/wine/-/commit/77a4b4b439e4abc4c587eba48888aa… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 14 22:00:54 2022 +0200 winegstreamer: Remove unnecessary IMFTransform_GetInputStreamInfo calls. --- dlls/winegstreamer/color_convert.c | 4 ---- dlls/winegstreamer/h264_decoder.c | 4 ---- dlls/winegstreamer/video_processor.c | 4 ---- 3 files changed, 12 deletions(-) diff --git a/dlls/winegstreamer/color_convert.c b/dlls/winegstreamer/color_convert.c index 763b7f241f4..de8eb5bcd9a 100644 --- a/dlls/winegstreamer/color_convert.c +++ b/dlls/winegstreamer/color_convert.c @@ -545,14 +545,10 @@ static HRESULT WINAPI transform_ProcessInput(IMFTransform *iface, DWORD id, IMFS { struct color_convert *impl = impl_from_IMFTransform(iface); struct wg_sample *wg_sample; - MFT_INPUT_STREAM_INFO info; HRESULT hr; TRACE("iface %p, id %#lx, sample %p, flags %#lx.\n", iface, id, sample, flags); - if (FAILED(hr = IMFTransform_GetInputStreamInfo(iface, 0, &info))) - return hr; - if (!impl->wg_transform) return MF_E_TRANSFORM_TYPE_NOT_SET; diff --git a/dlls/winegstreamer/h264_decoder.c b/dlls/winegstreamer/h264_decoder.c index 90ae4793392..3a7576135da 100644 --- a/dlls/winegstreamer/h264_decoder.c +++ b/dlls/winegstreamer/h264_decoder.c @@ -586,14 +586,10 @@ static HRESULT WINAPI transform_ProcessInput(IMFTransform *iface, DWORD id, IMFS { struct h264_decoder *decoder = impl_from_IMFTransform(iface); struct wg_sample *wg_sample; - MFT_INPUT_STREAM_INFO info; HRESULT hr; TRACE("iface %p, id %#lx, sample %p, flags %#lx.\n", iface, id, sample, flags); - if (FAILED(hr = IMFTransform_GetInputStreamInfo(iface, 0, &info))) - return hr; - if (!decoder->wg_transform) return MF_E_TRANSFORM_TYPE_NOT_SET; diff --git a/dlls/winegstreamer/video_processor.c b/dlls/winegstreamer/video_processor.c index ba207a8bcde..de762aa0dbf 100644 --- a/dlls/winegstreamer/video_processor.c +++ b/dlls/winegstreamer/video_processor.c @@ -522,14 +522,10 @@ static HRESULT WINAPI video_processor_ProcessInput(IMFTransform *iface, DWORD id { struct video_processor *impl = impl_from_IMFTransform(iface); struct wg_sample *wg_sample; - MFT_INPUT_STREAM_INFO info; HRESULT hr; TRACE("iface %p, id %#lx, sample %p, flags %#lx.\n", iface, id, sample, flags); - if (FAILED(hr = IMFTransform_GetInputStreamInfo(iface, 0, &info))) - return hr; - if (!impl->wg_transform) return MF_E_TRANSFORM_TYPE_NOT_SET;

1 0

Rémi Bernon : winegstreamer: Create wg_sample from IMFSample within wg_transform_push_mf.
by Alexandre Julliard 15 Sep '22

15 Sep '22

Module: wine Branch: master Commit: 71da6a7152bcdfcc8151c18b08c18e2978238326 URL: https://gitlab.winehq.org/wine/wine/-/commit/71da6a7152bcdfcc8151c18b08c18e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 14 22:11:17 2022 +0200 winegstreamer: Create wg_sample from IMFSample within wg_transform_push_mf. --- dlls/winegstreamer/color_convert.c | 8 +------- dlls/winegstreamer/gst_private.h | 2 +- dlls/winegstreamer/h264_decoder.c | 7 +------ dlls/winegstreamer/resampler.c | 8 +------- dlls/winegstreamer/video_processor.c | 8 +------- dlls/winegstreamer/wg_sample.c | 25 ++++++++++++++----------- dlls/winegstreamer/wma_decoder.c | 6 +----- 7 files changed, 20 insertions(+), 44 deletions(-) diff --git a/dlls/winegstreamer/color_convert.c b/dlls/winegstreamer/color_convert.c index de8eb5bcd9a..e4fb78752b0 100644 --- a/dlls/winegstreamer/color_convert.c +++ b/dlls/winegstreamer/color_convert.c @@ -544,19 +544,13 @@ static HRESULT WINAPI transform_ProcessMessage(IMFTransform *iface, MFT_MESSAGE_ static HRESULT WINAPI transform_ProcessInput(IMFTransform *iface, DWORD id, IMFSample *sample, DWORD flags) { struct color_convert *impl = impl_from_IMFTransform(iface); - struct wg_sample *wg_sample; - HRESULT hr; TRACE("iface %p, id %#lx, sample %p, flags %#lx.\n", iface, id, sample, flags); if (!impl->wg_transform) return MF_E_TRANSFORM_TYPE_NOT_SET; - if (FAILED(hr = wg_sample_create_mf(sample, &wg_sample))) - return hr; - - return wg_transform_push_mf(impl->wg_transform, wg_sample, - impl->wg_sample_queue); + return wg_transform_push_mf(impl->wg_transform, sample, impl->wg_sample_queue); } static HRESULT WINAPI transform_ProcessOutput(IMFTransform *iface, DWORD flags, DWORD count, diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index a7a1397873d..8e761758da4 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -130,7 +130,7 @@ HRESULT wg_sample_create_mf(IMFSample *sample, struct wg_sample **out); HRESULT wg_sample_create_quartz(IMediaSample *sample, struct wg_sample **out); void wg_sample_release(struct wg_sample *wg_sample); -HRESULT wg_transform_push_mf(struct wg_transform *transform, struct wg_sample *sample, +HRESULT wg_transform_push_mf(struct wg_transform *transform, IMFSample *sample, struct wg_sample_queue *queue); HRESULT wg_transform_push_quartz(struct wg_transform *transform, struct wg_sample *sample, struct wg_sample_queue *queue); diff --git a/dlls/winegstreamer/h264_decoder.c b/dlls/winegstreamer/h264_decoder.c index 3a7576135da..44c6d992b55 100644 --- a/dlls/winegstreamer/h264_decoder.c +++ b/dlls/winegstreamer/h264_decoder.c @@ -585,18 +585,13 @@ static HRESULT WINAPI transform_ProcessMessage(IMFTransform *iface, MFT_MESSAGE_ static HRESULT WINAPI transform_ProcessInput(IMFTransform *iface, DWORD id, IMFSample *sample, DWORD flags) { struct h264_decoder *decoder = impl_from_IMFTransform(iface); - struct wg_sample *wg_sample; - HRESULT hr; TRACE("iface %p, id %#lx, sample %p, flags %#lx.\n", iface, id, sample, flags); if (!decoder->wg_transform) return MF_E_TRANSFORM_TYPE_NOT_SET; - if (FAILED(hr = wg_sample_create_mf(sample, &wg_sample))) - return hr; - - return wg_transform_push_mf(decoder->wg_transform, wg_sample, decoder->wg_sample_queue); + return wg_transform_push_mf(decoder->wg_transform, sample, decoder->wg_sample_queue); } static HRESULT WINAPI transform_ProcessOutput(IMFTransform *iface, DWORD flags, DWORD count, diff --git a/dlls/winegstreamer/resampler.c b/dlls/winegstreamer/resampler.c index f2c414e5661..a9c9ae32e8a 100644 --- a/dlls/winegstreamer/resampler.c +++ b/dlls/winegstreamer/resampler.c @@ -513,19 +513,13 @@ static HRESULT WINAPI transform_ProcessMessage(IMFTransform *iface, MFT_MESSAGE_ static HRESULT WINAPI transform_ProcessInput(IMFTransform *iface, DWORD id, IMFSample *sample, DWORD flags) { struct resampler *impl = impl_from_IMFTransform(iface); - struct wg_sample *wg_sample; - HRESULT hr; TRACE("iface %p, id %#lx, sample %p, flags %#lx.\n", iface, id, sample, flags); if (!impl->wg_transform) return MF_E_TRANSFORM_TYPE_NOT_SET; - if (FAILED(hr = wg_sample_create_mf(sample, &wg_sample))) - return hr; - - return wg_transform_push_mf(impl->wg_transform, wg_sample, - impl->wg_sample_queue); + return wg_transform_push_mf(impl->wg_transform, sample, impl->wg_sample_queue); } static HRESULT WINAPI transform_ProcessOutput(IMFTransform *iface, DWORD flags, DWORD count, diff --git a/dlls/winegstreamer/video_processor.c b/dlls/winegstreamer/video_processor.c index de762aa0dbf..fcbccb3c3ef 100644 --- a/dlls/winegstreamer/video_processor.c +++ b/dlls/winegstreamer/video_processor.c @@ -521,19 +521,13 @@ static HRESULT WINAPI video_processor_ProcessMessage(IMFTransform *iface, MFT_ME static HRESULT WINAPI video_processor_ProcessInput(IMFTransform *iface, DWORD id, IMFSample *sample, DWORD flags) { struct video_processor *impl = impl_from_IMFTransform(iface); - struct wg_sample *wg_sample; - HRESULT hr; TRACE("iface %p, id %#lx, sample %p, flags %#lx.\n", iface, id, sample, flags); if (!impl->wg_transform) return MF_E_TRANSFORM_TYPE_NOT_SET; - if (FAILED(hr = wg_sample_create_mf(sample, &wg_sample))) - return hr; - - return wg_transform_push_mf(impl->wg_transform, wg_sample, - impl->wg_sample_queue); + return wg_transform_push_mf(impl->wg_transform, sample, impl->wg_sample_queue); } static HRESULT WINAPI video_processor_ProcessOutput(IMFTransform *iface, DWORD flags, DWORD count, diff --git a/dlls/winegstreamer/wg_sample.c b/dlls/winegstreamer/wg_sample.c index 53a543fc625..4dcac74348e 100644 --- a/dlls/winegstreamer/wg_sample.c +++ b/dlls/winegstreamer/wg_sample.c @@ -252,28 +252,31 @@ HRESULT wg_transform_push_data(struct wg_transform *transform, struct wg_sample HRESULT wg_transform_read_data(struct wg_transform *transform, struct wg_sample *sample, struct wg_format *format); -HRESULT wg_transform_push_mf(struct wg_transform *transform, struct wg_sample *wg_sample, +HRESULT wg_transform_push_mf(struct wg_transform *transform, IMFSample *sample, struct wg_sample_queue *queue) { - struct sample *sample = unsafe_mf_from_wg_sample(wg_sample); + struct wg_sample *wg_sample; LONGLONG time, duration; UINT32 value; HRESULT hr; - TRACE_(mfplat)("transform %p, wg_sample %p, queue %p.\n", transform, wg_sample, queue); + TRACE_(mfplat)("transform %p, sample %p, queue %p.\n", transform, sample, queue); + + if (FAILED(hr = wg_sample_create_mf(sample, &wg_sample))) + return hr; - if (SUCCEEDED(IMFSample_GetSampleTime(sample->u.mf.sample, &time))) + if (SUCCEEDED(IMFSample_GetSampleTime(sample, &time))) { - sample->wg_sample.flags |= WG_SAMPLE_FLAG_HAS_PTS; - sample->wg_sample.pts = time; + wg_sample->flags |= WG_SAMPLE_FLAG_HAS_PTS; + wg_sample->pts = time; } - if (SUCCEEDED(IMFSample_GetSampleDuration(sample->u.mf.sample, &duration))) + if (SUCCEEDED(IMFSample_GetSampleDuration(sample, &duration))) { - sample->wg_sample.flags |= WG_SAMPLE_FLAG_HAS_DURATION; - sample->wg_sample.duration = duration; + wg_sample->flags |= WG_SAMPLE_FLAG_HAS_DURATION; + wg_sample->duration = duration; } - if (SUCCEEDED(IMFSample_GetUINT32(sample->u.mf.sample, &MFSampleExtension_CleanPoint, &value)) && value) - sample->wg_sample.flags |= WG_SAMPLE_FLAG_SYNC_POINT; + if (SUCCEEDED(IMFSample_GetUINT32(sample, &MFSampleExtension_CleanPoint, &value)) && value) + wg_sample->flags |= WG_SAMPLE_FLAG_SYNC_POINT; wg_sample_queue_begin_append(queue, wg_sample); hr = wg_transform_push_data(transform, wg_sample); diff --git a/dlls/winegstreamer/wma_decoder.c b/dlls/winegstreamer/wma_decoder.c index 4374f5bdcdf..6d8917c9c07 100644 --- a/dlls/winegstreamer/wma_decoder.c +++ b/dlls/winegstreamer/wma_decoder.c @@ -529,7 +529,6 @@ static HRESULT WINAPI transform_ProcessMessage(IMFTransform *iface, MFT_MESSAGE_ static HRESULT WINAPI transform_ProcessInput(IMFTransform *iface, DWORD id, IMFSample *sample, DWORD flags) { struct wma_decoder *decoder = impl_from_IMFTransform(iface); - struct wg_sample *wg_sample; MFT_INPUT_STREAM_INFO info; DWORD total_length; HRESULT hr; @@ -547,10 +546,7 @@ static HRESULT WINAPI transform_ProcessInput(IMFTransform *iface, DWORD id, IMFS if (total_length % info.cbSize) return S_OK; - if (FAILED(hr = wg_sample_create_mf(sample, &wg_sample))) - return hr; - - return wg_transform_push_mf(decoder->wg_transform, wg_sample, decoder->wg_sample_queue); + return wg_transform_push_mf(decoder->wg_transform, sample, decoder->wg_sample_queue); } static HRESULT WINAPI transform_ProcessOutput(IMFTransform *iface, DWORD flags, DWORD count,

1 0

Zhiyi Zhang : kernelbase: Return system error codes in the ReadDirectoryChangesW() completion callback.
by Alexandre Julliard 15 Sep '22

15 Sep '22

Module: wine Branch: master Commit: 2375a6e5bd412d4c67012e6fbcec0fce219710b8 URL: https://gitlab.winehq.org/wine/wine/-/commit/2375a6e5bd412d4c67012e6fbcec0f… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Sep 9 11:36:43 2022 +0800 kernelbase: Return system error codes in the ReadDirectoryChangesW() completion callback. Return system error codes instead of NT status codes in the ReadDirectoryChangesW() completion callback. --- dlls/kernelbase/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index 8ae982294f6..5ba7e0be419 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -3299,7 +3299,7 @@ HANDLE WINAPI DECLSPEC_HOTPATCH ReOpenFile( HANDLE handle, DWORD access, DWORD s static void WINAPI invoke_completion( void *context, IO_STATUS_BLOCK *io, ULONG res ) { LPOVERLAPPED_COMPLETION_ROUTINE completion = context; - completion( io->u.Status, io->Information, (LPOVERLAPPED)io ); + completion( RtlNtStatusToDosError( io->u.Status ), io->Information, (LPOVERLAPPED)io ); } /****************************************************************************

1 0

Jinoh Kang : include: Define atomic read/write helpers for 32-bit integers.
by Alexandre Julliard 15 Sep '22

15 Sep '22

Module: wine Branch: master Commit: d5f583473504e75cb4f5a53cb21da864857eafc9 URL: https://gitlab.winehq.org/wine/wine/-/commit/d5f583473504e75cb4f5a53cb21da8… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Thu Jun 2 03:07:39 2022 +0900 include: Define atomic read/write helpers for 32-bit integers. Based on the corresponding functions from Windows SDK header files. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- include/winnt.h | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index 76aee026d84..c0599a5f757 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6522,6 +6522,61 @@ static FORCEINLINE void MemoryBarrier(void) #endif /* __i386__ */ +/* Since Visual Studio 2012, volatile accesses do not always imply acquire and + * release semantics. We explicitly use ISO volatile semantics, manually + * placing barriers as appropriate. + */ +#if _MSC_VER >= 1700 +#pragma intrinsic(__iso_volatile_load32) +#pragma intrinsic(__iso_volatile_store32) +#define __WINE_LOAD32_NO_FENCE(src) (__iso_volatile_load32(src)) +#define __WINE_STORE32_NO_FENCE(dest, value) (__iso_volatile_store32(dest, value)) +#else /* _MSC_VER >= 1700 */ +#define __WINE_LOAD32_NO_FENCE(src) (*(src)) +#define __WINE_STORE32_NO_FENCE(dest, value) ((void)(*(dest) = (value))) +#endif /* _MSC_VER >= 1700 */ + +#if defined(__i386__) || defined(__x86_64__) +#pragma intrinsic(_ReadWriteBarrier) +void _ReadWriteBarrier(void); +#endif /* defined(__i386__) || defined(__x86_64__) */ + +static void __wine_memory_barrier_acq_rel(void) +{ +#if defined(__i386__) || defined(__x86_64__) +#pragma warning(suppress:4996) + _ReadWriteBarrier(); +#elif defined(__arm__) + __dmb(_ARM_BARRIER_ISH); +#elif defined(__aarch64__) + __dmb(_ARM64_BARRIER_ISH); +#endif /* defined(__i386__) || defined(__x86_64__) */ +} + +static FORCEINLINE LONG ReadAcquire( LONG const volatile *src ) +{ + LONG value = __WINE_LOAD32_NO_FENCE( (int const volatile *)src ); + __wine_memory_barrier_acq_rel(); + return value; +} + +static FORCEINLINE LONG ReadNoFence( LONG const volatile *src ) +{ + LONG value = __WINE_LOAD32_NO_FENCE( (int const volatile *)src ); + return value; +} + +static FORCEINLINE void WriteRelease( LONG volatile *dest, LONG value ) +{ + __wine_memory_barrier_acq_rel(); + __WINE_STORE32_NO_FENCE( (int volatile *)dest, value ); +} + +static FORCEINLINE void WriteNoFence( LONG volatile *dest, LONG value ) +{ + __WINE_STORE32_NO_FENCE( (int volatile *)dest, value ); +} + #elif defined(__GNUC__) static FORCEINLINE BOOLEAN WINAPI BitScanForward(DWORD *index, DWORD mask) @@ -6665,6 +6720,43 @@ static FORCEINLINE void MemoryBarrier(void) __sync_synchronize(); } +#if defined(__x86_64__) || defined(__i386__) +/* On x86, Support old GCC with either no or buggy (GCC BZ#81316) __atomic_* support */ +#define __WINE_ATOMIC_LOAD_ACQUIRE(ptr, ret) do { *(ret) = *(ptr); __asm__ __volatile__( "" ::: "memory" ); } while (0) +#define __WINE_ATOMIC_LOAD_RELAXED(ptr, ret) do { *(ret) = *(ptr); } while (0) +#define __WINE_ATOMIC_STORE_RELEASE(ptr, val) do { __asm__ __volatile__( "" ::: "memory" ); *(ptr) = *(val); } while (0) +#define __WINE_ATOMIC_STORE_RELAXED(ptr, val) do { *(ptr) = *(val); } while (0) +#else +#define __WINE_ATOMIC_LOAD_ACQUIRE(ptr, ret) __atomic_load(ptr, ret, __ATOMIC_ACQUIRE) +#define __WINE_ATOMIC_LOAD_RELAXED(ptr, ret) __atomic_load(ptr, ret, __ATOMIC_RELAXED) +#define __WINE_ATOMIC_STORE_RELEASE(ptr, val) __atomic_store(ptr, val, __ATOMIC_RELEASE) +#define __WINE_ATOMIC_STORE_RELAXED(ptr, val) __atomic_store(ptr, val, __ATOMIC_RELAXED) +#endif /* defined(__x86_64__) || defined(__i386__) */ + +static FORCEINLINE LONG ReadAcquire( LONG const volatile *src ) +{ + LONG value; + __WINE_ATOMIC_LOAD_ACQUIRE( src, &value ); + return value; +} + +static FORCEINLINE LONG ReadNoFence( LONG const volatile *src ) +{ + LONG value; + __WINE_ATOMIC_LOAD_RELAXED( src, &value ); + return value; +} + +static FORCEINLINE void WriteRelease( LONG volatile *dest, LONG value ) +{ + __WINE_ATOMIC_STORE_RELEASE( dest, &value ); +} + +static FORCEINLINE void WriteNoFence( LONG volatile *dest, LONG value ) +{ + __WINE_ATOMIC_STORE_RELAXED( dest, &value ); +} + static FORCEINLINE DECLSPEC_NORETURN void __fastfail(unsigned int code) { #if defined(__x86_64__) || defined(__i386__)

1 0

Alexandre Julliard : ntdll/tests: Don't run the stack growth tests too many times.
by Alexandre Julliard 15 Sep '22

15 Sep '22

Module: wine Branch: master Commit: d35c361e4bff13f6be6f9ad59269a5db4c18dc82 URL: https://gitlab.winehq.org/wine/wine/-/commit/d35c361e4bff13f6be6f9ad59269a5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 15 12:45:37 2022 +0200 ntdll/tests: Don't run the stack growth tests too many times. This reduces the number of printed todos in order to stay within the 32kB limit. --- dlls/ntdll/tests/virtual.c | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index e2b6d0d3fb8..83ea35590f1 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -436,14 +436,12 @@ static void force_stack_grow(void) (void)buffer[0]; } -#ifdef _WIN64 static void force_stack_grow_small(void) { volatile int buffer[0x400]; buffer[0] = 0xdeadbeef; (void)buffer[0]; } -#endif static DWORD WINAPI test_stack_size_thread(void *ptr) { @@ -453,10 +451,6 @@ static DWORD WINAPI test_stack_size_thread(void *ptr) SIZE_T size, guard_size; DWORD committed, reserved; void *addr; -#ifdef _WIN64 - DWORD prot; - void *tmp; -#endif committed = (char *)NtCurrentTeb()->Tib.StackBase - (char *)NtCurrentTeb()->Tib.StackLimit; reserved = (char *)NtCurrentTeb()->Tib.StackBase - (char *)NtCurrentTeb()->DeallocationStack; @@ -521,8 +515,29 @@ static DWORD WINAPI test_stack_size_thread(void *ptr) ok( mbi.Protect == PAGE_READWRITE, "unexpected Protect %#lx, expected %#x\n", mbi.Protect, PAGE_READWRITE ); ok( mbi.Type == MEM_PRIVATE, "unexpected Type %#lx, expected %#x\n", mbi.Type, MEM_PRIVATE ); + return 0; +} + +static DWORD WINAPI test_stack_growth_thread(void *ptr) +{ + MEMORY_BASIC_INFORMATION mbi; + NTSTATUS status; + SIZE_T size, guard_size; + DWORD committed; + void *addr; + DWORD prot; + void *tmp; + + test_stack_size_thread( ptr ); + if (!is_win64) return 0; + + addr = (char *)NtCurrentTeb()->DeallocationStack; + status = NtQueryVirtualMemory( NtCurrentProcess(), addr, MemoryBasicInformation, &mbi, sizeof(mbi), &size ); + ok( !status, "NtQueryVirtualMemory returned %08lx\n", status ); + + guard_size = (char *)NtCurrentTeb()->Tib.StackLimit - (char *)NtCurrentTeb()->DeallocationStack - mbi.RegionSize; + ok( guard_size == 0x1000 || guard_size == 0x2000 || guard_size == 0x3000, "unexpected guard_size %I64x, expected 1000, 2000 or 3000\n", (UINT64)guard_size ); -#ifdef _WIN64 /* setting a guard page shrinks stack automatically */ addr = (char *)NtCurrentTeb()->Tib.StackLimit + 0x2000; @@ -668,7 +683,6 @@ static DWORD WINAPI test_stack_size_thread(void *ptr) committed = (char *)NtCurrentTeb()->Tib.StackBase - (char *)NtCurrentTeb()->Tib.StackLimit; todo_wine ok( committed == 0x6000, "unexpected stack committed size %lx, expected 6000\n", committed ); -#endif ExitThread(0); } @@ -745,13 +759,13 @@ static void test_RtlCreateUserStack(void) args.expect_committed = 0x4000; args.expect_reserved = default_reserve; - thread = CreateThread(NULL, 0x3f00, test_stack_size_thread, &args, 0, NULL); + thread = CreateThread(NULL, 0x3f00, test_stack_growth_thread, &args, 0, NULL); WaitForSingleObject(thread, INFINITE); CloseHandle(thread); args.expect_committed = default_commit < 0x2000 ? 0x2000 : default_commit; args.expect_reserved = 0x400000; - thread = CreateThread(NULL, 0x3ff000, test_stack_size_thread, &args, STACK_SIZE_PARAM_IS_A_RESERVATION, NULL); + thread = CreateThread(NULL, 0x3ff000, test_stack_growth_thread, &args, STACK_SIZE_PARAM_IS_A_RESERVATION, NULL); WaitForSingleObject(thread, INFINITE); CloseHandle(thread);

1 0

Rémi Bernon : maintainers: Assume maintainership of MF transforms.
by Alexandre Julliard 14 Sep '22

14 Sep '22

Module: wine Branch: master Commit: 7feaa6795a26c97b5ce4327a23129eb20a049859 URL: https://gitlab.winehq.org/wine/wine/-/commit/7feaa6795a26c97b5ce4327a23129e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 8 10:25:14 2022 +0200 maintainers: Assume maintainership of MF transforms. --- MAINTAINERS | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index c7bd1f0c02c..4f0cd37ad5d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -202,6 +202,19 @@ P: Andrew Eikum <coldpie(a)fastmail.com> F: dlls/*.acm/ F: dlls/msacm32/ +Media Foundation transforms +M: Rémi Bernon <rbernon(a)codeweavers.com> +P: Nikolay Sivov <nsivov(a)codeweavers.com> +P: Zebediah Figura <z.figura12(a)gmail.com> +F: dlls/mf/tests/transform.c +F: dlls/winegstreamer/color_convert.c +F: dlls/winegstreamer/h264_decoder.c +F: dlls/winegstreamer/resampler.c +F: dlls/winegstreamer/video_processor.c +F: dlls/winegstreamer/wg_sample.c +F: dlls/winegstreamer/wg_transform.c +F: dlls/winegstreamer/wma_decoder.c + Microsoft C Runtime M: Piotr Caban <piotr(a)codeweavers.com> F: dlls/msvc*/

1 0