Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-27 17:10:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

[DXSDK] Sync axextend.idl with Wine Staging 3.3 (#2421)

Browse source 
Required by Wine's qcap.dll CORE-16350

[DXSDK] Restore all deleted code in axextend.idl to propely fix compilation
Also regularize some parts of added code and replace IAMStreamControl interface
with Wine's one, because otherwise compilation fails.
This commit is contained in:
Oleg Dubinskiy 2020-03-07 21:35:35 +02:00 committed by Hermès Bélusca-Maïto
parent a5d599505d
commit e9f5438eea
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
1 changed files with 143 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

180
sdk/include/dxsdk/axextend.idl
View file

@ -16,6 +16,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#if 0
#pragma makedep install
#endif
interface IAMAnalogVideoDecoder; interface IAMAnalogVideoDecoder;
interface IAMAnalogVideoEncoder; interface IAMAnalogVideoEncoder;
interface IAMAudioInputMixer; interface IAMAudioInputMixer;
@ -23,6 +27,7 @@ interface IAMAudioRendererStats;
interface IAMBufferNegotiation; interface IAMBufferNegotiation;
interface IAMCameraControl; interface IAMCameraControl;
interface IAMCertifiedOutputProtection; interface IAMCertifiedOutputProtection;
interface IAMClockSlave;
interface IAMCopyCaptureFileProgress; interface IAMCopyCaptureFileProgress;
interface IAMCrossbar; interface IAMCrossbar;
interface IAMDevMemoryAllocator; interface IAMDevMemoryAllocator;
@ -173,7 +178,7 @@ interface IFilterMapper : IUnknown
[in] CLSID clsInMaj, [in] CLSID clsInMaj,
[in] CLSID clsInSub, [in] CLSID clsInSub,
[in] BOOL bRender, [in] BOOL bRender,
[in] BOOL bOututNeeded, [in] BOOL bOutputNeeded,
[in] CLSID clsOutMaj, [in] CLSID clsOutMaj,
[in] CLSID clsOutSub [in] CLSID clsOutSub
); );
@ -798,6 +803,18 @@ interface IConfigInterleaving : IUnknown
[out] REFERENCE_TIME *prtPreroll); [out] REFERENCE_TIME *prtPreroll);
} }
[
local,
object,
uuid(4d5466b0-a49c-11d1-abe8-00a0c905f375),
pointer_default(unique)
]
interface IAMClockAdjust : IUnknown
{
HRESULT SetClockDelta([in] REFERENCE_TIME rtDelta);
};
[ [
local, local,
object, object,
@ -926,23 +943,6 @@ interface IDistributorNotify : IUnknown
HRESULT NotifyGraphChange(void); HRESULT NotifyGraphChange(void);
} }
typedef enum
{
AM_STREAM_INFO_START_DEFINED = 0x01,
AM_STREAM_INFO_STOP_DEFINED = 0x02,
AM_STREAM_INFO_DISCARDING = 0x04,
AM_STREAM_INFO_STOP_SEND_EXTRA = 0x10
} AM_STREAM_INFO_FLAGS;
typedef struct
{
REFERENCE_TIME tStart;
REFERENCE_TIME tStop;
DWORD dwStartCookie;
DWORD dwStopCookie;
DWORD dwFlags;
}AM_STREAM_INFO;
/***************************************************************************** /*****************************************************************************
* IAMStreamConfig interface * IAMStreamConfig interface
@ -954,6 +954,43 @@ typedef struct
] ]
interface IAMStreamConfig : IUnknown interface IAMStreamConfig : IUnknown
{ {
typedef struct _VIDEO_STREAM_CONFIG_CAPS {
GUID guid;
ULONG VideoStandard;
SIZE InputSize;
SIZE MinCroppingSize;
SIZE MaxCroppingSize;
int CropGranularityX;
int CropGranularityY;
int CropAlignX;
int CropAlignY;
SIZE MinOutputSize;
SIZE MaxOutputSize;
int OutputGranularityX;
int OutputGranularityY;
int StretchTapsX;
int StretchTapsY;
int ShrinkTapsX;
int ShrinkTapsY;
LONGLONG MinFrameInterval;
LONGLONG MaxFrameInterval;
LONG MinBitsPerSecond;
LONG MaxBitsPerSecond;
} VIDEO_STREAM_CONFIG_CAPS;
typedef struct _AUDIO_STREAM_CONFIG_CAPS {
GUID guid;
ULONG MinimumChannels;
ULONG MaximumChannels;
ULONG ChannelsGranularity;
ULONG MinimumBitsPerSample;
ULONG MaximumBitsPerSample;
ULONG BitsPerSampleGranularity;
ULONG MinimumSampleFrequency;
ULONG MaximumSampleFrequency;
ULONG SampleFrequencyGranularity;
} AUDIO_STREAM_CONFIG_CAPS;
HRESULT SetFormat( [in] AM_MEDIA_TYPE *pmt); HRESULT SetFormat( [in] AM_MEDIA_TYPE *pmt);
HRESULT GetFormat( [in] AM_MEDIA_TYPE **pmt); HRESULT GetFormat( [in] AM_MEDIA_TYPE **pmt);
HRESULT GetNumberOfCapabilities( [out] int *piCount, [out] int *piSize); HRESULT GetNumberOfCapabilities( [out] int *piCount, [out] int *piSize);
@ -1148,6 +1185,45 @@ interface IKsPropertySet : IUnknown
} }
cpp_quote("#endif /* _IKsPropertySet_ */") cpp_quote("#endif /* _IKsPropertySet_ */")
[
local,
object,
uuid(6025a880-c0d5-11d0-bd4e-00a0c911ce86),
pointer_default(unique)
]
interface IMediaPropertyBag : IPropertyBag
{
typedef IMediaPropertyBag *LPMEDIAPROPERTYBAG;
HRESULT EnumProperty(
[in] ULONG iProperty,
[in, out] VARIANT *pvarPropertyName,
[in, out] VARIANT *pvarPropertyValue);
}
[
local,
object,
uuid(5738e040-b67f-11d0-bd4d-00a0c911ce86),
pointer_default(unique)
]
interface IPersistMediaPropertyBag : IPersist
{
HRESULT InitNew(void);
HRESULT Load(
[in] IMediaPropertyBag *pPropBag,
[in] IErrorLog *pErrorLog);
HRESULT Save(
[in] IMediaPropertyBag *pPropBag,
[in] BOOL fClearDirty,
[in] BOOL fSaveAllProperties);
typedef IPersistMediaPropertyBag *LPPERSISTMEDIAPROPERTYBAG;
}
[ [
object, object,
uuid(36b73883-c2c8-11cf-8b46-00805f6cef60), uuid(36b73883-c2c8-11cf-8b46-00805f6cef60),
@ -1158,19 +1234,6 @@ interface ISeekingPassThru : IUnknown
HRESULT Init( [in] BOOL bSupportRendering, [in] IPin *pPin); HRESULT Init( [in] BOOL bSupportRendering, [in] IPin *pPin);
} }
[
local,
object,
uuid(4d5466b0-a49c-11d1-abe8-00a0c905f375),
pointer_default(unique)
]
interface IAMClockAdjust : IUnknown
{
HRESULT SetClockDelta([in] REFERENCE_TIME rtDelta);
};
enum _AM_FILTER_MISC_FLAGS enum _AM_FILTER_MISC_FLAGS
{ {
AM_FILTER_MISC_FLAGS_IS_RENDERER = 0x1, AM_FILTER_MISC_FLAGS_IS_RENDERER = 0x1,
@ -1219,21 +1282,64 @@ interface IAMBufferNegotiation : IUnknown
} }
[
local,
object,
uuid(d8d715a0-6e5e-11d0-b3f0-00aa003761c5),
pointer_default(unique)
]
interface IAMVfwCaptureDialogs : IUnknown
{
HRESULT HasDialog(
[in] int dialog);
HRESULT ShowDialog(
[in] int dialog,
[in] HWND hwnd);
HRESULT SendDriverMessage(
[in] int dialog,
[in] int msg,
[in] long data1,
[in] long data2);
}
#include <axextendenums.h> #include <axextendenums.h>
typedef enum
{
AM_STREAM_INFO_START_DEFINED = 0x01,
AM_STREAM_INFO_STOP_DEFINED = 0x02,
AM_STREAM_INFO_DISCARDING = 0x04,
AM_STREAM_INFO_STOP_SEND_EXTRA = 0x10
} AM_STREAM_INFO_FLAGS;
typedef struct
{
REFERENCE_TIME tStart;
REFERENCE_TIME tStop;
DWORD dwStartCookie;
DWORD dwStopCookie;
DWORD dwFlags;
}AM_STREAM_INFO;
[ [
local,
object, object,
uuid(36b73881-c2c8-11cf-8b46-00805f6cef60), uuid(36b73881-c2c8-11cf-8b46-00805f6cef60),
pointer_default(unique) pointer_default(unique)
] ]
interface IAMStreamControl : IUnknown interface IAMStreamControl : IUnknown
{ {
HRESULT StartAt( [in] REFERENCE_TIME * ptStart, HRESULT StartAt(
[in] DWORD dwCookie ); [in] const REFERENCE_TIME *ptStart,
HRESULT StopAt( [in] REFERENCE_TIME * ptStop, [in] DWORD dwCookie);
[in] BOOL bSendExtra,
[in] DWORD dwCookie ); HRESULT StopAt(
HRESULT GetInfo( [out] AM_STREAM_INFO *pInfo); [in] const REFERENCE_TIME *ptStop,
[in] BOOL bSendExtra,
[in] DWORD dwCookie);
HRESULT GetInfo(
[out] AM_STREAM_INFO *pInfo);
} }
typedef enum tagTVAudioMode typedef enum tagTVAudioMode