Commit Graph

189 Commits

Author SHA1 Message Date
Zebediah Figura f55427fb9d strmbase: Move video.c to quartz.
The only filters that expose IBasicVideo live in quartz.

Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-03-12 21:18:18 +01:00
Zebediah Figura bb8911928f strmbase: Move window.c to quartz.
The only filters that expose IVideoWindow live in quartz.

Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-03-12 10:12:15 +01:00
Zebediah Figura 56a6bc87ac quartz: Pass an IUnknown pointer to the object creation functions.
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-03-12 10:12:03 +01:00
Zebediah Figura 6c8f52c4fb quartz/vmr9: Fix copying from the d3d9 surface if the pitch doesn't match the width.
Spotted by Henri Verbeet.

Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-02-12 20:20:27 +01:00
Zebediah Figura 9b1ba34149 quartz/vmr9: Reimplement VMR9_GetStaticImage().
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-02-11 08:48:12 +01:00
Zebediah Figura 7770e0bbaf quartz: Use wide character string literals.
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-01-23 09:27:00 +01:00
Zebediah Figura 7f57286d73 strmbase/renderer: Use base sink connection methods.
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-12-10 20:59:19 +01:00
Zebediah Figura f595d9bdff strmbase: Pass an AM_MEDIA_TYPE pointer to CompleteConnect().
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-12-10 20:59:19 +01:00
Zebediah Figura 94822bae5f quartz/vmr9: Create the rendering window when the filter is created.
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-12-06 10:11:46 +01:00
Zebediah Figura 19826fd6b7 quartz/vmr9: Wait in Receive() while paused.
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-11-22 09:03:49 +01:00
Zebediah Figura 03f0479c34 strmbase: Rename the "mtCurrent" field of struct strmbase_pin to "mt".
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-11-19 09:23:09 +01:00
Zebediah Figura 70d2ba7482 strmbase: Get rid of the unused "cs" parameter to strmbase_video_init().
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-11-18 19:12:14 +01:00
Zebediah Figura 0f8dbcdf80 strmbase: Get rid of the BaseRendererFuncTable typedef.
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-10-27 19:13:30 +01:00
Zebediah Figura 487ea5df22 strmbase: Get rid of the BaseRenderer typedef.
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-10-27 19:13:25 +01:00
Zebediah Figura 48aa8326f9 strmbase: Get rid of the "vtbl" parameter to strmbase_renderer_init().
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-10-23 10:25:57 +02:00
Zebediah Figura 3f7fdcfd63 strmbase: Get rid of the unused "lock" parameter to BaseControlWindow_Init().
We don't use a lock, and while it's true we probably should be, we already
have access to one.

Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-10-18 18:05:53 +02:00
Zebediah Figura a17f2ecb69 strmbase: Get rid of BaseWindowImpl_OnSize().
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-10-17 10:49:37 +02:00
Zebediah Figura b0b2c7d699 strmbase: Get rid of the "pfnGetClassWindowStyles" callback.
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-10-17 10:49:29 +02:00
Zebediah Figura a0aa542a26 strmbase: Get rid of the "pfnOnReceiveMessage" callback.
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-10-16 13:39:30 +02:00
Zebediah Figura 55b2251fef strmbase: Get rid of the "pfnPossiblyEatMessage" callback.
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-10-16 12:31:35 +02:00
Zebediah Figura c4e3f4180d quartz: Use strmbase_dump_media_type() where appropriate.
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-10-07 10:00:46 +02:00
Zebediah Figura c6f818e9a6 quartz/vmr9: Implement IOverlay::GetWindowHandle().
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-10-04 23:16:25 +02:00
Zebediah Figura af162fad4f quartz/vmr9: Add a stub IOverlay interface to the sink pin.
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-10-04 23:16:25 +02:00
Zebediah Figura ff5644174e quartz/vmr9: Create the window on the same thread as the filter.
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-10-03 09:45:56 +02:00
Zebediah Figura c7a447b67a strmbase: Rename "pConnectedTo" to "peer".
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-09-27 13:26:52 +02:00
Zebediah Figura d44d83b684 quartz: Get rid of the no longer used base parser.
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-09-23 10:10:08 +02:00
Zebediah Figura 1317102f6c strmbase: Get rid of the "debug_info" parameter to strmbase_filter_init().
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-08-28 08:44:35 +02:00
Zebediah Figura fb504baaa8 strmbase: Build with msvcrt.
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-08-05 18:49:31 +02:00
Zebediah Figura 444f9b7ba2 strmbase: Rename pfnOnStopStreaming to renderer_stop_stream.
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-07-03 10:56:03 +02:00
Zebediah Figura fa5c24e933 strmbase: Rename pfnOnStartStreaming to renderer_start_stream.
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-07-03 10:56:00 +02:00
Zebediah Figura 48b475ad00 strmbase: Remove several unused callbacks.
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-07-03 10:55:57 +02:00
Zebediah Figura 46bb907d3a quartz/vmr9: Return S_OK when calling IVMRFilterConfig9::SetNumberOfStreams(1).
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47291
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-06-26 09:34:28 +02:00
Zebediah Figura b583452af3 strmbase/renderer: Store the sink pin inline in the BaseRenderer structure.
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-06-21 08:06:06 +02:00
Zebediah Figura 5e63f7f93a quartz: Use strmbase IUnknown methods for IVideoWindow.
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-06-12 16:11:06 +02:00
Zebediah Figura fbd9133ee5 strmbase: Get rid of the "lpVtbl" parameter to BaseControlVideo_Init().
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-06-12 16:10:57 +02:00
Zebediah Figura cb0b2d81d2 quartz: Use strmbase IUnknown methods for IBasicVideo.
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-06-12 16:10:51 +02:00
Andrey Gusev e87322e9d4 quartz: Avoid cast for VMR9_ImagePresenter_QueryInterface.
Signed-off-by: Andrey Gusev <andrey.goosev@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-06-06 18:59:17 +02:00
Zebediah Figura a7f27388a0 quartz/vmr9: Use strmbase filter aggregation support.
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-06-04 23:05:25 +02:00
Zebediah Figura 31a5cb5f05 strmbase: Support aggregation in the base filter.
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-06-04 23:05:25 +02:00
Zebediah Figura 61b5f780e2 quartz/vmr9: Implement IVMRWindowlessControl::SetVideoClippingWindow().
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47258
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-05-27 14:37:27 +02:00
Zebediah Figura 69e654a684 quartz: Use CONTAINING_RECORD instead of casting.
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-05-17 09:20:57 +02:00
Zebediah Figura 44dbf4afbf quartz/vmr9: Use strmbase_renderer_cleanup().
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-05-16 10:00:36 +02:00
Zebediah Figura edf1e7696f quartz/vmr9: Implement IVMRFilterConfig::SetRenderingMode().
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42372
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-04-02 11:51:56 +02:00
Zebediah Figura e4b58b450b quartz/vmr9: Avoid unloading d3d9 while holding d3d9 objects.
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-04-02 11:51:56 +02:00
Zebediah Figura 4f16a137da strmbase: Correct pin IDs for renderers.
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-03-12 10:53:40 +01:00
Michael Stefaniuc 53c80a2bd1 quartz: Use the ARRAY_SIZE() macro.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-07-17 22:36:06 +02:00
Miklós Máté bf9eaac544 quartz: Small readability fix.
Signed-off-by: Miklós Máté <mtmkls@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-06-12 12:05:05 +02:00
Francois Gouget ff36b5c816 quartz: A couple of spelling fixes in comments.
Signed-off-by: Francois Gouget <fgouget@free.fr>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-01-10 19:19:14 +01:00
Andrew Eikum ac59a68162 quartz: Don't write past end of d3d9 buffer.
Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2017-01-09 21:30:10 +01:00
Nikolay Sivov 1fbbd154fd quartz: Remove stub messages for implemented methods.
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-10-25 11:53:57 +02:00
Michael Stefaniuc 3685d3d90d quartz: Avoid using CopyRect().
Signed-off-by: Michael Stefaniuc <mstefani@redhat.de>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-09-28 23:17:44 +09:00
Michael Stefaniuc fd99282319 quartz: There is no point in tracing the GUID pointer too.
Signed-off-by: Michael Stefaniuc <mstefani@redhat.de>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-08-10 22:22:52 +09:00
Jan Schmidt b5a33f02d3 quartz: Images in Direct3D surfaces must be top-down.
Invert images when copying to a Direct3D surface if they are provided
bottom-up.

