Mac Video Capture: Update third party Decklink Blackmagic SDK 10.3.1 …

…-> 10.4.1 This is used for Video Capture using BlackMagic cards. BUG=475839 Review URL: https://codereview.chromium.org/1217813010 Cr-Commit-Position: refs/heads/master@{#338074}
Denger-Network · Jul 9, 2015 · bfaeed5 · bfaeed5
1 parent 427c2f3
commit bfaeed5
Show file tree

Hide file tree

Showing 6 changed files with 139 additions and 8 deletions.
diff --git a/third_party/decklink/README.chromium b/third_party/decklink/README.chromium
@@ -1,6 +1,6 @@
 Name: Blackmagic DeckLink SDK - Mac
-URL: http://software.blackmagicdesign.com/SDK/Blackmagic_DeckLink_SDK_10.3.1.zip
-Version: 10.3.1
+URL: http://sw.blackmagicdesign.com/DeckLink/v10.4.1/Blackmagic_DeckLink_SDK_10.4.1.zip?Key-Pair-Id=APKAJTKA3ZJMJRQITVEA&Signature=glPMv1v8mTCDSoGfUV0yTF1qfDfFpFJsGsVv6YRYXlyIxWwB5vpLoaAOfY/Y8sPV8WcwYoLz/zlrsS32FsoF95x7uxm4yVNL0+mR/k7LJBgV0cAG43On7Z0id+SgoL0qvp90pVqP6RQI8d7yhKtobNuVQ2l0+JpUVYCKVK6RDSSBzPfgAXFrV4O+bgqg+AuiKdudOPnbbsxug31llYXBoSjGeCdy3b4XVMO7JWvDm/IMw1Td5Djz2xa2/AS57FiGLelHCsFscFbMRdyf6UW6RX5ptwTpZwrSiUFBsaG8VoVef5HLlkrZqrcgVHwFeU5bGrh2pxBd4SgrRFd8Ronjjg==&Expires=1435721097
+Version: 10.4.1
 License: BSL (v 1.0)
 License Android Compatible: yes
 License File: LICENSE
@@ -13,7 +13,7 @@ Design DeckLink product line. The SDK provides both low-level control of
 hardware and high-level interfaces to allow developers to easily perform common
 tasks.""
 The SHA-512 sum, for security reasons, as generated by shasum:
-6e64a43b03dd6832dce0439d9754b0acd47f409ef85b332a5b214197acfea74e5bfc71084d2f24dd67dd747fc40d167325d79334772019b9567d0c31a61b065d
+bcedec3b5bfade4daf4b41e5c153688431286cbc37ee3d3c3490bc075c904818ccbaf2737e551d64d873e2ee6804b5bacbc86061403681af1b0e3e7d714bca16
 
 Local Modifications:
 - The original library contains code for Linux, Windows and Mac. Here only the

diff --git a/third_party/decklink/mac/include/DeckLinkAPI.h b/third_party/decklink/mac/include/DeckLinkAPI.h
@@ -275,6 +275,15 @@ enum _BMDIdleVideoOutputOperation {
     bmdIdleVideoOutputDesktop                                    = 'desk'
 };
 
+/* Enum BMDLinkConfiguration - Video link configuration */
+
+typedef uint32_t BMDLinkConfiguration;
+enum _BMDLinkConfiguration {
+    bmdLinkConfigurationSingleLink                               = 'lcsl',
+    bmdLinkConfigurationDualLink                                 = 'lcdl',
+    bmdLinkConfigurationQuadLink                                 = 'lcql'
+};
+
 /* Enum BMDDeckLinkAttributeID - DeckLink Attribute ID */
 
 typedef uint32_t BMDDeckLinkAttributeID;
