decklink: Update SDK to 12.0

plugins/decklink/linux/decklink-sdk/DeckLinkAPI.h

@@ -1,5 +1,5 @@
 /* -LICENSE-START-
-** Copyright (c) 2020 Blackmagic Design
+** Copyright (c) 2021 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

plugins/decklink/linux/decklink-sdk/DeckLinkAPIConfiguration.h

@@ -1,5 +1,5 @@
 /* -LICENSE-START-
-** Copyright (c) 2020 Blackmagic Design
+** Copyright (c) 2021 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

plugins/decklink/linux/decklink-sdk/DeckLinkAPIDeckControl.h

@@ -1,5 +1,5 @@
 /* -LICENSE-START-
-** Copyright (c) 2020 Blackmagic Design
+** Copyright (c) 2021 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

plugins/decklink/linux/decklink-sdk/DeckLinkAPIDiscovery.h

@@ -1,5 +1,5 @@
 /* -LICENSE-START-
-** Copyright (c) 2020 Blackmagic Design
+** Copyright (c) 2021 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

plugins/decklink/linux/decklink-sdk/DeckLinkAPIModes.h

@@ -1,5 +1,5 @@
 /* -LICENSE-START-
-** Copyright (c) 2020 Blackmagic Design
+** Copyright (c) 2021 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

plugins/decklink/linux/decklink-sdk/DeckLinkAPITypes.h

@@ -1,5 +1,5 @@
 /* -LICENSE-START-
-** Copyright (c) 2020 Blackmagic Design
+** Copyright (c) 2021 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

plugins/decklink/linux/decklink-sdk/DeckLinkAPIVersion.h

@@ -30,8 +30,8 @@
 #ifndef __DeckLink_API_Version_h__
 #define __DeckLink_API_Version_h__
 
-#define BLACKMAGIC_DECKLINK_API_VERSION					0x0b060000
-#define BLACKMAGIC_DECKLINK_API_VERSION_STRING			"11.6"
+#define BLACKMAGIC_DECKLINK_API_VERSION					0x0c000000
+#define BLACKMAGIC_DECKLINK_API_VERSION_STRING			"12.0"
 
 #endif	// __DeckLink_API_Version_h__
 

plugins/decklink/linux/decklink-sdk/DeckLinkAPIVideoInput_v10_11.h

@@ -30,6 +30,7 @@
 
 #include "DeckLinkAPI.h"
 #include "DeckLinkAPI_v10_11.h"
+#include "DeckLinkAPIVideoInput_v11_5_1.h"
 
 // Type Declarations
 BMD_CONST REFIID IID_IDeckLinkInput_v10_11                               = /* AF22762B-DFAC-4846-AA79-FA8883560995 */ {0xAF,0x22,0x76,0x2B,0xDF,0xAC,0x48,0x46,0xAA,0x79,0xFA,0x88,0x83,0x56,0x09,0x95};
@@ -63,7 +64,7 @@ public:
     virtual HRESULT StopStreams (void) = 0;
     virtual HRESULT PauseStreams (void) = 0;
     virtual HRESULT FlushStreams (void) = 0;
-    virtual HRESULT SetCallback (/* in */ IDeckLinkInputCallback *theCallback) = 0;
+    virtual HRESULT SetCallback (/* in */ IDeckLinkInputCallback_v11_5_1 *theCallback) = 0;
 
     /* Hardware Timing */
 

plugins/decklink/linux/decklink-sdk/DeckLinkAPIVideoInput_v11_4.h

@@ -29,6 +29,7 @@
 #define BMD_DECKLINKAPIVIDEOINPUT_v11_4_H
 
 #include "DeckLinkAPI.h"
+#include "DeckLinkAPIVideoInput_v11_5_1.h"
 
 // Type Declarations
 BMD_CONST REFIID IID_IDeckLinkInput_v11_4                               = /* 2A88CF76-F494-4216-A7EF-DC74EEB83882 */ { 0x2A,0x88,0xCF,0x76,0xF4,0x94,0x42,0x16,0xA7,0xEF,0xDC,0x74,0xEE,0xB8,0x38,0x82 };