Signed-off-by: Jan Schmidt <jan@centricular.com>
Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-07-21 12:30:16 +09:00
Michael Stefaniuc 6b16727803 quartz: Use wine_dbgstr_rect() to trace RECTs.
Signed-off-by: Michael Stefaniuc <mstefani@redhat.de>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-19 21:06:10 +09:00
Michael Stefaniuc 063cb64e11 quartz: Simplify a RECT transformation.
Signed-off-by: Michael Stefaniuc <mstefani@redhat.de>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-13 23:01:08 +09:00
Michael Stefaniuc f96aab3f22 quartz: Use SetRect instead of open coding it.
Signed-off-by: Michael Stefaniuc <mstefani@redhat.de>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-04-13 23:01:07 +09:00
Marcus Meissner 5bc57faf86 quartz: Avoid endless loop (Coverity).
Signed-off-by: Marcus Meissner <marcus@jet.franken.de>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2015-11-02 23:02:20 +09:00
Nikolay Sivov 5fb58eae3b quartz: Minor cleanup of returned interface pointers.
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2015-10-21 21:09:10 +09:00
Francois Gouget 78bf626d20 quartz: Remove unneeded NONAMELESSXXX directives. 2015-03-18 19:38:55 +09:00
Michael Stefaniuc 8a42eb55da quartz: Simplify code flow logic (PVS-Studio). 2015-01-08 13:12:14 +01:00
Michael Müller 6e373aa695 quartz: Return increasing monitor GUID on VMR7 monitor enumeration. 2014-01-02 17:43:29 +01:00
Michael Müller 815f252b4a quartz: Partial implementation of VMR7MonitorConfig and VMR9MonitorConfig. 2013-11-19 18:53:16 +01:00
Michael Müller 1b5026424b quartz: Improve stubs for AMCertifiedOutputProtection. 2013-11-11 20:07:02 +01:00
Marcus Meissner b745d8692b quartz: Use FreeLibrary instead of CloseHandle (Coverity). 2013-11-11 13:27:27 +01:00
André Hentschel 217faec5f5 quartz: Add stubbed IAMCertifiedOutputProtection interface. 2013-11-06 12:01:55 +01:00
André Hentschel ab925b39b4 quartz: Add stubbed IVMRMonitorConfig interfaces. 2013-11-06 12:01:55 +01:00
André Hentschel abbb40fa03 quartz: Add stubbed IVMRSurfaceAllocatorNotify interface. 2013-11-06 12:01:54 +01:00
André Hentschel e26d4a6f43 quartz: Add stubbed IVMRWindowlessControl interface. 2013-11-06 12:01:54 +01:00
André Hentschel d029181d1a quartz: Add stubbed IVMRFilterConfig interface. 2013-11-06 12:01:54 +01:00
André Hentschel f9cccaa3de quartz: Add Video Mixing Renderer 7. 2013-11-06 12:01:54 +01:00
André Hentschel bc59206e0e quartz: Get rid of the VMR9Impl typedef. 2013-11-06 12:01:54 +01:00
Andrew Talbot d50189c162 quartz: Avoid signed-unsigned integer comparisons. 2013-02-25 10:40:32 +01:00
Nikolay Sivov 17450f0be0 quartz: Use proper method macros. 2012-08-15 12:17:54 +02:00
Francois Gouget b5b7947ee8 quartz: Make VMR9_{Break,Complete}Connect() static. 2012-06-08 19:35:17 +02:00
Aric Stewart ac421e3341 quartz: Hookup the VMR-9 to directX and the Allocator-Presenter. 2012-06-07 16:06:49 +02:00
Aric Stewart 583d915520 quartz: Create the rendering window for VMR-9. 2012-06-07 15:56:22 +02:00
Aric Stewart 82a562a603 quartz: Allocate surfaces in VMR-9. 2012-06-07 15:55:24 +02:00
Aric Stewart 3d46f56a14 quartz: Implement default Surface Allocator for vmr9. 2012-06-07 15:53:09 +02:00
Aric Stewart 0352a7fb88 quartz: Add offscreen presentation to VMR9. 2012-05-22 17:43:57 +02:00
Aric Stewart 38c31973d4 quartz: Implement a Default Presenter in VMR9. 2012-05-22 17:43:56 +02:00
Aric Stewart d04552cada quartz: vmr-9 call BaseControlWindow_Destroy when destroying. 2012-05-18 18:14:26 +02:00
Francois Gouget a3da9a7ab4 quartz: Mark a bunch of functions as static. 2012-04-20 12:00:16 +02:00
Aric Stewart 69da44106e quartz: Add VMRSurfaceAllocatorNotify9 to VMR9. 2012-04-09 17:57:29 +02:00
Aric Stewart e4656ebc88 quartz: Add VMRWindowlessControl9 to VMR9. 2012-04-05 17:53:11 +02:00
Aric Stewart eb4972017e quartz: Add VMRFilterConfig9 to VMR9. 2012-04-05 17:53:08 +02:00
Aric Stewart 8e79273b0e quartz: Add IAMFilterMiscFlags to VMR9 implementation. 2012-04-05 17:53:05 +02:00
Aric Stewart 76a42b9b9e quartz: Add BaseControlVideo to VMR9. 2012-04-05 14:51:34 +02:00
Aric Stewart 8365b7a372 quartz: Add BaseControlWindow to VMR9. 2012-04-05 14:51:34 +02:00
Aric Stewart d969b80210 quartz: Add initial VMR9 stub. 2012-04-05 14:51:34 +02:00