[Bf-blender-cvs] [b64d76d] decklink: BGE DeckLink: Upgrade to Decklink version 10.4.
Benoit Bolsee
noreply at git.blender.org
Mon Apr 13 23:46:46 CEST 2015
Commit: b64d76d8a21512e1d9477c3515dba03f6fd10f99
Author: Benoit Bolsee
Date: Mon Apr 13 23:45:39 2015 +0200
Branches: decklink
https://developer.blender.org/rBb64d76d8a21512e1d9477c3515dba03f6fd10f99
BGE DeckLink: Upgrade to Decklink version 10.4.
===================================================================
M intern/decklink/DeckLinkAPI.h
M intern/decklink/win/DeckLinkAPI_h.h
M intern/decklink/win/DeckLinkAPI_i.c
M source/gameengine/VideoTexture/VideoDeckLink.cpp
===================================================================
diff --git a/intern/decklink/DeckLinkAPI.h b/intern/decklink/DeckLinkAPI.h
index 2208f39..5b60997 100644
--- a/intern/decklink/DeckLinkAPI.h
+++ b/intern/decklink/DeckLinkAPI.h
@@ -31,7 +31,7 @@
#ifdef WIN32
#include "win/DeckLinkAPI_h.h"
- typedef unsigned long dl_size_t;
+ typedef unsigned int dl_size_t;
#else
#include "linux/DeckLinkAPI.h"
/* Windows COM API uses BOOL, linux uses bool */
diff --git a/intern/decklink/win/DeckLinkAPI_h.h b/intern/decklink/win/DeckLinkAPI_h.h
index a4cb55b..1bd80b6 100644
--- a/intern/decklink/win/DeckLinkAPI_h.h
+++ b/intern/decklink/win/DeckLinkAPI_h.h
@@ -4,7 +4,7 @@
/* File created by MIDL compiler version 8.00.0603 */
-/* at Sat Mar 21 17:42:23 2015
+/* at Mon Apr 13 20:57:05 2015
*/
/* Compiler settings for ..\..\include\DeckLinkAPI.idl:
Oicf, W1, Zp8, env=Win64 (32b run), target_arch=AMD64 8.00.0603
@@ -32,8 +32,8 @@
#endif // __RPCNDR_H_VERSION__
-#ifndef __DeckLinkAPI_h__
-#define __DeckLinkAPI_h__
+#ifndef __DeckLinkAPI_h_h__
+#define __DeckLinkAPI_h_h__
#if defined(_MSC_VER) && (_MSC_VER >= 1020)
#pragma once
@@ -731,11 +731,11 @@ typedef LONGLONG BMDTimeValue;
typedef LONGLONG BMDTimeScale;
-typedef unsigned long BMDTimecodeBCD;
+typedef unsigned int BMDTimecodeBCD;
-typedef unsigned long BMDTimecodeUserBits;
+typedef unsigned int BMDTimecodeUserBits;
-typedef unsigned long BMDTimecodeFlags;
+typedef unsigned int BMDTimecodeFlags;
#if 0
typedef enum _BMDTimecodeFlags BMDTimecodeFlags;
@@ -769,7 +769,7 @@ enum _BMDAudioConnection
} BMDAudioConnection;
-typedef unsigned long BMDDisplayModeFlags;
+typedef unsigned int BMDDisplayModeFlags;
#if 0
typedef enum _BMDDisplayModeFlags BMDDisplayModeFlags;
@@ -869,6 +869,8 @@ enum _BMDDeckLinkConfigurationID
bmdDeckLinkConfigSingleLinkVideoOutput = 0x73676c6f,
bmdDeckLinkConfigBlackVideoOutputDuringCapture = 0x62766f63,
bmdDeckLinkConfigLowLatencyVideoOutput = 0x6c6c766f,
+ bmdDeckLinkConfigDownConversionOnAllAnalogOutput = 0x6361616f,
+ bmdDeckLinkConfigSMPTELevelAOutput = 0x736d7461,
bmdDeckLinkConfigVideoOutputConnection = 0x766f636e,
bmdDeckLinkConfigVideoOutputConversionMode = 0x766f636d,
bmdDeckLinkConfigAnalogVideoOutputFlags = 0x61766f66,
@@ -911,12 +913,18 @@ enum _BMDDeckLinkConfigurationID
bmdDeckLinkConfigAnalogAudioOutputScaleChannel2 = 0x616f7332,
bmdDeckLinkConfigAnalogAudioOutputScaleChannel3 = 0x616f7333,
bmdDeckLinkConfigAnalogAudioOutputScaleChannel4 = 0x616f7334,
- bmdDeckLinkConfigDigitalAudioOutputScale = 0x64616f73
+ bmdDeckLinkConfigDigitalAudioOutputScale = 0x64616f73,
+ bmdDeckLinkConfigDeviceInformationLabel = 0x64696c61,
+ bmdDeckLinkConfigDeviceInformationSerialNumber = 0x6469736e,
+ bmdDeckLinkConfigDeviceInformationCompany = 0x6469636f,
+ bmdDeckLinkConfigDeviceInformationPhone = 0x64697068,
+ bmdDeckLinkConfigDeviceInformationEmail = 0x6469656d,
+ bmdDeckLinkConfigDeviceInformationDate = 0x64696461
} BMDDeckLinkConfigurationID;
-typedef unsigned long BMDDeckControlStatusFlags;
-typedef unsigned long BMDDeckControlExportModeOpsFlags;
+typedef unsigned int BMDDeckControlStatusFlags;
+typedef unsigned int BMDDeckControlExportModeOpsFlags;
#if 0
typedef enum _BMDDeckControlStatusFlags BMDDeckControlStatusFlags;
@@ -1112,13 +1120,13 @@ enum _BMDStreamingEncodingModePropertyID
-typedef unsigned long BMDFrameFlags;
-typedef unsigned long BMDVideoInputFlags;
-typedef unsigned long BMDVideoInputFormatChangedEvents;
-typedef unsigned long BMDDetectedVideoInputFormatFlags;
-typedef unsigned long BMDDeckLinkCapturePassthroughMode;
-typedef unsigned long BMDAnalogVideoFlags;
-typedef unsigned long BMDDeviceBusyState;
+typedef unsigned int BMDFrameFlags;
+typedef unsigned int BMDVideoInputFlags;
+typedef unsigned int BMDVideoInputFormatChangedEvents;
+typedef unsigned int BMDDetectedVideoInputFormatFlags;
+typedef unsigned int BMDDeckLinkCapturePassthroughMode;
+typedef unsigned int BMDAnalogVideoFlags;
+typedef unsigned int BMDDeviceBusyState;
#if 0
typedef enum _BMDFrameFlags BMDFrameFlags;
@@ -1316,6 +1324,9 @@ enum _BMDDeckLinkAttributeID
BMDDeckLinkSupportsClockTimingAdjustment = 0x63746164,
BMDDeckLinkSupportsFullDuplex = 0x66647570,
BMDDeckLinkSupportsFullFrameReferenceInputTimingOffset = 0x6672696e,
+ BMDDeckLinkSupportsSMPTELevelAOutput = 0x6c766c61,
+ BMDDeckLinkSupportsDualLinkSDI = 0x73646c73,
+ BMDDeckLinkSupportsIdleOutput = 0x69646f75,
BMDDeckLinkMaximumAudioChannels = 0x6d616368,
BMDDeckLinkMaximumAnalogAudioChannels = 0x61616368,
BMDDeckLinkNumberOfSubDevices = 0x6e736264,
@@ -2086,7 +2097,7 @@ EXTERN_C const IID IID_IDeckLinkDeckControlStatusCallback;
virtual HRESULT STDMETHODCALLTYPE DeckControlStatusChanged(
/* [in] */ BMDDeckControlStatusFlags flags,
- /* [in] */ unsigned long mask) = 0;
+ /* [in] */ unsigned int mask) = 0;
};
@@ -2126,7 +2137,7 @@ EXTERN_C const IID IID_IDeckLinkDeckControlStatusCallback;
HRESULT ( STDMETHODCALLTYPE *DeckControlStatusChanged )(
IDeckLinkDeckControlStatusCallback * This,
/* [in] */ BMDDeckControlStatusFlags flags,
- /* [in] */ unsigned long mask);
+ /* [in] */ unsigned int mask);
END_INTERFACE
} IDeckLinkDeckControlStatusCallbackVtbl;
@@ -2208,10 +2219,10 @@ EXTERN_C const IID IID_IDeckLinkDeckControl;
virtual HRESULT STDMETHODCALLTYPE SendCommand(
/* [in] */ unsigned char *inBuffer,
- /* [in] */ unsigned long inBufferSize,
+ /* [in] */ unsigned int inBufferSize,
/* [out] */ unsigned char *outBuffer,
- /* [out] */ unsigned long *outDataSize,
- /* [in] */ unsigned long outBufferSize,
+ /* [out] */ unsigned int *outDataSize,
+ /* [in] */ unsigned int outBufferSize,
/* [out] */ BMDDeckControlError *error) = 0;
virtual HRESULT STDMETHODCALLTYPE Play(
@@ -2265,25 +2276,25 @@ EXTERN_C const IID IID_IDeckLinkDeckControl;
/* [out] */ BMDDeckControlError *error) = 0;
virtual HRESULT STDMETHODCALLTYPE SetPreroll(
- /* [in] */ unsigned long prerollSeconds) = 0;
+ /* [in] */ unsigned int prerollSeconds) = 0;
virtual HRESULT STDMETHODCALLTYPE GetPreroll(
- /* [out] */ unsigned long *prerollSeconds) = 0;
+ /* [out] */ unsigned int *prerollSeconds) = 0;
virtual HRESULT STDMETHODCALLTYPE SetExportOffset(
- /* [in] */ long exportOffsetFields) = 0;
+ /* [in] */ int exportOffsetFields) = 0;
virtual HRESULT STDMETHODCALLTYPE GetExportOffset(
- /* [out] */ long *exportOffsetFields) = 0;
+ /* [out] */ int *exportOffsetFields) = 0;
virtual HRESULT STDMETHODCALLTYPE GetManualExportOffset(
- /* [out] */ long *deckManualExportOffsetFields) = 0;
+ /* [out] */ int *deckManualExportOffsetFields) = 0;
virtual HRESULT STDMETHODCALLTYPE SetCaptureOffset(
- /* [in] */ long captureOffsetFields) = 0;
+ /* [in] */ int captureOffsetFields) = 0;
virtual HRESULT STDMETHODCALLTYPE GetCaptureOffset(
- /* [out] */ long *captureOffsetFields) = 0;
+ /* [out] */ int *captureOffsetFields) = 0;
virtual HRESULT STDMETHODCALLTYPE StartExport(
/* [in] */ BMDTimecodeBCD inTimecode,
@@ -2357,10 +2368,10 @@ EXTERN_C const IID IID_IDeckLinkDeckControl;
HRESULT ( STDMETHODCALLTYPE *SendCommand )(
IDeckLinkDeckControl * This,
/* [in] */ unsigned char *inBuffer,
- /* [in] */ unsigned long inBufferSize,
+ /* [in] */ unsigned int inBufferSize,
/* [out] */ unsigned char *outBuffer,
- /* [out] */ unsigned long *outDataSize,
- /* [in] */ unsigned long outBufferSize,
+ /* [out] */ unsigned int *outDataSize,
+ /* [in] */ unsigned int outBufferSize,
/* [out] */ BMDDeckControlError *error);
HRESULT ( STDMETHODCALLTYPE *Play )(
@@ -2429,31 +2440,31 @@ EXTERN_C const IID IID_IDeckLinkDeckControl;
HRESULT ( STDMETHODCALLTYPE *SetPreroll )(
IDeckLinkDeckControl * This,
- /* [in] */ unsigned long prerollSeconds);
+ /* [in] */ unsigned int prerollSeconds);
HRESULT ( STDMETHODCALLTYPE *GetPreroll )(
IDeckLinkDeckControl * This,
- /* [out] */ unsigned long *prerollSeconds);
+ /* [out] */ unsigned int *prerollSeconds);
HRESULT ( STDMETHODCALLTYPE *SetExportOffset )(
IDeckLinkDeckControl * This,
- /* [in] */ long exportOffsetFields);
+ /* [in] */ int exportOffsetFields);
HRESULT ( STDMETHODCALLTYPE *GetExportOffset )(
IDeckLinkDeckControl * This,
- /* [out] */ long *exportOffsetFields);
+ /* [out] */ int *exportOffsetFields);
HRESULT ( STDMETHODCALLTYPE *GetManualExportOffset )(
IDeckLinkDeckControl * This,
- /* [out] */ long *deckManualExportOffsetFields);
+ /* [out] */ int *deckManualExportOffsetFields);
HRESULT ( STDMETHODCALLTYPE *SetCaptureOffset )(
IDeckLinkDeckControl * This,
- /* [in] */ long captureOffsetFields);
+ /* [in] */ int captureOffsetFields);
HRESULT ( STDMETHODCALLTYPE *GetCaptureOffset )(
IDeckLinkDeckControl * This,
- /* [out] */ long *captureOffsetFields);
+ /* [out] */ int *captureOffsetFields);
HRESULT ( STDMETHODCALLTYPE *StartExport )(
IDeckLinkDeckControl * This,
@@ -3146,14 +3157,14 @@ EXTERN_C const IID IID_IBMDStreamingMutableV
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list