@@ -62,7 +63,7 @@ public:
     virtual HRESULT StopStreams (void) = 0;
     virtual HRESULT PauseStreams (void) = 0;
     virtual HRESULT FlushStreams (void) = 0;
-    virtual HRESULT SetCallback (/* in */ IDeckLinkInputCallback* theCallback) = 0;
+    virtual HRESULT SetCallback (/* in */ IDeckLinkInputCallback_v11_5_1* theCallback) = 0;
 
     /* Hardware Timing */
 

plugins/decklink/linux/decklink-sdk/DeckLinkAPI_v9_2.h

@@ -30,6 +30,7 @@
 
 #include "DeckLinkAPI.h"
 #include "DeckLinkAPI_v10_11.h"
+#include "DeckLinkAPIVideoInput_v11_5_1.h"
 
 
 // Interface ID Declarations
@@ -67,7 +68,7 @@ public:
     virtual HRESULT StopStreams (void) = 0;
     virtual HRESULT PauseStreams (void) = 0;
     virtual HRESULT FlushStreams (void) = 0;
-    virtual HRESULT SetCallback (/* in */ IDeckLinkInputCallback *theCallback) = 0;
+    virtual HRESULT SetCallback (/* in */ IDeckLinkInputCallback_v11_5_1 *theCallback) = 0;
 
     /* Hardware Timing */
 

plugins/decklink/mac/decklink-sdk/DeckLinkAPI.h

@@ -1,5 +1,5 @@
 /* -LICENSE-START-
-** Copyright (c) 2020 Blackmagic Design
+** Copyright (c) 2021 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

plugins/decklink/mac/decklink-sdk/DeckLinkAPIConfiguration.h

@@ -1,5 +1,5 @@
 /* -LICENSE-START-
-** Copyright (c) 2020 Blackmagic Design
+** Copyright (c) 2021 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

plugins/decklink/mac/decklink-sdk/DeckLinkAPIDeckControl.h

@@ -1,5 +1,5 @@
 /* -LICENSE-START-
-** Copyright (c) 2020 Blackmagic Design
+** Copyright (c) 2021 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

plugins/decklink/mac/decklink-sdk/DeckLinkAPIDiscovery.h

@@ -1,5 +1,5 @@
 /* -LICENSE-START-
-** Copyright (c) 2020 Blackmagic Design
+** Copyright (c) 2021 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

plugins/decklink/mac/decklink-sdk/DeckLinkAPIModes.h

@@ -1,5 +1,5 @@
 /* -LICENSE-START-
-** Copyright (c) 2020 Blackmagic Design
+** Copyright (c) 2021 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

plugins/decklink/mac/decklink-sdk/DeckLinkAPIStreaming.h

@@ -1,5 +1,5 @@
 /* -LICENSE-START-
-** Copyright (c) 2020 Blackmagic Design
+** Copyright (c) 2021 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

plugins/decklink/mac/decklink-sdk/DeckLinkAPITypes.h

@@ -1,5 +1,5 @@
 /* -LICENSE-START-
-** Copyright (c) 2020 Blackmagic Design
+** Copyright (c) 2021 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

plugins/decklink/mac/decklink-sdk/DeckLinkAPIVersion.h

@@ -30,8 +30,8 @@
 #ifndef __DeckLink_API_Version_h__
 #define __DeckLink_API_Version_h__
 
-#define BLACKMAGIC_DECKLINK_API_VERSION					0x0b060000
-#define BLACKMAGIC_DECKLINK_API_VERSION_STRING			"11.6"
+#define BLACKMAGIC_DECKLINK_API_VERSION					0x0c000000
+#define BLACKMAGIC_DECKLINK_API_VERSION_STRING			"12.0"
 
 #endif	// __DeckLink_API_Version_h__
 

plugins/decklink/mac/decklink-sdk/DeckLinkAPIVideoInput_v10_11.h

@@ -30,6 +30,7 @@
 
 #include "DeckLinkAPI.h"
 #include "DeckLinkAPI_v10_11.h"
+#include "DeckLinkAPIVideoInput_v11_5_1.h"
 
 // Type Declarations
 
@@ -64,7 +65,7 @@ public:
     virtual HRESULT StopStreams (void) = 0;
     virtual HRESULT PauseStreams (void) = 0;
     virtual HRESULT FlushStreams (void) = 0;
-    virtual HRESULT SetCallback (/* in */ IDeckLinkInputCallback *theCallback) = 0;
+    virtual HRESULT SetCallback (/* in */ IDeckLinkInputCallback_v11_5_1 *theCallback) = 0;
 
     /* Hardware Timing */
 

