mirror of
https://github.com/obsproject/obs-studio.git
synced 2026-09-24 23:31:36 +08:00
decklink: Update SDK to 12.0
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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__
|
||||
|
||||
|
||||
@@ -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 */
|
||||
|
||||
|
||||
@@ -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 */
|
||||
|
||||
|
||||
@@ -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 */
|
||||
|
||||
|
||||
Reference in New Issue
Block a user