Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
S
stitchEm
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Franco (nextime) Lanza
stitchEm
Commits
48877a9f
Commit
48877a9f
authored
5 years ago
by
Jeremy Tellaa
Committed by
jeremad
5 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(decklink): use newer decklink SDK
parent
3409dd1d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
CMakeLists.txt
IO/src/decklink/CMakeLists.txt
+1
-1
decklink_writer.cpp
IO/src/decklink/src/decklink_writer.cpp
+1
-1
BUILD.md
doc/BUILD.md
+1
-1
No files found.
IO/src/decklink/CMakeLists.txt
View file @
48877a9f
...
...
@@ -7,7 +7,7 @@ set(PLUGIN_NAME decklink)
add_custom_command
(
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
...
...
This diff is collapsed.
Click to expand it.
IO/src/decklink/src/decklink_writer.cpp
View file @
48877a9f
...
...
@@ -109,7 +109,7 @@ DeckLinkWriter* DeckLinkWriter::create(const Ptv::Value* config, const std::stri
}
std
::
shared_ptr
<
IDeckLinkConfiguration
>
configuration
(
tempConfiguration
,
VideoStitch
::
DeckLink
::
getDefaultDeleter
());
configuration
->
SetFlag
(
bmdDeckLinkConfig
Use1080pNotPsF
,
tru
e
);
configuration
->
SetFlag
(
bmdDeckLinkConfig
Capture1080pAsPsF
,
fals
e
);
// Retrieve the configuration for duplex mode, could be different from the previous configuration object
// We need it before to enable video output
...
...
This diff is collapsed.
Click to expand it.
doc/BUILD.md
View file @
48877a9f
...
...
@@ -96,7 +96,7 @@ Then installs all of this:
*
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
[
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
)
clone the repo and create a directory next to it, and configure with cmake:
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment