From 9d9975c3b2840bf945e7e6dde9315583d493a6a7 Mon Sep 17 00:00:00 2001 From: Nikolay Sivov Date: Fri, 19 Jun 2020 16:36:28 +0300 Subject: [PATCH] mfplat: Add EVR activator attributes to tracing. Signed-off-by: Nikolay Sivov Signed-off-by: Alexandre Julliard --- dlls/mfplat/main.c | 7 +++++++ include/mfidl.idl | 16 ++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index ea6a0659c5c..6cd409d63b7 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -1646,12 +1646,18 @@ const char *debugstr_attr(const GUID *guid) X(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_AUDCAP_SYMBOLIC_LINK), X(MF_MEDIA_ENGINE_BROWSER_COMPATIBILITY_MODE_IE11), X(MF_MT_USER_DATA), + X(MF_ACTIVATE_CUSTOM_VIDEO_MIXER_CLSID), X(MF_MT_MIN_MASTERING_LUMINANCE), + X(MF_ACTIVATE_CUSTOM_VIDEO_MIXER_ACTIVATE), + X(MF_ACTIVATE_CUSTOM_VIDEO_MIXER_FLAGS), + X(MF_ACTIVATE_CUSTOM_VIDEO_PRESENTER_CLSID), X(MF_EVENT_STREAM_METADATA_SYSTEMID), + X(MF_ACTIVATE_CUSTOM_VIDEO_PRESENTER_ACTIVATE), X(MF_MT_AUDIO_CHANNEL_MASK), X(MF_SOURCE_READER_DISCONNECT_MEDIASOURCE_ON_SHUTDOWN), X(MF_READWRITE_DISABLE_CONVERTERS), X(MF_MEDIA_ENGINE_BROWSER_COMPATIBILITY_MODE_IE_EDGE), + X(MF_ACTIVATE_CUSTOM_VIDEO_PRESENTER_FLAGS), X(MF_MT_MINIMUM_DISPLAY_APERTURE), X(MFSampleExtension_Token), X(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_CATEGORY), @@ -1806,6 +1812,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_MEDIA_ENGINE_COREWINDOW), X(MF_SOURCE_READER_DISABLE_CAMERA_PLUGINS), X(MF_MT_MPEG4_TRACK_TYPE), + X(MF_ACTIVATE_VIDEO_WINDOW), X(MF_MT_PAN_SCAN_APERTURE), X(MF_TOPOLOGY_RESOLUTION_STATUS), X(MF_MT_ORIGINAL_4CC), diff --git a/include/mfidl.idl b/include/mfidl.idl index 2955d0d2f3b..912e62ca350 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -1027,6 +1027,16 @@ interface IMFAudioPolicy : IUnknown HRESULT GetIconPath([out] LPWSTR *path); } +enum +{ + MF_ACTIVATE_CUSTOM_MIXER_ALLOWFAIL = 0x00000001, +}; + +enum +{ + MF_ACTIVATE_CUSTOM_PRESENTER_ALLOWFAIL = 0x00000001, +}; + cpp_quote("#ifdef __cplusplus") cpp_quote("static inline HRESULT MFSetAttributeSize(IMFAttributes *attributes, REFGUID key, UINT32 width, UINT32 height)") cpp_quote("{") @@ -1152,5 +1162,11 @@ cpp_quote("EXTERN_GUID(MF_AUDIO_RENDERER_ATTRIBUTE_ENDPOINT_ROLE, 0x6ba644ff, 0x cpp_quote("EXTERN_GUID(MF_AUDIO_RENDERER_ATTRIBUTE_STREAM_CATEGORY, 0xa9770471, 0x92ec, 0x4df4, 0x94, 0xfe, 0x81, 0xc3, 0x6f, 0x0c, 0x3a, 0x7a);") cpp_quote("EXTERN_GUID(MF_ACTIVATE_VIDEO_WINDOW, 0x9a2dbbdd, 0xf57e, 0x4162, 0x82, 0xb9, 0x68, 0x31, 0x37, 0x76, 0x82, 0xd3);") +cpp_quote("EXTERN_GUID(MF_ACTIVATE_CUSTOM_VIDEO_MIXER_CLSID, 0xba491360, 0xbe50, 0x451e, 0x95, 0xab, 0x6d, 0x4a, 0xcc, 0xc7, 0xda, 0xd8);") +cpp_quote("EXTERN_GUID(MF_ACTIVATE_CUSTOM_VIDEO_MIXER_ACTIVATE, 0xba491361, 0xbe50, 0x451e, 0x95, 0xab, 0x6d, 0x4a, 0xcc, 0xc7, 0xda, 0xd8);") +cpp_quote("EXTERN_GUID(MF_ACTIVATE_CUSTOM_VIDEO_MIXER_FLAGS, 0xba491362, 0xbe50, 0x451e, 0x95, 0xab, 0x6d, 0x4a, 0xcc, 0xc7, 0xda, 0xd8);") +cpp_quote("EXTERN_GUID(MF_ACTIVATE_CUSTOM_VIDEO_PRESENTER_CLSID, 0xba491364, 0xbe50, 0x451e, 0x95, 0xab, 0x6d, 0x4a, 0xcc, 0xc7, 0xda, 0xd8);") +cpp_quote("EXTERN_GUID(MF_ACTIVATE_CUSTOM_VIDEO_PRESENTER_ACTIVATE, 0xba491365, 0xbe50, 0x451e, 0x95, 0xab, 0x6d, 0x4a, 0xcc, 0xc7, 0xda, 0xd8);") +cpp_quote("EXTERN_GUID(MF_ACTIVATE_CUSTOM_VIDEO_PRESENTER_FLAGS, 0xba491366, 0xbe50, 0x451e, 0x95, 0xab, 0x6d, 0x4a, 0xcc, 0xc7, 0xda, 0xd8);") cpp_quote("EXTERN_GUID(CLSID_VideoProcessorMFT, 0x88753b26, 0x5b24, 0x49bd, 0xb2, 0xe7, 0xc, 0x44, 0x5c, 0x78, 0xc9, 0x82);")