@@ -296,6 +305,10 @@ enum _BMDDeckLinkAttributeID {
     BMDDeckLinkSupportsClockTimingAdjustment                     = 'ctad',
     BMDDeckLinkSupportsFullDuplex                                = 'fdup',
     BMDDeckLinkSupportsFullFrameReferenceInputTimingOffset       = 'frin',
+    BMDDeckLinkSupportsSMPTELevelAOutput                         = 'lvla',
+    BMDDeckLinkSupportsDualLinkSDI                               = 'sdls',
+    BMDDeckLinkSupportsQuadLinkSDI                               = 'sqls',
+    BMDDeckLinkSupportsIdleOutput                                = 'idou',
 
     /* Integers */
 

diff --git a/third_party/decklink/mac/include/DeckLinkAPIConfiguration.h b/third_party/decklink/mac/include/DeckLinkAPIConfiguration.h
@@ -42,7 +42,7 @@
 
 // Interface ID Declarations
 
-BMD_CONST REFIID IID_IDeckLinkConfiguration                       = /* 1E69FCF6-4203-4936-8076-2A9F4CFD50CB */ {0x1E,0x69,0xFC,0xF6,0x42,0x03,0x49,0x36,0x80,0x76,0x2A,0x9F,0x4C,0xFD,0x50,0xCB};
+BMD_CONST REFIID IID_IDeckLinkConfiguration                       = /* CB71734A-FE37-4E8D-8E13-802133A1C3F2 */ {0xCB,0x71,0x73,0x4A,0xFE,0x37,0x4E,0x8D,0x8E,0x13,0x80,0x21,0x33,0xA1,0xC3,0xF2};
 
 /* Enum BMDDeckLinkConfigurationID - DeckLink Configuration ID */
 
@@ -72,9 +72,10 @@ enum _BMDDeckLinkConfigurationID {
     bmdDeckLinkConfigFieldFlickerRemoval                         = 'fdfr',
     bmdDeckLinkConfigHD1080p24ToHD1080i5994Conversion            = 'to59',
     bmdDeckLinkConfig444SDIVideoOutput                           = '444o',
-    bmdDeckLinkConfigSingleLinkVideoOutput                       = 'sglo',
     bmdDeckLinkConfigBlackVideoOutputDuringCapture               = 'bvoc',
     bmdDeckLinkConfigLowLatencyVideoOutput                       = 'llvo',
+    bmdDeckLinkConfigDownConversionOnAllAnalogOutput             = 'caao',
+    bmdDeckLinkConfigSMPTELevelAOutput                           = 'smta',
 
     /* Video Output Integers */
 
@@ -85,6 +86,7 @@ enum _BMDDeckLinkConfigurationID {
     bmdDeckLinkConfigVideoOutputIdleOperation                    = 'voio',
     bmdDeckLinkConfigDefaultVideoOutputMode                      = 'dvom',
     bmdDeckLinkConfigDefaultVideoOutputModeFlags                 = 'dvof',
+    bmdDeckLinkConfigSDIOutputLinkConfiguration                  = 'solc',
 
     /* Video Output Floats */
 
@@ -144,7 +146,16 @@ enum _BMDDeckLinkConfigurationID {
     bmdDeckLinkConfigAnalogAudioOutputScaleChannel2              = 'aos2',
     bmdDeckLinkConfigAnalogAudioOutputScaleChannel3              = 'aos3',
     bmdDeckLinkConfigAnalogAudioOutputScaleChannel4              = 'aos4',
-    bmdDeckLinkConfigDigitalAudioOutputScale                     = 'daos'
+    bmdDeckLinkConfigDigitalAudioOutputScale                     = 'daos',
+
+    /* Device Information Strings */
+
+    bmdDeckLinkConfigDeviceInformationLabel                      = 'dila',
+    bmdDeckLinkConfigDeviceInformationSerialNumber               = 'disn',
+    bmdDeckLinkConfigDeviceInformationCompany                    = 'dico',
+    bmdDeckLinkConfigDeviceInformationPhone                      = 'diph',
+    bmdDeckLinkConfigDeviceInformationEmail                      = 'diem',
+    bmdDeckLinkConfigDeviceInformationDate                       = 'dida'
 };
 
 // Forward Declarations

diff --git a/third_party/decklink/mac/include/DeckLinkAPIConfiguration_v10_4.h b/third_party/decklink/mac/include/DeckLinkAPIConfiguration_v10_4.h
@@ -0,0 +1,62 @@
+/* -LICENSE-START-
+** Copyright (c) 2015 Blackmagic Design
+**
+** Permission is hereby granted, free of charge, to any person or organization
+** obtaining a copy of the software and accompanying documentation covered by
+** this license (the "Software") to use, reproduce, display, distribute,
+** execute, and transmit the Software, and to prepare derivative works of the
+** Software, and to permit third-parties to whom the Software is furnished to
+** do so, all subject to the following:
+**
+** The copyright notices in the Software and this entire statement, including
+** the above license grant, this restriction and the following disclaimer,
+** must be included in all copies of the Software, in whole or in part, and
+** all derivative works of the Software, unless such copies or derivative
+** works are solely in the form of machine-executable object code generated by
+** a source language processor.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+** DEALINGS IN THE SOFTWARE.
+** -LICENSE-END-
+*/
+
+#ifndef BMD_DECKLINKAPICONFIGURATION_v10_4_H
+#define BMD_DECKLINKAPICONFIGURATION_v10_4_H
+
+#include "DeckLinkAPIConfiguration.h"
+
+// Interface ID Declarations
+
+BMD_CONST REFIID IID_IDeckLinkConfiguration_v10_4                       = /* 1E69FCF6-4203-4936-8076-2A9F4CFD50CB */ {0x1E,0x69,0xFC,0xF6,0x42,0x03,0x49,0x36,0x80,0x76,0x2A,0x9F,0x4C,0xFD,0x50,0xCB};
+
+//
+// Forward Declarations
+
+class IDeckLinkConfiguration_v10_4;
+
+/* Interface IDeckLinkConfiguration_v10_4 - DeckLink Configuration interface */
+
+class IDeckLinkConfiguration_v10_4 : public IUnknown
+{
+public:
+    virtual HRESULT SetFlag (/* in */ BMDDeckLinkConfigurationID cfgID, /* in */ bool value) = 0;
+    virtual HRESULT GetFlag (/* in */ BMDDeckLinkConfigurationID cfgID, /* out */ bool *value) = 0;
+    virtual HRESULT SetInt (/* in */ BMDDeckLinkConfigurationID cfgID, /* in */ int64_t value) = 0;
+    virtual HRESULT GetInt (/* in */ BMDDeckLinkConfigurationID cfgID, /* out */ int64_t *value) = 0;
+    virtual HRESULT SetFloat (/* in */ BMDDeckLinkConfigurationID cfgID, /* in */ double value) = 0;
+    virtual HRESULT GetFloat (/* in */ BMDDeckLinkConfigurationID cfgID, /* out */ double *value) = 0;
+    virtual HRESULT SetString (/* in */ BMDDeckLinkConfigurationID cfgID, /* in */ CFStringRef value) = 0;
+    virtual HRESULT GetString (/* in */ BMDDeckLinkConfigurationID cfgID, /* out */ CFStringRef *value) = 0;
+    virtual HRESULT WriteConfigurationToPreferences (void) = 0;
+
+protected:
+    virtual ~IDeckLinkConfiguration_v10_4 () {} // call Release method to drop reference count
+};
+
+
+#endif /* defined(BMD_DECKLINKAPICONFIGURATION_v10_4_H) */
diff --git a/third_party/decklink/mac/include/DeckLinkAPIVersion.h b/third_party/decklink/mac/include/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					0x0a040100
+#define BLACKMAGIC_DECKLINK_API_VERSION_STRING			"10.4.1"
 
 #endif	// __DeckLink_API_Version_h__
 
diff --git a/third_party/decklink/mac/include/DeckLinkAPI_v10_4.h b/third_party/decklink/mac/include/DeckLinkAPI_v10_4.h
@@ -0,0 +1,45 @@
+/* -LICENSE-START-
+** Copyright (c) 2015 Blackmagic Design
+**
+** Permission is hereby granted, free of charge, to any person or organization
+** obtaining a copy of the software and accompanying documentation covered by
+** this license (the "Software") to use, reproduce, display, distribute,
+** execute, and transmit the Software, and to prepare derivative works of the
+** Software, and to permit third-parties to whom the Software is furnished to
+** do so, all subject to the following:
+**
+** The copyright notices in the Software and this entire statement, including
+** the above license grant, this restriction and the following disclaimer,
+** must be included in all copies of the Software, in whole or in part, and
+** all derivative works of the Software, unless such copies or derivative
+** works are solely in the form of machine-executable object code generated by
+** a source language processor.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+** DEALINGS IN THE SOFTWARE.
+** -LICENSE-END-
+*/
+
+#ifndef BMD_DECKLINKAPI_v10_4_H
+#define BMD_DECKLINKAPI_v10_4_H
+
+#include "DeckLinkAPI.h"
+
+// Type Declarations
+
+/* Enum BMDDeckLinkConfigurationID - DeckLink Configuration ID */
+
+typedef uint32_t BMDDeckLinkConfigurationID_v10_4;
+enum _BMDDeckLinkConfigurationID_v10_4 {
+
+    /* Video output flags */
+
+    bmdDeckLinkConfigSingleLinkVideoOutput_v10_4                       = /* 'sglo' */ 0x73676C6F,
+};
+
+#endif /* defined(BMD_DECKLINKAPI_v10_4_H) */