[Bf-blender-cvs] [c507e15] decklink: BGE Decklink: upgrade to Desktop Video 10.4

[Benoit Bolsee]

Commit: c507e157c421753f7d4ff34acf8d102391bc1043
Author: Benoit Bolsee
Date:   Thu Apr 16 17:28:42 2015 +0200
Branches: decklink
https://developer.blender.org/rBc507e157c421753f7d4ff34acf8d102391bc1043

BGE Decklink: upgrade to Desktop Video 10.4

===================================================================

M	intern/decklink/linux/DeckLinkAPI.h
M	intern/decklink/linux/DeckLinkAPIConfiguration.h
M	intern/decklink/linux/DeckLinkAPIVersion.h

===================================================================

diff --git a/intern/decklink/linux/DeckLinkAPI.h b/intern/decklink/linux/DeckLinkAPI.h
index 91a1b85..08bfba3 100644
--- a/intern/decklink/linux/DeckLinkAPI.h
+++ b/intern/decklink/linux/DeckLinkAPI.h
@@ -292,6 +292,9 @@ enum _BMDDeckLinkAttributeID {
     BMDDeckLinkSupportsClockTimingAdjustment                     = /* 'ctad' */ 0x63746164,
     BMDDeckLinkSupportsFullDuplex                                = /* 'fdup' */ 0x66647570,
     BMDDeckLinkSupportsFullFrameReferenceInputTimingOffset       = /* 'frin' */ 0x6672696E,
+    BMDDeckLinkSupportsSMPTELevelAOutput                         = /* 'lvla' */ 0x6C766C61,
+    BMDDeckLinkSupportsDualLinkSDI                               = /* 'sdls' */ 0x73646C73,
+    BMDDeckLinkSupportsIdleOutput                                = /* 'idou' */ 0x69646F75,
 
     /* Integers */
 
@@ -756,8 +759,7 @@ extern "C" {
     IDeckLinkAPIInformation* CreateDeckLinkAPIInformationInstance (void);
     IDeckLinkGLScreenPreviewHelper* CreateOpenGLScreenPreviewHelper (void);
     IDeckLinkVideoConversion* CreateVideoConversionInstance (void);
-	bool IsDeckLinkAPIPresent (void);
-
+    bool IsDeckLinkAPIPresent (void);
 }
 
 
diff --git a/intern/decklink/linux/DeckLinkAPIConfiguration.h b/intern/decklink/linux/DeckLinkAPIConfiguration.h
index def498c..9d5bc9a 100644
--- a/intern/decklink/linux/DeckLinkAPIConfiguration.h
+++ b/intern/decklink/linux/DeckLinkAPIConfiguration.h
@@ -75,6 +75,8 @@ enum _BMDDeckLinkConfigurationID {
     bmdDeckLinkConfigSingleLinkVideoOutput                       = /* 'sglo' */ 0x73676C6F,
     bmdDeckLinkConfigBlackVideoOutputDuringCapture               = /* 'bvoc' */ 0x62766F63,
     bmdDeckLinkConfigLowLatencyVideoOutput                       = /* 'llvo' */ 0x6C6C766F,
+    bmdDeckLinkConfigDownConversionOnAllAnalogOutput             = /* 'caao' */ 0x6361616F,
+    bmdDeckLinkConfigSMPTELevelAOutput                           = /* 'smta' */ 0x736D7461,
 
     /* Video Output Integers */
 
@@ -144,7 +146,16 @@ enum _BMDDeckLinkConfigurationID {
     bmdDeckLinkConfigAnalogAudioOutputScaleChannel2              = /* 'aos2' */ 0x616F7332,
     bmdDeckLinkConfigAnalogAudioOutputScaleChannel3              = /* 'aos3' */ 0x616F7333,
     bmdDeckLinkConfigAnalogAudioOutputScaleChannel4              = /* 'aos4' */ 0x616F7334,
-    bmdDeckLinkConfigDigitalAudioOutputScale                     = /* 'daos' */ 0x64616F73
+    bmdDeckLinkConfigDigitalAudioOutputScale                     = /* 'daos' */ 0x64616F73,
+
+    /* Device Information Strings */
+
+    bmdDeckLinkConfigDeviceInformationLabel                      = /* 'dila' */ 0x64696C61,
+    bmdDeckLinkConfigDeviceInformationSerialNumber               = /* 'disn' */ 0x6469736E,
+    bmdDeckLinkConfigDeviceInformationCompany                    = /* 'dico' */ 0x6469636F,
+    bmdDeckLinkConfigDeviceInformationPhone                      = /* 'diph' */ 0x64697068,
+    bmdDeckLinkConfigDeviceInformationEmail                      = /* 'diem' */ 0x6469656D,
+    bmdDeckLinkConfigDeviceInformationDate                       = /* 'dida' */ 0x64696461
 };
 
 // Forward Declarations
diff --git a/intern/decklink/linux/DeckLinkAPIVersion.h b/intern/decklink/linux/DeckLinkAPIVersion.h
index 4e41492..cfcc701 100644
--- a/intern/decklink/linux/DeckLinkAPIVersion.h
+++ b/intern/decklink/linux/DeckLinkAPIVersion.h
@@ -30,8 +30,8 @@
 #ifndef __DeckLink_API_Version_h__
 #define __DeckLink_API_Version_h__
 
-#define BLACKMAGIC_DECKLINK_API_VERSION					0x0a030100
-#define BLACKMAGIC_DECKLINK_API_VERSION_STRING			"10.3.1"
+#define BLACKMAGIC_DECKLINK_API_VERSION					0x0a040000
+#define BLACKMAGIC_DECKLINK_API_VERSION_STRING			"10.4"
 
 #endif	// __DeckLink_API_Version_h__