Skip to content

S
stitchEm
Commit 48877a9f authored by Jeremy Tellaa's avatar Jeremy Tellaa Committed by jeremad
Browse files
Options

fix(decklink): use newer decklink SDK

parent 3409dd1d
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
IO/src/decklink/CMakeLists.txt
View file @ 48877a9f
...@@ -7,7 +7,7 @@ set(PLUGIN_NAME decklink) ...@@ -7,7 +7,7 @@ set(PLUGIN_NAME decklink)
add_custom_command( add_custom_command(
OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/include/DeckLinkAPI_h.h" "${CMAKE_CURRENT_SOURCE_DIR}/DeckLinkAPI_i.c" OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/include/DeckLinkAPI_h.h" "${CMAKE_CURRENT_SOURCE_DIR}/DeckLinkAPI_i.c"
COMMAND midl.exe /D _DEBUG /W1 /nologo /char signed /env x64 /iid ${CMAKE_CURRENT_SOURCE_DIR}/DeckLinkAPI_i.c /h "${DECKLINK_PATH}/DeckLinkAPI_h.h" /tlb "${VS_VAHANA_PLUGIN_DIR}/decklink.tlb" "${DECKLINK_PATH}\\DeckLinkAPI.idl" COMMAND midl.exe /D _DEBUG /W1 /nologo /char signed /env x64 /iid ${CMAKE_CURRENT_SOURCE_DIR}/DeckLinkAPI_i.c /h "${CMAKE_CURRENT_SOURCE_DIR}/DeckLinkAPI_h.h" /tlb "${VS_VAHANA_PLUGIN_DIR}/decklink.tlb" "${DECKLINK_PATH}\\DeckLinkAPI.idl"
) )
set(SOURCE_FILES set(SOURCE_FILES
......
IO/src/decklink/src/decklink_writer.cpp
View file @ 48877a9f
...@@ -109,7 +109,7 @@ DeckLinkWriter* DeckLinkWriter::create(const Ptv::Value* config, const std::stri ...@@ -109,7 +109,7 @@ DeckLinkWriter* DeckLinkWriter::create(const Ptv::Value* config, const std::stri
} }
std::shared_ptr<IDeckLinkConfiguration> configuration(tempConfiguration, std::shared_ptr<IDeckLinkConfiguration> configuration(tempConfiguration,
VideoStitch::DeckLink::getDefaultDeleter()); VideoStitch::DeckLink::getDefaultDeleter());
configuration->SetFlag(bmdDeckLinkConfigUse1080pNotPsF, true); configuration->SetFlag(bmdDeckLinkConfigCapture1080pAsPsF, false);
// Retrieve the configuration for duplex mode, could be different from the previous configuration object // Retrieve the configuration for duplex mode, could be different from the previous configuration object
// We need it before to enable video output // We need it before to enable video output
......
doc/BUILD.md
View file @ 48877a9f
...@@ -96,7 +96,7 @@ Then installs all of this: ...@@ -96,7 +96,7 @@ Then installs all of this:
* install manually [Intel SDK 2017](https://software.intel.com/en-us/media-sdk) * install manually [Intel SDK 2017](https://software.intel.com/en-us/media-sdk)
* install manually [Magewell SDK](http://www.magewell.com/files/sdk/Magewell_Capture_SDK_3.3.1.1004.zip) * install manually [Magewell SDK](http://www.magewell.com/files/sdk/Magewell_Capture_SDK_3.3.1.1004.zip)
* install manually [Oculus SDK (1.4.0)](https://developer.oculus.com/downloads/package/oculus-sdk-for-windows/1.4.0) * install manually [Oculus SDK (1.4.0)](https://developer.oculus.com/downloads/package/oculus-sdk-for-windows/1.4.0)
* install manually [Decklink SDK](https://www.blackmagicdesign.com/developer/product/capture-and-playback) * install manually [Decklink SDK](https://www.blackmagicdesign.com/developer/product/capture-and-playback) v10.9.12
* install manually [XIMEA SDK](https://www.ximea.com/support/documents/4) * install manually [XIMEA SDK](https://www.ximea.com/support/documents/4)
clone the repo and create a directory next to it, and configure with cmake: clone the repo and create a directory next to it, and configure with cmake:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment