Commit Graph

226 Commits

Author SHA1 Message Date
Zebediah Figura d49417c081 amstream: Use shorter names for primary audio stream methods.
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-09-05 08:30:46 +02:00
Zebediah Figura 953cf31158 amstream: Reimplement IPin locally for the primary audio stream.
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-09-05 08:30:41 +02:00
Zebediah Figura 5527443865 amstream: Reimplement IMemInputPin locally for the primary audio stream.
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-09-05 08:30:36 +02:00
Zebediah Figura 47105ce35c amstream: Get rid of the AudioMediaStreamImpl typedef.
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-09-05 08:30:32 +02:00
Zebediah Figura c5651e9409 amstream: Reimplement IPin::EnumMediaTypes() for the primary audio stream.
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-09-04 17:11:55 +02:00
Zebediah Figura d5f1a5c0be amstream/tests: Also test pin information for the primary audio stream.
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-09-04 17:11:52 +02:00
Zebediah Figura ed685754e2 amstream: Use shorter method names for DirectDraw stream methods.
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-09-04 17:11:50 +02:00
Zebediah Figura 2704646637 amstream: Reimplement IPin locally for the DirectDraw stream.
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-09-04 17:11:48 +02:00
Zebediah Figura ee88009556 amstream: Reimplement IMemInputPin locally for the DirectDraw stream.
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-09-04 17:11:45 +02:00
Zebediah Figura 2f9e6c0c72 amstream: Get rid of the DirectDrawMediaStreamImpl typedef.
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-09-03 12:16:47 +02:00
Zebediah Figura 98c591b2ba amstream: Reimplement IPin::EnumMediaTypes() for the primary video stream.
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-09-03 12:16:45 +02:00
Zebediah Figura 3537f73f21 amstream: Move audio and ddraw streams into separate files.
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-09-03 12:16:40 +02:00
Zebediah Figura bfc668833e amstream/tests: Add more tests for media types.
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-09-03 12:16:37 +02:00
Zebediah Figura be8111f627 amstream/tests: Add some tests for IEnumMediaTypes.
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-09-02 20:41:47 +02:00
Zebediah Figura d15c23b30a amstream: Don't keep track of streams in the multimedia stream object.
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-09-02 20:41:45 +02:00
Zebediah Figura 6d6ea5dc7d amstream: Forward IMultiMediaStream::GetMediaStream() to the stream filter.
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-09-02 20:41:44 +02:00
Zebediah Figura 6c55e734bd amstream: Move multimedia_stream_create() to avoid forward declarations.
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-09-02 20:41:42 +02:00
Zebediah Figura 0d7d1ba210 amstream: Use shorter method names for the multimedia stream.
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-09-02 20:41:39 +02:00
Zebediah Figura 8af6ed6881 amstream: Get rid of the IAMMultiMediaStreamImpl typedef.
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-08-30 21:24:26 +02:00
Zebediah Figura 0a7933a4eb amstream: Rename amstream.c to multimedia.c.
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-08-30 21:24:26 +02:00
Zebediah Figura 0fe51e0fa6 amstream/tests: Link to strmiids and uuid.
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-08-30 21:24:26 +02:00
Zebediah Figura 6412145657 amstream/tests: Add some tests for IAMMultiMediaStream::Initialize().
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-08-30 21:24:26 +02:00
Zebediah Figura 6fc7582713 amstream/tests: Separate and expand tests for IAMMultiMediaStream::AddMediaStream().
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-08-30 21:24:26 +02:00
Zebediah Figura 3256484a14 amstream: Create the stream filter when the multimedia stream is created.
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-08-29 20:08:14 +02:00
Zebediah Figura c8b94b6300 amstream: Use shorter names for IMediaStreamFilter methods.
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-08-29 20:08:14 +02:00
Zebediah Figura bbd4641bc6 amstream: Get rid of the IMediaStreamFilterImpl typedef.
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-08-29 20:08:14 +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
Alistair Leslie-Hughes 623085d550 amstream: Leave critical section on success (Coverity).
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-05-27 14:42:20 +02:00
Zebediah Figura 7ef5f3be5a amstream: Reimplement IBaseFilter methods in the media stream filter.
In the long (or even short) term we probably want to decouple amstream from
strmbase entirely. The fact that pins and filters belong to separate objects
(and either one can even be provided by the application) prevents us from
performing some helpful restructuring.

Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-05-17 09:21:15 +02:00
Zebediah Figura f423c6e707 amstream: Reimplement IMediaStreamFilter::EnumPins().
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-05-17 09:21:09 +02:00
Zebediah Figura dad885e2b9 strmbase: Get rid of the "pfnGetPinCount" callback.
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-05-14 10:29:15 +02:00
Zebediah Figura 9be7995448 strmbase: Get rid of the "pfnGetMediaTypeVersion" callback.
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-05-10 16:04:25 +02:00
Zebediah Figura 7e6ab5e53c strmbase: Move "AttemptConnection" to the base source pin function table.
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-05-10 15:54:15 +02:00
Zebediah Figura c5584f5ff1 amstream/tests: Add some tests for querying pin information.
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-04-22 11:19:11 +02:00
Zebediah Figura a0d2325ac5 amstream/tests: Add some tests for IMediaStreamFilter::FindPin().
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-04-22 11:19:09 +02:00
Zebediah Figura d4f99f4fbc amstream/tests: Add tests for IMediaStreamFilter::EnumPins().
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-04-22 11:19:07 +02:00
Zebediah Figura aca1b2ea6e amstream/tests: Add some test for supported interfaces.
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-04-22 11:19:04 +02:00
Zebediah Figura eec4a05e76 amstream: Reference the returned IMediaStream pointer in IAMMultiMediaStream::AddMediaStream().
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-04-22 11:19:02 +02:00
Michael Stefaniuc 4749fa6767 amstream: Remove useless cast to self.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2019-02-12 23:02:28 +01:00
Alex Henrie 3f2a2c0591 amstream: Make constants 'filternameW' and 'sourceW' static.
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-11-30 19:36:49 +01:00
Józef Kucia 554e2641cc amstream: Handle stream object parameter for IDirectDrawMediaStream.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45382
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-08-14 10:16:02 +02:00
Michael Stefaniuc 8e9a05110e amstream: Use the ARRAY_SIZE() macro.
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-08-14 09:42:02 +02:00
Zebediah Figura fbbde62103 amstream: Use CBaseFilter::FindPin().
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-07-06 19:44:27 +02:00
Marcus Meissner 19802c55bf amstream/tests: Use correct buffer size for StringFromGUID2.
Signed-off-by: Marcus Meissner <meissner@suse.de>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-07-04 20:11:48 +02:00
Zebediah Figura 10ff8f3082 strmbase: Implement QueryAccept() on top of CheckMediaType() for output pins too.
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-05-04 11:01:40 +02:00
Francois Gouget 31deaa5baa amstream: Remove an unused NONAMELESSSTRUCT directive.
Signed-off-by: Francois Gouget <fgouget@free.fr>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-04-26 21:19:35 +02:00
Anton Baskanov 2622690534 amstream: Use streams as pins in MediaStreamFilter.
Signed-off-by: Anton Baskanov <baskanov@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-01 19:26:29 +01:00
Anton Baskanov 193e56ce2c amstream: Store streams as IAMMediaStream in MediaStreamFilter.
Signed-off-by: Anton Baskanov <baskanov@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-01 19:26:27 +01:00
Anton Baskanov d7511089bf amstream: Implement AMAudioStream::JoinFilter.
Signed-off-by: Anton Baskanov <baskanov@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-01 19:26:25 +01:00
Anton Baskanov 6030403151 amstream: Implement CheckMediaType for AMAudioStream based on code from mediastreamfilter.c.
Signed-off-by: Anton Baskanov <baskanov@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2018-03-01 19:26:24 +01:00