Signed-off-by: Nikolay Sivov nsivov@codeweavers.com --- include/Makefile.in | 1 + include/evr.idl | 11 +++ include/mfplay.idl | 202 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 214 insertions(+) create mode 100644 include/mfplay.idl
diff --git a/include/Makefile.in b/include/Makefile.in index 74198af7a9..09c84d8254 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -370,6 +370,7 @@ SOURCES = \ mferror.h \ mfidl.idl \ mfobjects.idl \ + mfplay.idl \ mfreadwrite.idl \ mftransform.idl \ midles.h \ diff --git a/include/evr.idl b/include/evr.idl index 22f745e12e..3768b41b16 100644 --- a/include/evr.idl +++ b/include/evr.idl @@ -25,6 +25,17 @@ import "mftransform.idl"; import "mediaobj.idl"; import "strmif.idl";
+cpp_quote("#ifndef _MFVideoNormalizedRect_") +cpp_quote("#define _MFVideoNormalizedRect_") +typedef struct MFVideoNormalizedRect +{ + float left; + float top; + float right; + float bottom; +} MFVideoNormalizedRect; +cpp_quote("#endif") + typedef enum _MFVP_MESSAGE_TYPE { MFVP_MESSAGE_FLUSH, MFVP_MESSAGE_INVALIDATEMEDIATYPE, diff --git a/include/mfplay.idl b/include/mfplay.idl new file mode 100644 index 0000000000..415a6f5241 --- /dev/null +++ b/include/mfplay.idl @@ -0,0 +1,202 @@ +/* + * Copyright 2019 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "unknwn.idl"; +import "propsys.idl"; +import "evr.idl"; + +typedef [v1_enum] enum _MFP_CREATION_OPTIONS +{ + MFP_OPTION_NONE = 0, + MFP_OPTION_FREE_THREADED_CALLBACK = 0x1, + MFP_OPTION_NO_MMCSS = 0x2, + MFP_OPTION_NO_REMOTE_DESKTOP_OPTIMIZATION = 0x4, +} MFP_CREATION_OPTIONS; + +typedef [v1_enum] enum MFP_MEDIAPLAYER_STATE +{ + MFP_MEDIAPLAYER_STATE_EMPTY = 0, + MFP_MEDIAPLAYER_STATE_STOPPED, + MFP_MEDIAPLAYER_STATE_PLAYING, + MFP_MEDIAPLAYER_STATE_PAUSED, + MFP_MEDIAPLAYER_STATE_SHUTDOWN, +} MFP_MEDIAPLAYER_STATE; + +typedef enum MFP_EVENT_TYPE +{ + MFP_EVENT_TYPE_PLAY = 0, + MFP_EVENT_TYPE_PAUSE, + MFP_EVENT_TYPE_STOP, + MFP_EVENT_TYPE_POSITION_SET, + MFP_EVENT_TYPE_RATE_SET, + MFP_EVENT_TYPE_MEDIAITEM_CREATED, + MFP_EVENT_TYPE_MEDIAITEM_SET, + MFP_EVENT_TYPE_FRAME_STEP, + MFP_EVENT_TYPE_MEDIAITEM_CLEARED, + MFP_EVENT_TYPE_MF, + MFP_EVENT_TYPE_ERROR, + MFP_EVENT_TYPE_PLAYBACK_ENDED, + MFP_EVENT_TYPE_ACQUIRE_USER_CREDENTIAL, +} MFP_EVENT_TYPE; + +interface IMFPMediaPlayer; +interface IMFPMediaItem; + +typedef struct MFP_EVENT_HEADER +{ + MFP_EVENT_TYPE eEventType; + HRESULT hrEvent; + IMFPMediaPlayer *pMediaPlayer; + MFP_MEDIAPLAYER_STATE eState; + IPropertyStore *pPropertyStore; +} MFP_EVENT_HEADER; + +[ + object, + uuid(766c8ffb-5fdb-4fea-a28d-b912996f51bd), + local, +] +interface IMFPMediaPlayerCallback : IUnknown +{ + void OnMediaPlayerEvent([in] MFP_EVENT_HEADER *event_header); +} + +[ + object, + uuid(a714590a-58af-430a-85bf-44f5ec838d85), + local, +] +interface IMFPMediaPlayer : IUnknown +{ + HRESULT Play(); + + HRESULT Pause(); + + HRESULT Stop(); + + HRESULT FrameStep(); + + HRESULT SetPosition( + [in] REFGUID position_type, + [in] const PROPVARIANT *position); + + HRESULT GetPosition( + [in] REFGUID position_type, + [out] PROPVARIANT *position); + + HRESULT GetDuration( + [in] REFGUID position_type, + [out] PROPVARIANT *duration); + + HRESULT SetRate( + [in] float rate); + + HRESULT GetRate( + [out] float *rate); + + HRESULT GetSupportedRates( + [in] BOOL forward, + [out] float *slowest_rate, + [out] float *fastest_rate); + + HRESULT GetState( + [out] MFP_MEDIAPLAYER_STATE *state); + + HRESULT CreateMediaItemFromURL( + [in] const WCHAR *url, + [in] BOOL sync, + [in] DWORD_PTR user_data, + [out] IMFPMediaItem **item); + + HRESULT CreateMediaItemFromObject( + [in] IUnknown *object, + [in] BOOL sync, + [in] DWORD_PTR user_data, + [out] IMFPMediaItem **item); + + HRESULT SetMediaItem( + [in] IMFPMediaItem *item); + + HRESULT ClearMediaItem(); + + HRESULT GetMediaItem( + [out] IMFPMediaItem **item); + + HRESULT GetVolume( + [out] float *volume); + + HRESULT SetVolume( + [in] float volume); + + HRESULT GetBalance( + [out] float *balance); + + HRESULT SetBalance( + [in] float balance); + + HRESULT GetMute( + [out] BOOL *mute); + + HRESULT SetMute( + [in] BOOL mute); + + HRESULT GetNativeVideoSize( + [out] SIZE *video, + [out] SIZE *arvideo); + + HRESULT GetIdealVideoSize( + [out] SIZE *min_size, + [out] SIZE *max_size); + + HRESULT SetVideoSourceRect( + [in] MFVideoNormalizedRect const *rect); + + HRESULT GetVideoSourceRect( + [out] MFVideoNormalizedRect *rect); + + HRESULT SetAspectRatioMode( + [in] DWORD mode); + + HRESULT GetAspectRatioMode( + [out] DWORD *mode); + + HRESULT GetVideoWindow( + [out] HWND *hwnd); + + HRESULT UpdateVideo(); + + HRESULT SetBorderColor( + [in] COLORREF color); + + HRESULT GetBorderColor( + [out] COLORREF *color); + + HRESULT InsertEffect( + [in] IUnknown *effect, + [in] BOOL optional); + + HRESULT RemoveEffect( + [in] IUnknown *effect); + + HRESULT RemoveAllEffects(); + + HRESULT Shutdown(); +} + +cpp_quote("HRESULT WINAPI MFPCreateMediaPlayer(const WCHAR *url, BOOL start_playback, MFP_CREATION_OPTIONS options, ") +cpp_quote(" IMFPMediaPlayerCallback *callback, HWND hwnd, IMFPMediaPlayer **player);")
Hi Nikolay,
On 15/4/19 3:35 pm, Nikolay Sivov wrote:
+cpp_quote("HRESULT WINAPI MFPCreateMediaPlayer(const WCHAR *url, BOOL start_playback, MFP_CREATION_OPTIONS options, ") +cpp_quote(" IMFPMediaPlayerCallback *callback, HWND hwnd, IMFPMediaPlayer **player);")
This need to have extern "C" around the function.
Regards
Alistair
On 4/15/19 12:20 PM, Alistair Leslie-Hughes wrote:
Hi Nikolay,
On 15/4/19 3:35 pm, Nikolay Sivov wrote:
+cpp_quote("HRESULT WINAPI MFPCreateMediaPlayer(const WCHAR *url, BOOL start_playback, MFP_CREATION_OPTIONS options, ") +cpp_quote(" IMFPMediaPlayerCallback *callback, HWND hwnd, IMFPMediaPlayer **player);")
This need to have extern "C" around the function.
Why? widl should add extern "C" itself.
Jacek
On 4/15/19 1:20 PM, Alistair Leslie-Hughes wrote:
Hi Nikolay,
On 15/4/19 3:35 pm, Nikolay Sivov wrote:
+cpp_quote("HRESULT WINAPI MFPCreateMediaPlayer(const WCHAR *url, BOOL start_playback, MFP_CREATION_OPTIONS options, ") +cpp_quote(" IMFPMediaPlayerCallback *callback, HWND hwnd, IMFPMediaPlayer **player);")
This need to have extern "C" around the function.
Like Jacek already said, widl will wrap everything in extern "C" block. That also reminded me, was https://source.winehq.org/git/wine.git/commit/0501ad920afd208d85cf807c9fcec1... necessary?
Now generated header has nested extern "C".
Regards
Alistair
Hi Nikolay,
The widl does include the extern "C" block which I didn't realise.
Regards Alistair.
________________________________ From: wine-devel wine-devel-bounces@winehq.org on behalf of Nikolay Sivov nsivov@codeweavers.com Sent: Tuesday, 16 April 2019 1:19 AM To: wine-devel@winehq.org Subject: Re: [PATCH] include: Add IMFPMediaPlayer definition.
On 4/15/19 1:20 PM, Alistair Leslie-Hughes wrote:
Hi Nikolay,
On 15/4/19 3:35 pm, Nikolay Sivov wrote:
+cpp_quote("HRESULT WINAPI MFPCreateMediaPlayer(const WCHAR *url, BOOL start_playback, MFP_CREATION_OPTIONS options, ") +cpp_quote(" IMFPMediaPlayerCallback *callback, HWND hwnd, IMFPMediaPlayer **player);")
This need to have extern "C" around the function.
Like Jacek already said, widl will wrap everything in extern "C" block. That also reminded me, was https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fsource.win... necessary?
Now generated header has nested extern "C".
Regards
Alistair