include/mfobjects: Regenerate .h from .idl Signed-off-by: Liu Hao <lh_mouse@126.com>
diff --git a/mingw-w64-headers/include/mfobjects.h b/mingw-w64-headers/include/mfobjects.h index e77b626..01f13d0 100644 --- a/mingw-w64-headers/include/mfobjects.h +++ b/mingw-w64-headers/include/mfobjects.h
@@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 5.0-rc1 from include/mfobjects.idl - Do not edit ***/ +/*** Autogenerated by WIDL 4.19 from mfobjects.idl - Do not edit ***/ #ifdef _WIN32 #ifndef __REQUIRED_RPCNDR_H_VERSION__ @@ -210,6 +210,30 @@ #endif /* __cplusplus */ #endif +#ifndef __IMFMuxStreamAttributesManager_FWD_DEFINED__ +#define __IMFMuxStreamAttributesManager_FWD_DEFINED__ +typedef interface IMFMuxStreamAttributesManager IMFMuxStreamAttributesManager; +#ifdef __cplusplus +interface IMFMuxStreamAttributesManager; +#endif /* __cplusplus */ +#endif + +#ifndef __IMFMuxStreamMediaTypeManager_FWD_DEFINED__ +#define __IMFMuxStreamMediaTypeManager_FWD_DEFINED__ +typedef interface IMFMuxStreamMediaTypeManager IMFMuxStreamMediaTypeManager; +#ifdef __cplusplus +interface IMFMuxStreamMediaTypeManager; +#endif /* __cplusplus */ +#endif + +#ifndef __IMFMuxStreamSampleManager_FWD_DEFINED__ +#define __IMFMuxStreamSampleManager_FWD_DEFINED__ +typedef interface IMFMuxStreamSampleManager IMFMuxStreamSampleManager; +#ifdef __cplusplus +interface IMFMuxStreamSampleManager; +#endif /* __cplusplus */ +#endif + /* Headers for imported files */ #include <unknwn.h> @@ -2674,7 +2698,16 @@ MFVideoTransFunc_240M = 6, MFVideoTransFunc_sRGB = 7, MFVideoTransFunc_28 = 8, - MFVideoTransFunc_Last = 9, + MFVideoTransFunc_Log_100 = 9, + MFVideoTransFunc_Log_316 = 10, + MFVideoTransFunc_709_sym = 11, + MFVideoTransFunc_2020_const = 12, + MFVideoTransFunc_2020 = 13, + MFVideoTransFunc_26 = 14, + MFVideoTransFunc_2084 = 15, + MFVideoTransFunc_HLG = 16, + MFVideoTransFunc_10_rel = 17, + MFVideoTransFunc_Last = 18, MFVideoTransFunc_ForceDWORD = 0x7fffffff } MFVideoTransferFunction; @@ -2688,7 +2721,11 @@ MFVideoPrimaries_SMPTE240M = 6, MFVideoPrimaries_EBU3213 = 7, MFVideoPrimaries_SMPTE_C = 8, - MFVideoPrimaries_Last = 9, + MFVideoPrimaries_BT2020 = 9, + MFVideoPrimaries_XYZ = 10, + MFVideoPrimaries_DCI_P3 = 11, + MFVideoPrimaries_ACES = 12, + MFVideoPrimaries_Last = 13, MFVideoPrimaries_ForceDWORD = 0x7fffffff } MFVideoPrimaries; @@ -2734,7 +2771,8 @@ MFNominalRange_0_255 = 1, MFNominalRange_16_235 = 2, MFNominalRange_48_208 = 3, - MFNominalRange_Last = 4, + MFNominalRange_64_127 = 4, + MFNominalRange_Last = 5, MFNominalRange_ForceDWORD = 0x7fffffff } MFNominalRange; #endif @@ -3724,9 +3762,14 @@ METransformHaveOutput = 602, METransformDrainComplete = 603, METransformMarker = 604, + METransformInputStreamStateChanged = 605, MEByteStreamCharacteristicsChanged = 700, MEVideoCaptureDeviceRemoved = 800, MEVideoCaptureDevicePreempted = 801, + MEStreamSinkFormatInvalidated = 802, + MEEncodingParameters = 803, + MEContentProtectionMetadata = 900, + MEDeviceThermalStateChanged = 950, MEReservedMax = 10000 }; @@ -4845,7 +4888,8 @@ typedef enum __WIDL_mfobjects_generated_name_0000002D { MF_FILEFLAGS_NONE = 0x0, - MF_FILEFLAGS_NOBUFFERING = 0x1 + MF_FILEFLAGS_NOBUFFERING = 0x1, + MF_FILEFLAGS_ALLOW_WRITE_SHARING = 0x2 } MF_FILE_FLAGS; #endif @@ -5797,7 +5841,8 @@ typedef enum MF_PLUGIN_CONTROL_POLICY { MF_PLUGIN_CONTROL_POLICY_USE_ALL_PLUGINS = 0, MF_PLUGIN_CONTROL_POLICY_USE_APPROVED_PLUGINS = 1, - MF_PLUGIN_CONTROL_POLICY_USE_WEB_PLUGINS = 2 + MF_PLUGIN_CONTROL_POLICY_USE_WEB_PLUGINS = 2, + MF_PLUGIN_CONTROL_POLICY_USE_WEB_PLUGINS_EDGEMODE = 3 } MF_PLUGIN_CONTROL_POLICY; /***************************************************************************** @@ -6100,9 +6145,348 @@ #endif /* __IMFDXGIDeviceManager_INTERFACE_DEFINED__ */ + +typedef enum _MF_STREAM_STATE { + MF_STREAM_STATE_STOPPED = 0, + MF_STREAM_STATE_PAUSED = 1, + MF_STREAM_STATE_RUNNING = 2 +} MF_STREAM_STATE; #endif #endif +#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) +#if NTDDI_VERSION >= NTDDI_WIN10_RS2 + +/***************************************************************************** + * IMFMuxStreamAttributesManager interface + */ +#ifndef __IMFMuxStreamAttributesManager_INTERFACE_DEFINED__ +#define __IMFMuxStreamAttributesManager_INTERFACE_DEFINED__ + +DEFINE_GUID(IID_IMFMuxStreamAttributesManager, 0xce8bd576, 0xe440, 0x43b3, 0xbe,0x34, 0x1e,0x53,0xf5,0x65,0xf7,0xe8); +#if defined(__cplusplus) && !defined(CINTERFACE) +MIDL_INTERFACE("ce8bd576-e440-43b3-be34-1e53f565f7e8") +IMFMuxStreamAttributesManager : public IUnknown +{ + virtual HRESULT STDMETHODCALLTYPE GetStreamCount( + DWORD *pdwMuxStreamCount) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetAttributes( + DWORD dwMuxStreamIndex, + IMFAttributes **ppStreamAttributes) = 0; + +}; +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IMFMuxStreamAttributesManager, 0xce8bd576, 0xe440, 0x43b3, 0xbe,0x34, 0x1e,0x53,0xf5,0x65,0xf7,0xe8) +#endif +#else +typedef struct IMFMuxStreamAttributesManagerVtbl { + BEGIN_INTERFACE + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + IMFMuxStreamAttributesManager *This, + REFIID riid, + void **ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + IMFMuxStreamAttributesManager *This); + + ULONG (STDMETHODCALLTYPE *Release)( + IMFMuxStreamAttributesManager *This); + + /*** IMFMuxStreamAttributesManager methods ***/ + HRESULT (STDMETHODCALLTYPE *GetStreamCount)( + IMFMuxStreamAttributesManager *This, + DWORD *pdwMuxStreamCount); + + HRESULT (STDMETHODCALLTYPE *GetAttributes)( + IMFMuxStreamAttributesManager *This, + DWORD dwMuxStreamIndex, + IMFAttributes **ppStreamAttributes); + + END_INTERFACE +} IMFMuxStreamAttributesManagerVtbl; + +interface IMFMuxStreamAttributesManager { + CONST_VTBL IMFMuxStreamAttributesManagerVtbl* lpVtbl; +}; + +#ifdef COBJMACROS +#ifndef WIDL_C_INLINE_WRAPPERS +/*** IUnknown methods ***/ +#define IMFMuxStreamAttributesManager_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) +#define IMFMuxStreamAttributesManager_AddRef(This) (This)->lpVtbl->AddRef(This) +#define IMFMuxStreamAttributesManager_Release(This) (This)->lpVtbl->Release(This) +/*** IMFMuxStreamAttributesManager methods ***/ +#define IMFMuxStreamAttributesManager_GetStreamCount(This,pdwMuxStreamCount) (This)->lpVtbl->GetStreamCount(This,pdwMuxStreamCount) +#define IMFMuxStreamAttributesManager_GetAttributes(This,dwMuxStreamIndex,ppStreamAttributes) (This)->lpVtbl->GetAttributes(This,dwMuxStreamIndex,ppStreamAttributes) +#else +/*** IUnknown methods ***/ +static FORCEINLINE HRESULT IMFMuxStreamAttributesManager_QueryInterface(IMFMuxStreamAttributesManager* This,REFIID riid,void **ppvObject) { + return This->lpVtbl->QueryInterface(This,riid,ppvObject); +} +static FORCEINLINE ULONG IMFMuxStreamAttributesManager_AddRef(IMFMuxStreamAttributesManager* This) { + return This->lpVtbl->AddRef(This); +} +static FORCEINLINE ULONG IMFMuxStreamAttributesManager_Release(IMFMuxStreamAttributesManager* This) { + return This->lpVtbl->Release(This); +} +/*** IMFMuxStreamAttributesManager methods ***/ +static FORCEINLINE HRESULT IMFMuxStreamAttributesManager_GetStreamCount(IMFMuxStreamAttributesManager* This,DWORD *pdwMuxStreamCount) { + return This->lpVtbl->GetStreamCount(This,pdwMuxStreamCount); +} +static FORCEINLINE HRESULT IMFMuxStreamAttributesManager_GetAttributes(IMFMuxStreamAttributesManager* This,DWORD dwMuxStreamIndex,IMFAttributes **ppStreamAttributes) { + return This->lpVtbl->GetAttributes(This,dwMuxStreamIndex,ppStreamAttributes); +} +#endif +#endif + +#endif + + +#endif /* __IMFMuxStreamAttributesManager_INTERFACE_DEFINED__ */ + + +/***************************************************************************** + * IMFMuxStreamMediaTypeManager interface + */ +#ifndef __IMFMuxStreamMediaTypeManager_INTERFACE_DEFINED__ +#define __IMFMuxStreamMediaTypeManager_INTERFACE_DEFINED__ + +DEFINE_GUID(IID_IMFMuxStreamMediaTypeManager, 0x505a2c72, 0x42f7, 0x4690, 0xae,0xab, 0x8f,0x51,0x3d,0x0f,0xfd,0xb8); +#if defined(__cplusplus) && !defined(CINTERFACE) +MIDL_INTERFACE("505a2c72-42f7-4690-aeab-8f513d0ffdb8") +IMFMuxStreamMediaTypeManager : public IUnknown +{ + virtual HRESULT STDMETHODCALLTYPE GetStreamCount( + DWORD *pdwMuxStreamCount) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetMediaType( + DWORD dwMuxStreamIndex, + IMFMediaType **ppMediaType) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetStreamConfigurationCount( + DWORD *pdwCount) = 0; + + virtual HRESULT STDMETHODCALLTYPE AddStreamConfiguration( + ULONGLONG ullStreamMask) = 0; + + virtual HRESULT STDMETHODCALLTYPE RemoveStreamConfiguration( + ULONGLONG ullStreamMask) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetStreamConfiguration( + DWORD ulIndex, + ULONGLONG *pullStreamMask) = 0; + +}; +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IMFMuxStreamMediaTypeManager, 0x505a2c72, 0x42f7, 0x4690, 0xae,0xab, 0x8f,0x51,0x3d,0x0f,0xfd,0xb8) +#endif +#else +typedef struct IMFMuxStreamMediaTypeManagerVtbl { + BEGIN_INTERFACE + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + IMFMuxStreamMediaTypeManager *This, + REFIID riid, + void **ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + IMFMuxStreamMediaTypeManager *This); + + ULONG (STDMETHODCALLTYPE *Release)( + IMFMuxStreamMediaTypeManager *This); + + /*** IMFMuxStreamMediaTypeManager methods ***/ + HRESULT (STDMETHODCALLTYPE *GetStreamCount)( + IMFMuxStreamMediaTypeManager *This, + DWORD *pdwMuxStreamCount); + + HRESULT (STDMETHODCALLTYPE *GetMediaType)( + IMFMuxStreamMediaTypeManager *This, + DWORD dwMuxStreamIndex, + IMFMediaType **ppMediaType); + + HRESULT (STDMETHODCALLTYPE *GetStreamConfigurationCount)( + IMFMuxStreamMediaTypeManager *This, + DWORD *pdwCount); + + HRESULT (STDMETHODCALLTYPE *AddStreamConfiguration)( + IMFMuxStreamMediaTypeManager *This, + ULONGLONG ullStreamMask); + + HRESULT (STDMETHODCALLTYPE *RemoveStreamConfiguration)( + IMFMuxStreamMediaTypeManager *This, + ULONGLONG ullStreamMask); + + HRESULT (STDMETHODCALLTYPE *GetStreamConfiguration)( + IMFMuxStreamMediaTypeManager *This, + DWORD ulIndex, + ULONGLONG *pullStreamMask); + + END_INTERFACE +} IMFMuxStreamMediaTypeManagerVtbl; + +interface IMFMuxStreamMediaTypeManager { + CONST_VTBL IMFMuxStreamMediaTypeManagerVtbl* lpVtbl; +}; + +#ifdef COBJMACROS +#ifndef WIDL_C_INLINE_WRAPPERS +/*** IUnknown methods ***/ +#define IMFMuxStreamMediaTypeManager_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) +#define IMFMuxStreamMediaTypeManager_AddRef(This) (This)->lpVtbl->AddRef(This) +#define IMFMuxStreamMediaTypeManager_Release(This) (This)->lpVtbl->Release(This) +/*** IMFMuxStreamMediaTypeManager methods ***/ +#define IMFMuxStreamMediaTypeManager_GetStreamCount(This,pdwMuxStreamCount) (This)->lpVtbl->GetStreamCount(This,pdwMuxStreamCount) +#define IMFMuxStreamMediaTypeManager_GetMediaType(This,dwMuxStreamIndex,ppMediaType) (This)->lpVtbl->GetMediaType(This,dwMuxStreamIndex,ppMediaType) +#define IMFMuxStreamMediaTypeManager_GetStreamConfigurationCount(This,pdwCount) (This)->lpVtbl->GetStreamConfigurationCount(This,pdwCount) +#define IMFMuxStreamMediaTypeManager_AddStreamConfiguration(This,ullStreamMask) (This)->lpVtbl->AddStreamConfiguration(This,ullStreamMask) +#define IMFMuxStreamMediaTypeManager_RemoveStreamConfiguration(This,ullStreamMask) (This)->lpVtbl->RemoveStreamConfiguration(This,ullStreamMask) +#define IMFMuxStreamMediaTypeManager_GetStreamConfiguration(This,ulIndex,pullStreamMask) (This)->lpVtbl->GetStreamConfiguration(This,ulIndex,pullStreamMask) +#else +/*** IUnknown methods ***/ +static FORCEINLINE HRESULT IMFMuxStreamMediaTypeManager_QueryInterface(IMFMuxStreamMediaTypeManager* This,REFIID riid,void **ppvObject) { + return This->lpVtbl->QueryInterface(This,riid,ppvObject); +} +static FORCEINLINE ULONG IMFMuxStreamMediaTypeManager_AddRef(IMFMuxStreamMediaTypeManager* This) { + return This->lpVtbl->AddRef(This); +} +static FORCEINLINE ULONG IMFMuxStreamMediaTypeManager_Release(IMFMuxStreamMediaTypeManager* This) { + return This->lpVtbl->Release(This); +} +/*** IMFMuxStreamMediaTypeManager methods ***/ +static FORCEINLINE HRESULT IMFMuxStreamMediaTypeManager_GetStreamCount(IMFMuxStreamMediaTypeManager* This,DWORD *pdwMuxStreamCount) { + return This->lpVtbl->GetStreamCount(This,pdwMuxStreamCount); +} +static FORCEINLINE HRESULT IMFMuxStreamMediaTypeManager_GetMediaType(IMFMuxStreamMediaTypeManager* This,DWORD dwMuxStreamIndex,IMFMediaType **ppMediaType) { + return This->lpVtbl->GetMediaType(This,dwMuxStreamIndex,ppMediaType); +} +static FORCEINLINE HRESULT IMFMuxStreamMediaTypeManager_GetStreamConfigurationCount(IMFMuxStreamMediaTypeManager* This,DWORD *pdwCount) { + return This->lpVtbl->GetStreamConfigurationCount(This,pdwCount); +} +static FORCEINLINE HRESULT IMFMuxStreamMediaTypeManager_AddStreamConfiguration(IMFMuxStreamMediaTypeManager* This,ULONGLONG ullStreamMask) { + return This->lpVtbl->AddStreamConfiguration(This,ullStreamMask); +} +static FORCEINLINE HRESULT IMFMuxStreamMediaTypeManager_RemoveStreamConfiguration(IMFMuxStreamMediaTypeManager* This,ULONGLONG ullStreamMask) { + return This->lpVtbl->RemoveStreamConfiguration(This,ullStreamMask); +} +static FORCEINLINE HRESULT IMFMuxStreamMediaTypeManager_GetStreamConfiguration(IMFMuxStreamMediaTypeManager* This,DWORD ulIndex,ULONGLONG *pullStreamMask) { + return This->lpVtbl->GetStreamConfiguration(This,ulIndex,pullStreamMask); +} +#endif +#endif + +#endif + + +#endif /* __IMFMuxStreamMediaTypeManager_INTERFACE_DEFINED__ */ + + +/***************************************************************************** + * IMFMuxStreamSampleManager interface + */ +#ifndef __IMFMuxStreamSampleManager_INTERFACE_DEFINED__ +#define __IMFMuxStreamSampleManager_INTERFACE_DEFINED__ + +DEFINE_GUID(IID_IMFMuxStreamSampleManager, 0x74abbc19, 0xb1cc, 0x4e41, 0xbb,0x8b, 0x9d,0x9b,0x86,0xa8,0xf6,0xca); +#if defined(__cplusplus) && !defined(CINTERFACE) +MIDL_INTERFACE("74abbc19-b1cc-4e41-bb8b-9d9b86a8f6ca") +IMFMuxStreamSampleManager : public IUnknown +{ + virtual HRESULT STDMETHODCALLTYPE GetStreamCount( + DWORD *pdwMuxStreamCount) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetSample( + DWORD dwMuxStreamIndex, + IMFSample **ppSample) = 0; + + virtual ULONGLONG STDMETHODCALLTYPE GetStreamConfiguration( + ) = 0; + +}; +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IMFMuxStreamSampleManager, 0x74abbc19, 0xb1cc, 0x4e41, 0xbb,0x8b, 0x9d,0x9b,0x86,0xa8,0xf6,0xca) +#endif +#else +typedef struct IMFMuxStreamSampleManagerVtbl { + BEGIN_INTERFACE + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + IMFMuxStreamSampleManager *This, + REFIID riid, + void **ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + IMFMuxStreamSampleManager *This); + + ULONG (STDMETHODCALLTYPE *Release)( + IMFMuxStreamSampleManager *This); + + /*** IMFMuxStreamSampleManager methods ***/ + HRESULT (STDMETHODCALLTYPE *GetStreamCount)( + IMFMuxStreamSampleManager *This, + DWORD *pdwMuxStreamCount); + + HRESULT (STDMETHODCALLTYPE *GetSample)( + IMFMuxStreamSampleManager *This, + DWORD dwMuxStreamIndex, + IMFSample **ppSample); + + ULONGLONG (STDMETHODCALLTYPE *GetStreamConfiguration)( + IMFMuxStreamSampleManager *This); + + END_INTERFACE +} IMFMuxStreamSampleManagerVtbl; + +interface IMFMuxStreamSampleManager { + CONST_VTBL IMFMuxStreamSampleManagerVtbl* lpVtbl; +}; + +#ifdef COBJMACROS +#ifndef WIDL_C_INLINE_WRAPPERS +/*** IUnknown methods ***/ +#define IMFMuxStreamSampleManager_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) +#define IMFMuxStreamSampleManager_AddRef(This) (This)->lpVtbl->AddRef(This) +#define IMFMuxStreamSampleManager_Release(This) (This)->lpVtbl->Release(This) +/*** IMFMuxStreamSampleManager methods ***/ +#define IMFMuxStreamSampleManager_GetStreamCount(This,pdwMuxStreamCount) (This)->lpVtbl->GetStreamCount(This,pdwMuxStreamCount) +#define IMFMuxStreamSampleManager_GetSample(This,dwMuxStreamIndex,ppSample) (This)->lpVtbl->GetSample(This,dwMuxStreamIndex,ppSample) +#define IMFMuxStreamSampleManager_GetStreamConfiguration(This) (This)->lpVtbl->GetStreamConfiguration(This) +#else +/*** IUnknown methods ***/ +static FORCEINLINE HRESULT IMFMuxStreamSampleManager_QueryInterface(IMFMuxStreamSampleManager* This,REFIID riid,void **ppvObject) { + return This->lpVtbl->QueryInterface(This,riid,ppvObject); +} +static FORCEINLINE ULONG IMFMuxStreamSampleManager_AddRef(IMFMuxStreamSampleManager* This) { + return This->lpVtbl->AddRef(This); +} +static FORCEINLINE ULONG IMFMuxStreamSampleManager_Release(IMFMuxStreamSampleManager* This) { + return This->lpVtbl->Release(This); +} +/*** IMFMuxStreamSampleManager methods ***/ +static FORCEINLINE HRESULT IMFMuxStreamSampleManager_GetStreamCount(IMFMuxStreamSampleManager* This,DWORD *pdwMuxStreamCount) { + return This->lpVtbl->GetStreamCount(This,pdwMuxStreamCount); +} +static FORCEINLINE HRESULT IMFMuxStreamSampleManager_GetSample(IMFMuxStreamSampleManager* This,DWORD dwMuxStreamIndex,IMFSample **ppSample) { + return This->lpVtbl->GetSample(This,dwMuxStreamIndex,ppSample); +} +static FORCEINLINE ULONGLONG IMFMuxStreamSampleManager_GetStreamConfiguration(IMFMuxStreamSampleManager* This) { + return This->lpVtbl->GetStreamConfiguration(This); +} +#endif +#endif + +#endif + + +#endif /* __IMFMuxStreamSampleManager_INTERFACE_DEFINED__ */ + +#endif +#endif /* Begin additional prototypes for all interfaces */ ULONG __RPC_USER BSTR_UserSize (ULONG *, ULONG, BSTR *);