plugins/decklink/mac/decklink-sdk/DeckLinkAPIVideoInput_v11_4.h

@@ -29,6 +29,7 @@
 #define BMD_DECKLINKAPIVIDEOINPUT_v11_4_H
 
 #include "DeckLinkAPI.h"
+#include "DeckLinkAPIVideoInput_v11_5_1.h"
 
 // Type Declarations
 
@@ -63,7 +64,7 @@ public:
     virtual HRESULT StopStreams (void) = 0;
     virtual HRESULT PauseStreams (void) = 0;
     virtual HRESULT FlushStreams (void) = 0;
-    virtual HRESULT SetCallback (/* in */ IDeckLinkInputCallback* theCallback) = 0;
+    virtual HRESULT SetCallback (/* in */ IDeckLinkInputCallback_v11_5_1* theCallback) = 0;
 
     /* Hardware Timing */
 

plugins/decklink/mac/decklink-sdk/DeckLinkAPI_v9_2.h

@@ -30,6 +30,7 @@
 
 #include "DeckLinkAPI.h"
 #include "DeckLinkAPI_v10_11.h"
+#include "DeckLinkAPIVideoInput_v11_5_1.h"
 
 
 // Interface ID Declarations
@@ -67,7 +68,7 @@ public:
     virtual HRESULT StopStreams (void) = 0;
     virtual HRESULT PauseStreams (void) = 0;
     virtual HRESULT FlushStreams (void) = 0;
-    virtual HRESULT SetCallback (/* in */ IDeckLinkInputCallback *theCallback) = 0;
+    virtual HRESULT SetCallback (/* in */ IDeckLinkInputCallback_v11_5_1 *theCallback) = 0;
 
     /* Hardware Timing */
 

plugins/decklink/win/decklink-sdk/DeckLinkAPI.idl

