winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
November 2020
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
1 participants
851 discussions
Start a n
N
ew thread
Vijay Kiran Kamuju : winspool.drv: Implement AddPrintProcessorA via AddPrintProcessorW.
by Alexandre Julliard
10 Nov '20
10 Nov '20
Module: wine Branch: stable Commit: 3320ae7eff0125c509215a8cf6f72bf48a3f642d URL:
https://source.winehq.org/git/wine.git/?a=commit;h=3320ae7eff0125c509215a8c…
Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Jun 3 09:42:49 2020 +0100 winspool.drv: Implement AddPrintProcessorA via AddPrintProcessorW. Wine-Bug:
https://bugs.winehq.org/show_bug.cgi?id=26171
Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 992a0ae7b90d92bcda52d82672ece1d3c7d4b0ea) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winspool.drv/info.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 0065801d904..0cea2ea39ae 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -5404,9 +5404,25 @@ BOOL WINAPI AddPrinterDriverW(LPWSTR pName, DWORD level, LPBYTE pDriverInfo) BOOL WINAPI AddPrintProcessorA(LPSTR pName, LPSTR pEnvironment, LPSTR pPathName, LPSTR pPrintProcessorName) { - FIXME("(%s,%s,%s,%s): stub\n", debugstr_a(pName), debugstr_a(pEnvironment), + UNICODE_STRING NameW, EnvW, PathW, ProcessorW; + BOOL ret; + + TRACE("(%s,%s,%s,%s)\n", debugstr_a(pName), debugstr_a(pEnvironment), debugstr_a(pPathName), debugstr_a(pPrintProcessorName)); - return FALSE; + + asciitounicode(&NameW, pName); + asciitounicode(&EnvW, pEnvironment); + asciitounicode(&PathW, pPathName); + asciitounicode(&ProcessorW, pPrintProcessorName); + + ret = AddPrintProcessorW(NameW.Buffer, EnvW.Buffer, PathW.Buffer, ProcessorW.Buffer); + + RtlFreeUnicodeString(&ProcessorW); + RtlFreeUnicodeString(&PathW); + RtlFreeUnicodeString(&EnvW); + RtlFreeUnicodeString(&NameW); + + return ret; } /*****************************************************************************
1
0
0
0
Vijay Kiran Kamuju : ole2.dll16: Add stub OleIsCurrentClipboard function.
by Alexandre Julliard
10 Nov '20
10 Nov '20
Module: wine Branch: stable Commit: 1c66b0065107fc97c938e986dce3957315ebb33a URL:
https://source.winehq.org/git/wine.git/?a=commit;h=1c66b0065107fc97c938e986…
Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Tue Jun 2 18:02:50 2020 +0200 ole2.dll16: Add stub OleIsCurrentClipboard function. Wine-Bug:
https://bugs.winehq.org/show_bug.cgi?id=7102
Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9c95434095630aa1ed4f1ae3763424f09f423575) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ole2.dll16/ole2.c | 9 +++++++++ dlls/ole2.dll16/ole2.dll16.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ole2.dll16/ole2.c b/dlls/ole2.dll16/ole2.c index 5e6142fc96a..04b40b08635 100644 --- a/dlls/ole2.dll16/ole2.c +++ b/dlls/ole2.dll16/ole2.c @@ -272,6 +272,15 @@ HRESULT WINAPI OleFlushClipboard16(void) return OleFlushClipboard(); } +/*********************************************************************** + * OleIsCurrentClipboard [OLE2.77] + */ +HRESULT WINAPI OleIsCurrentClipboard16(IDataObject* pDataObj) +{ + FIXME("(%p): stub\n", pDataObj); + return S_OK; +} + #define GET_SEGPTR_METHOD_ADDR(ifacename,segptr,methodname) \ ((SEGPTR)((const ifacename##Vtbl*)MapSL((SEGPTR)((ifacename*)MapSL(segptr))->lpVtbl))->methodname) diff --git a/dlls/ole2.dll16/ole2.dll16.spec b/dlls/ole2.dll16/ole2.dll16.spec index 108c3ee8f31..7aac6864e56 100644 --- a/dlls/ole2.dll16/ole2.dll16.spec +++ b/dlls/ole2.dll16/ole2.dll16.spec @@ -72,7 +72,7 @@ 74 stub READFMTUSERTYPESTG 75 stub WRITEFMTUSERTYPESTG 76 pascal -ret16 OleFlushClipboard() OleFlushClipboard16 -77 stub OLEISCURRENTCLIPBOARD +77 pascal OleIsCurrentClipboard(ptr) OleIsCurrentClipboard16 78 stub OLETRANSLATEACCELERATOR 79 pascal OleDoAutoConvert(ptr ptr) OleDoAutoConvert16 80 stub OLEGETAUTOCONVERT
1
0
0
0
Liam Middlebrook : winevulkan: Update to VK spec version 1.2.160.
by Alexandre Julliard
09 Nov '20
09 Nov '20
Module: wine Branch: master Commit: 572aa09de1b0e3ba0e8b19f48d5e96539625bb0a URL:
https://source.winehq.org/git/wine.git/?a=commit;h=572aa09de1b0e3ba0e8b19f4…
Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Mon Nov 9 10:11:35 2020 -0800 winevulkan: Update to VK spec version 1.2.160. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Piers Daniell <pdaniell(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.c | 27 ++ dlls/winevulkan/vulkan_thunks.h | 2 + dlls/winevulkan/winevulkan.json | 2 +- include/wine/vulkan.h | 1014 +++++++++++++++++++++------------------ 5 files changed, 572 insertions(+), 475 deletions(-) Diff:
https://source.winehq.org/git/wine.git/?a=commitdiff;h=572aa09de1b0e3ba0e8b…
1
0
0
0
Derek Lesho : winegstreamer: Set MF_PD_DURATION on source's presentation descriptor.
by Alexandre Julliard
09 Nov '20
09 Nov '20
Module: wine Branch: master Commit: 59c55e96f5d925c58f96de8766b1501f4c431d35 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=59c55e96f5d925c58f96de87…
Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Mon Nov 2 13:34:55 2020 -0600 winegstreamer: Set MF_PD_DURATION on source's presentation descriptor. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/media_source.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 9d7df347dab..66bdf64a669 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -1237,6 +1237,7 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ struct media_source *object = heap_alloc_zero(sizeof(*object)); IMFStreamDescriptor **descriptors = NULL; + gint64 total_pres_time = 0; DWORD bytestream_caps; unsigned int i; HRESULT hr; @@ -1357,6 +1358,25 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ heap_free(descriptors); descriptors = NULL; + for (i = 0; i < object->stream_count; i++) + { + gint64 stream_pres_time; + if (gst_pad_query_duration(object->streams[i]->their_src, GST_FORMAT_TIME, &stream_pres_time)) + { + TRACE("Stream %u has duration %llu\n", i, (unsigned long long int) stream_pres_time); + + if (stream_pres_time > total_pres_time) + total_pres_time = stream_pres_time; + } + else + { + WARN("Unable to get presentation time of stream %u\n", i); + } + } + + if (object->stream_count) + IMFPresentationDescriptor_SetUINT64(object->pres_desc, &MF_PD_DURATION, total_pres_time / 100); + object->state = SOURCE_STOPPED; *out_media_source = object;
1
0
0
0
Derek Lesho : winegstreamer: Implement IMFMediaSource::GetCharacteristics.
by Alexandre Julliard
09 Nov '20
09 Nov '20
Module: wine Branch: master Commit: e12b7d210422311a562ff830535054f740ab3257 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=e12b7d210422311a562ff830…
Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Mon Nov 2 13:34:53 2020 -0600 winegstreamer: Implement IMFMediaSource::GetCharacteristics. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/media_source.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index e69eeba4294..9d7df347dab 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -1035,12 +1035,14 @@ static HRESULT WINAPI media_source_GetCharacteristics(IMFMediaSource *iface, DWO { struct media_source *source = impl_from_IMFMediaSource(iface); - FIXME("(%p)->(%p): stub\n", source, characteristics); + TRACE("(%p)->(%p)\n", source, characteristics); if (source->state == SOURCE_SHUTDOWN) return MF_E_SHUTDOWN; - return E_NOTIMPL; + *characteristics = MFMEDIASOURCE_CAN_SEEK; + + return S_OK; } static HRESULT WINAPI media_source_CreatePresentationDescriptor(IMFMediaSource *iface, IMFPresentationDescriptor **descriptor)
1
0
0
0
Derek Lesho : winegstreamer: Require media source's IMFByteStream to be seekable.
by Alexandre Julliard
09 Nov '20
09 Nov '20
Module: wine Branch: master Commit: 964cf9cfce5c4eec804db0294dfdb33a76488168 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=964cf9cfce5c4eec804db029…
Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Mon Nov 2 15:48:33 2020 -0600 winegstreamer: Require media source's IMFByteStream to be seekable. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/media_source.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 06f35ce24b6..e69eeba4294 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -1235,6 +1235,7 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ struct media_source *object = heap_alloc_zero(sizeof(*object)); IMFStreamDescriptor **descriptors = NULL; + DWORD bytestream_caps; unsigned int i; HRESULT hr; int ret; @@ -1242,6 +1243,15 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ if (!object) return E_OUTOFMEMORY; + if (FAILED(hr = IMFByteStream_GetCapabilities(bytestream, &bytestream_caps))) + return hr; + + if (!(bytestream_caps & MFBYTESTREAM_IS_SEEKABLE)) + { + FIXME("Non-seekable bytestreams not supported.\n"); + return MF_E_BYTESTREAM_NOT_SEEKABLE; + } + object->IMFMediaSource_iface.lpVtbl = &IMFMediaSource_vtbl; object->async_commands_callback.lpVtbl = &source_async_commands_callback_vtbl; object->ref = 1;
1
0
0
0
Nikolay Sivov : evr/presenter: Fix error handling on object creation.
by Alexandre Julliard
09 Nov '20
09 Nov '20
Module: wine Branch: master Commit: c528ef47ebb9b3ee9399928d4a53927ffca96cb0 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=c528ef47ebb9b3ee9399928d…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 9 15:02:44 2020 +0300 evr/presenter: Fix error handling on object creation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 1b98e63a49a..335e5df2459 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -1207,13 +1207,18 @@ HRESULT evr_presenter_create(IUnknown *outer, void **out) InitializeCriticalSection(&object->cs); if (FAILED(hr = DXVA2CreateDirect3DDeviceManager9(&object->reset_token, &object->device_manager))) - IUnknown_Release(&object->IUnknown_inner); + goto failed; if (FAILED(hr = video_presenter_init_d3d(object))) - IUnknown_Release(&object->IUnknown_inner); + goto failed; - if (SUCCEEDED(hr)) - *out = &object->IUnknown_inner; + *out = &object->IUnknown_inner; + + return S_OK; + +failed: + + IUnknown_Release(&object->IUnknown_inner); return hr; }
1
0
0
0
Nikolay Sivov : evr/mixer: Add partial implementation of sample processing.
by Alexandre Julliard
09 Nov '20
09 Nov '20
Module: wine Branch: master Commit: 409392dfb778e018d49f11aabf827a6c5214e287 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=409392dfb778e018d49f11aa…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 9 15:02:43 2020 +0300 evr/mixer: Add partial implementation of sample processing. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 63 insertions(+), 2 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index a60da623f64..8eba3e3611b 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -1163,6 +1163,65 @@ static HRESULT video_mixer_get_d3d_device(struct video_mixer *mixer, IDirect3DDe return hr; } +static void video_mixer_scale_rect(RECT *rect, unsigned int width, unsigned int height, + const MFVideoNormalizedRect *scale) +{ + if (rect->left == 0.0f && rect->top == 0.0f && rect->right == 1.0f && rect->bottom == 1.0f) + { + SetRect(rect, 0, 0, width, height); + } + else + { + rect->left = width * scale->left; + rect->right = width * scale->right; + rect->top = height * scale->top; + rect->bottom = height * scale->bottom; + } +} + +static void video_mixer_render(struct video_mixer *mixer, IDirect3DSurface9 *rt) +{ + DXVA2_VideoSample samples[1] = {{ 0 }}; + DXVA2_VideoProcessBltParams params = { 0 }; + MFVideoNormalizedRect zoom_rect; + struct input_stream *stream; + IDirect3DSurface9 *surface; + D3DSURFACE_DESC desc; + HRESULT hr; + + IDirect3DSurface9_GetDesc(rt, &desc); + + if (FAILED(IMFAttributes_GetBlob(mixer->attributes, &VIDEO_ZOOM_RECT, (UINT8 *)&zoom_rect, + sizeof(zoom_rect), NULL))) + { + zoom_rect.left = zoom_rect.top = 0.0f; + zoom_rect.right = zoom_rect.bottom = 1.0f; + } + + video_mixer_scale_rect(¶ms.TargetRect, desc.Width, desc.Height, &zoom_rect); + + /* FIXME: for now only handle reference stream. */ + + video_mixer_get_input(mixer, 0, &stream); + + if (FAILED(hr = video_mixer_get_sample_surface(stream->sample, &surface))) + { + WARN("Failed to get source surface, hr %#x.\n", hr); + return; + } + + IDirect3DSurface9_GetDesc(surface, &desc); + + samples[0].SrcSurface = surface; + SetRect(&samples[0].SrcRect, 0, 0, desc.Width, desc.Height); + video_mixer_scale_rect(&samples[0].DstRect, desc.Width, desc.Height, &stream->rect); + + if (FAILED(hr = IDirectXVideoProcessor_VideoProcessBlt(mixer->processor, rt, ¶ms, samples, 1, NULL))) + WARN("Failed to process samples, hr %#x.\n", hr); + + IDirect3DSurface9_Release(surface); +} + static HRESULT WINAPI video_mixer_transform_ProcessOutput(IMFTransform *iface, DWORD flags, DWORD count, MFT_OUTPUT_DATA_BUFFER *buffers, DWORD *status) { @@ -1197,13 +1256,15 @@ static HRESULT WINAPI video_mixer_transform_ProcessOutput(IMFTransform *iface, D } } - /* FIXME: for now discard input */ + if (SUCCEEDED(hr)) + video_mixer_render(mixer, surface); if (SUCCEEDED(hr)) { for (i = 0; i < mixer->input_count; ++i) { - IMFSample_Release(mixer->inputs[i].sample); + if (mixer->inputs[i].sample) + IMFSample_Release(mixer->inputs[i].sample); mixer->inputs[i].sample = NULL; video_mixer_request_sample(mixer, i); }
1
0
0
0
Nikolay Sivov : evr/mixer: Reuse full set of type attributes for output types.
by Alexandre Julliard
09 Nov '20
09 Nov '20
Module: wine Branch: master Commit: 292b54f3ae4725f287fe587e3420fd5a7b59f03a URL:
https://source.winehq.org/git/wine.git/?a=commit;h=292b54f3ae4725f287fe587e…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 9 15:02:42 2020 +0300 evr/mixer: Reuse full set of type attributes for output types. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 16 ++++++++++++---- dlls/evr/tests/evr.c | 21 ++++++++++++++++++++- 2 files changed, 32 insertions(+), 5 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 20b5e3b2bba..a60da623f64 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -653,7 +653,8 @@ static int rt_formats_sort_compare(const void *left, const void *right) } static HRESULT video_mixer_collect_output_types(struct video_mixer *mixer, const DXVA2_VideoDesc *video_desc, - IDirectXVideoProcessorService *service, unsigned int device_count, const GUID *devices, unsigned int flags) + IMFMediaType *media_type, IDirectXVideoProcessorService *service, unsigned int device_count, + const GUID *devices, unsigned int flags) { unsigned int i, j, format_count, count; struct rt_format *rt_formats = NULL, *ptr; @@ -706,9 +707,16 @@ static HRESULT video_mixer_collect_output_types(struct video_mixer *mixer, const { for (i = 0; i < count; ++i) { + IMFMediaType *rt_media_type; + subtype.Data1 = rt_formats[i].format; mixer->output.rt_formats[i] = rt_formats[i]; - MFCreateVideoMediaTypeFromSubtype(&subtype, (IMFVideoMediaType **)&mixer->output.rt_formats[i].media_type); + + MFCreateMediaType(&rt_media_type); + IMFMediaType_CopyAllItems(media_type, (IMFAttributes *)rt_media_type); + IMFMediaType_SetGUID(rt_media_type, &MF_MT_SUBTYPE, &subtype); + + mixer->output.rt_formats[i].media_type = rt_media_type; } mixer->output.rt_formats_count = count; } @@ -785,8 +793,8 @@ static HRESULT WINAPI video_mixer_transform_SetInputType(IMFTransform *iface, DW if (SUCCEEDED(hr = IDirectXVideoProcessorService_GetVideoProcessorDeviceGuids(service, &video_desc, &count, &guids))) { - if (SUCCEEDED(hr = video_mixer_collect_output_types(mixer, &video_desc, service, count, - guids, flags)) && !(flags & MFT_SET_TYPE_TEST_ONLY)) + if (SUCCEEDED(hr = video_mixer_collect_output_types(mixer, &video_desc, media_type, + service, count, guids, flags)) && !(flags & MFT_SET_TYPE_TEST_ONLY)) { if (mixer->inputs[0].media_type) IMFMediaType_Release(mixer->inputs[0].media_type); diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index a711be7ad21..a1d7b7109d9 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -915,11 +915,11 @@ static void test_default_mixer_type_negotiation(void) IDirect3DDevice9 *device; IMFMediaType *video_type; IMFTransform *transform; + DWORD index, count; GUID guid, *guids; IDirect3D9 *d3d; IUnknown *unk; HWND window; - DWORD count; HRESULT hr; UINT token; @@ -1013,6 +1013,25 @@ static void test_default_mixer_type_negotiation(void) IMFMediaType_Release(media_type); IMFMediaType_Release(media_type2); + /* Check attributes on available output types. */ + index = 0; + while (SUCCEEDED(IMFTransform_GetOutputAvailableType(transform, 0, index++, &media_type))) + { + UINT64 frame_size; + GUID subtype; + UINT32 value; + + hr = IMFMediaType_GetGUID(media_type, &MF_MT_SUBTYPE, &subtype); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFMediaType_GetUINT64(media_type, &MF_MT_FRAME_SIZE, &frame_size); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFMediaType_GetUINT32(media_type, &MF_MT_ALL_SAMPLES_INDEPENDENT, &value); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + IMFMediaType_Release(media_type); + } + ok(index > 1, "Unexpected number of available types.\n"); + hr = IMFTransform_QueryInterface(transform, &IID_IMFVideoProcessor, (void **)&processor); ok(hr == S_OK, "Unexpected hr %#x.\n", hr);
1
0
0
0
Nikolay Sivov : mf/evr: Accept samples when prerolling.
by Alexandre Julliard
09 Nov '20
09 Nov '20
Module: wine Branch: master Commit: 8c9988d8d45bf48f5b40ef76856a08a24ce872af URL:
https://source.winehq.org/git/wine.git/?a=commit;h=8c9988d8d45bf48f5b40ef76…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 9 15:02:41 2020 +0300 mf/evr: Accept samples when prerolling. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index f5bbfffc4a5..486958f5f79 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -350,7 +350,7 @@ static HRESULT WINAPI video_stream_sink_ProcessSample(IMFStreamSink *iface, IMFS { WARN("No sample timestamp, hr %#x.\n", hr); } - else if (stream->parent->state == EVR_STATE_RUNNING) + else if (stream->parent->state == EVR_STATE_RUNNING || stream->flags & EVR_STREAM_PREROLLING) { if (SUCCEEDED(IMFTransform_ProcessInput(stream->parent->mixer, stream->id, sample, 0))) IMFVideoPresenter_ProcessMessage(stream->parent->presenter, MFVP_MESSAGE_PROCESSINPUTNOTIFY, 0);
1
0
0
0
← Newer
1
...
66
67
68
69
70
71
72
...
86
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
Results per page:
10
25
50
100
200