Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding Black Magic Design Decklink support to FFMPEG Preset #543

Open
wants to merge 19 commits into
base: master
Choose a base branch
from
+16,656 −0
Open

Adding Black Magic Design Decklink support to FFMPEG Preset #543

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
37452b9
Adding support for Decklink Devices from Black Magic Design.
masterav10 Mar 3, 2018
d0107fc
Enabling decklink support.
masterav10 Mar 3, 2018
454b645
Attempting to create static linking for avdevice.
masterav10 Mar 10, 2018
9f08b6a
Merge branch 'master' into ffmpeg-decklink
masterav10 Mar 10, 2018
3bb01ff
An additional patch to static link to libstdc++.
masterav10 Mar 11, 2018
369ade5
Decklink support for windows x86-64 if SDK is installed.
masterav10 Mar 17, 2018
2513186
Moved patching outside of conditional to ensure paths are correct.
masterav10 Mar 31, 2018
f873f3d
Merge branch 'master' into ffmpeg-decklink
masterav10 Mar 31, 2018
92c2676
Adding all of the decklink headers directly, based on licensing issues.
masterav10 Apr 5, 2018
38df7eb
Typo.
masterav10 Apr 5, 2018
be59cb4
Fixing a bug with the decklink implementation.
masterav10 Apr 25, 2018
7afcb3f
Prevent logging from generation too many threads.
masterav10 May 5, 2018
802905b
Removed unredistributable files.
masterav10 May 5, 2018
627ef3d
Removed unredistributable files.
masterav10 May 5, 2018
2de7e0d
Upgraded patches to support new ffmpeg version.
masterav10 May 7, 2018
e9aeb3b
Merge branch 'master' of https://github.com/bytedeco/javacpp-presets …
masterav10 Jun 6, 2018
d846d23
Detached thread was for testing, removing.
masterav10 Jun 6, 2018
da5083d
Combining patches using combinediff.
masterav10 Jun 8, 2018
a65d1cf
Did not commit the patch.
masterav10 Jun 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Adding support for Decklink Devices from Black Magic Design. 
This commit adds support for windows-x86_64, but plan to add support for all platforms.
@masterav10
masterav10 committed Mar 3, 2018
commit 37452b9495dc0b026dbb6d1bc6bca52bfb94fb10
23 changes: 23 additions & 0 deletions ffmpeg/LICENSE.DeckLinkAPI
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
Copyright (c) 2016 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.
10 changes: 8 additions & 2 deletions ffmpeg/cppbuild.sh
View file
Original file line number Diff line number Diff line change
@@ -8,12 +8,13 @@ if [[ -z "$PLATFORM" ]]; then
fi

DISABLE="--disable-iconv --disable-opencl --disable-sdl2 --disable-bzlib --disable-lzma --disable-linux-perf"
ENABLE="--enable-shared --enable-gpl --enable-version3 --enable-nonfree --enable-runtime-cpudetect --enable-zlib --enable-libmp3lame --enable-libspeex --enable-libopencore-amrnb --enable-libopencore-amrwb --enable-libvo-amrwbenc --enable-openssl --enable-libopenh264 --enable-libx264 --enable-libx265 --enable-libvpx --enable-libfreetype --enable-libopus"
ENABLE="--enable-shared --enable-gpl --enable-version3 --enable-nonfree --enable-runtime-cpudetect --enable-zlib --enable-libmp3lame --enable-libspeex --enable-libopencore-amrnb --enable-libopencore-amrwb --enable-libvo-amrwbenc --enable-openssl --enable-libopenh264 --enable-libx264 --enable-libx265 --enable-libvpx --enable-libfreetype --enable-libopus" "--enable-decklink"

# minimal configuration to support MPEG-4 streams with H.264 and AAC as well as Motion JPEG
# DISABLE="--disable-iconv --disable-libxcb --disable-opencl --disable-sdl2 --disable-bzlib --disable-lzma --disable-linux-perf --disable-everything"
# ENABLE="--enable-shared --enable-runtime-cpudetect --enable-libopenh264 --enable-encoder=libopenh264 --enable-encoder=aac --enable-encoder=mjpeg --enable-decoder=h264 --enable-decoder=aac --enable-decoder=mjpeg --enable-parser=h264 --enable-parser=aac --enable-parser=mjpeg --enable-muxer=mp4 --enable-muxer=rtsp --enable-muxer=mjpeg --enable-demuxer=mov --enable-demuxer=rtsp --enable-demuxer=mjpeg --enable-protocol=file --enable-protocol=http --enable-protocol=rtp --enable-protocol=rtmp"

BLACK_MAGIC=10.9.11
NASM_VERSION=2.13.03
ZLIB=zlib-1.2.11
LAME=lame-3.100
@@ -855,7 +856,12 @@ case $PLATFORM in
PKG_CONFIG_PATH="../lib/pkgconfig" ./configure --prefix=$INSTALL_PATH --disable-shared --enable-static --enable-fast-install --with-pic --host=x86_64-w64-mingw32 # CFLAGS="-m64" CXXFLAGS="-m64"
make -j $MAKEJ
make install
cd ../ffmpeg-$FFMPEG_VERSION
# https://github.com/jb-alvarado/media-autobuild_suite/wiki/Getting-Decklink-headers
cd /C/SDK/Blackmagic\ DeckLink\ SDK\ $BLACK_MAGIC/Win/include
widl -I/mingw64/x86_64-w64-mingw32/include -h -u DeckLinkAPI.idl
dos2unix DeckLinkAPI{,version}.h DeckLinkAPI_i.c
cp *.h *.c $INSTALL_PATH/include
cd $INSTALL_PATH/ffmpeg-$FFMPEG_VERSION
patch -Np1 < ../../../ffmpeg-windows.patch
PKG_CONFIG_PATH=../lib/pkgconfig/ ./configure --prefix=.. $DISABLE $ENABLE --enable-cuda --enable-cuvid --enable-nvenc --enable-libmfx --enable-w32threads --enable-indev=dshow --target-os=mingw32 --cc="gcc -m64" --extra-cflags="-I../include/" --extra-ldflags="-L../lib/" --extra-libs="-static-libgcc -static-libstdc++ -Wl,-Bstatic -lstdc++ -lgcc -lgcc_eh -lWs2_32 -lcrypt32 -lpthread -Wl,-Bdynamic"
make -j $MAKEJ