@@ -1,5 +1,5 @@
 /* -LICENSE-START-
-** Copyright (c) 2020 Blackmagic Design
+** Copyright (c) 2021 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
@@ -1305,17 +1305,18 @@ importlib("stdole2.tlb");
 };
 
 // import deprecated interfaces
-#include "DeckLinkAPI_v11_4.idl"
-#include "DeckLinkAPI_v10_11.idl"
+
 #include "DeckLinkAPI_v11_5_1.idl"
-#include "DeckLinkAPI_v11_5.idl"
+#include "DeckLinkAPI_v10_11.idl"
 #include "DeckLinkAPI_v10_9.idl"
 #include "DeckLinkAPIStreaming_v10_8.idl"
+#include "DeckLinkAPI_v10_4.idl"
+#include "DeckLinkAPI_v10_2.idl"
+#include "DeckLinkAPI_v11_5.idl"
+#include "DeckLinkAPI_v11_4.idl"
 #include "DeckLinkAPI_v10_8.idl"
 #include "DeckLinkAPI_v10_6.idl"
 #include "DeckLinkAPI_v10_5.idl"
-#include "DeckLinkAPI_v10_4.idl"
-#include "DeckLinkAPI_v10_2.idl"
 #include "DeckLinkAPI_v9_9.idl"
 #include "DeckLinkAPI_v9_2.idl"
 #include "DeckLinkAPI_v8_1.idl"

plugins/decklink/win/decklink-sdk/DeckLinkAPIConfiguration.idl

@@ -1,5 +1,5 @@
 /* -LICENSE-START-
-** Copyright (c) 2020 Blackmagic Design
+** Copyright (c) 2021 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

plugins/decklink/win/decklink-sdk/DeckLinkAPIDeckControl.idl

@@ -1,5 +1,5 @@
 /* -LICENSE-START-
-** Copyright (c) 2020 Blackmagic Design
+** Copyright (c) 2021 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

plugins/decklink/win/decklink-sdk/DeckLinkAPIDiscovery.idl

@@ -1,5 +1,5 @@
 /* -LICENSE-START-
-** Copyright (c) 2020 Blackmagic Design
+** Copyright (c) 2021 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

plugins/decklink/win/decklink-sdk/DeckLinkAPIModes.idl

@@ -1,5 +1,5 @@
 /* -LICENSE-START-
-** Copyright (c) 2020 Blackmagic Design
+** Copyright (c) 2021 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

plugins/decklink/win/decklink-sdk/DeckLinkAPIStreaming.idl

@@ -1,5 +1,5 @@
 /* -LICENSE-START-
-** Copyright (c) 2020 Blackmagic Design
+** Copyright (c) 2021 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

plugins/decklink/win/decklink-sdk/DeckLinkAPITypes.idl

@@ -1,5 +1,5 @@
 /* -LICENSE-START-
-** Copyright (c) 2020 Blackmagic Design
+** Copyright (c) 2021 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

plugins/decklink/win/decklink-sdk/DeckLinkAPIVersion.h

@@ -30,8 +30,8 @@
 #ifndef __DeckLink_API_Version_h__
 #define __DeckLink_API_Version_h__
 
-#define BLACKMAGIC_DECKLINK_API_VERSION					0x0b060000
-#define BLACKMAGIC_DECKLINK_API_VERSION_STRING			"11.6"
+#define BLACKMAGIC_DECKLINK_API_VERSION					0x0c000000
+#define BLACKMAGIC_DECKLINK_API_VERSION_STRING			"12.0"
 
 #endif	// __DeckLink_API_Version_h__
 

plugins/decklink/win/decklink-sdk/DeckLinkAPI_v10_11.idl

@@ -213,7 +213,7 @@ interface IDeckLinkNotification_v10_11;
     HRESULT StopStreams(void);
     HRESULT PauseStreams(void);
     HRESULT FlushStreams(void);
-    HRESULT SetCallback([in] IDeckLinkInputCallback *theCallback);
+    HRESULT SetCallback([in] IDeckLinkInputCallback_v11_5_1 *theCallback);
 
     /* Hardware Timing */
 

plugins/decklink/win/decklink-sdk/DeckLinkAPI_v11_4.idl

@@ -112,7 +112,7 @@
     HRESULT StopStreams (void);
     HRESULT PauseStreams (void);
     HRESULT FlushStreams (void);
-    HRESULT SetCallback ([in] IDeckLinkInputCallback* theCallback);
+    HRESULT SetCallback ([in] IDeckLinkInputCallback_v11_5_1* theCallback);
 
     /* Hardware Timing */
 

plugins/decklink/win/decklink-sdk/DeckLinkAPI_v11_5_1.idl

@@ -87,4 +87,5 @@ typedef [v1_enum] enum	_BMDDeckLinkStatusID_v11_5_1 {
     /* Hardware Timing */
 
     HRESULT GetHardwareReferenceClock ([in] BMDTimeScale desiredTimeScale, [out] BMDTimeValue* hardwareTime, [out] BMDTimeValue* timeInFrame, [out] BMDTimeValue* ticksPerFrame);
-};
+};
+

plugins/decklink/win/decklink-sdk/DeckLinkAPI_v9_2.idl

@@ -59,7 +59,7 @@
     HRESULT StopStreams(void);
     HRESULT PauseStreams(void);
     HRESULT FlushStreams(void);
-    HRESULT SetCallback([in] IDeckLinkInputCallback *theCallback);
+    HRESULT SetCallback([in] IDeckLinkInputCallback_v11_5_1 *theCallback);
 
     /* Hardware Timing */