Commit 9c389165 authored by Rafaël Carré's avatar Rafaël Carré

Decklink output

parent 88ed3dba
...@@ -64,6 +64,7 @@ Audio Filters: ...@@ -64,6 +64,7 @@ Audio Filters:
* new VSXu visualization plugin * new VSXu visualization plugin
Video Outputs: Video Outputs:
* DecklinkOutput: New module using Blackmagic cards
* OpenGL: use glsl instead of ARB to do the YUV->RGB conversions * OpenGL: use glsl instead of ARB to do the YUV->RGB conversions
* Fix the power management issue on Windows for standby management * Fix the power management issue on Windows for standby management
......
...@@ -1764,7 +1764,7 @@ if test "${enable_decklink}" != "no" ...@@ -1764,7 +1764,7 @@ if test "${enable_decklink}" != "no"
then then
if test "${with_decklink_sdk}" != "no" -a -n "${with_decklink_sdk}" if test "${with_decklink_sdk}" != "no" -a -n "${with_decklink_sdk}"
then then
VLC_ADD_CXXFLAGS([decklink],[-I${with_decklink_sdk}/include]) VLC_ADD_CXXFLAGS([decklink decklinkoutput],[-I${with_decklink_sdk}/include])
fi fi
VLC_SAVE_FLAGS VLC_SAVE_FLAGS
CXXFLAGS="${CXXFLAGS} ${CXXFLAGS_decklink}" CXXFLAGS="${CXXFLAGS} ${CXXFLAGS_decklink}"
......
...@@ -85,6 +85,7 @@ $Id$ ...@@ -85,6 +85,7 @@ $Id$
* dc1394: IIDC (DCAM) FireWire input module * dc1394: IIDC (DCAM) FireWire input module
* ddummy: dummy decoder * ddummy: dummy decoder
* decklink: input module to read from a Blackmagic SDI card * decklink: input module to read from a Blackmagic SDI card
* decklinkoutput: output module to write to Blackmagic SDI card
* decomp: Decompression module * decomp: Decompression module
* deinterlace: naive deinterlacing filter * deinterlace: naive deinterlacing filter
* demux_cdg: Demuxer for CD-G files (Karaoke) * demux_cdg: Demuxer for CD-G files (Karaoke)
......
...@@ -10,6 +10,13 @@ SOURCES_vout_macosx = macosx.m opengl.h opengl.c ...@@ -10,6 +10,13 @@ SOURCES_vout_macosx = macosx.m opengl.h opengl.c
SOURCES_vout_ios = ios.m opengl.h opengl.c SOURCES_vout_ios = ios.m opengl.h opengl.c
SOURCES_android_surface = androidsurface.c SOURCES_android_surface = androidsurface.c
if HAVE_DECKLINK
libdecklinkoutput_plugin_la_SOURCES = decklink.cpp
libdecklinkoutput_plugin_la_CXXFLAGS = $(AM_CFLAGS) $(CXXFLAGS_decklinkoutput)
libdecklinkoutput_plugin_la_LIBADD = $(AM_LIBADD) $(LIBS_decklink) $(LIBDL)
libvlc_LTLIBRARIES += libdecklinkoutput_plugin.la
endif
### OpenGL ### ### OpenGL ###
# TODO: merge all three source files (?) # TODO: merge all three source files (?)
libgles2_plugin_la_SOURCES = opengl.c opengl.h gl.c libgles2_plugin_la_SOURCES = opengl.c opengl.h gl.c
......
This diff is collapsed.
...@@ -1141,6 +1141,7 @@ modules/video_filter/yuvp.c ...@@ -1141,6 +1141,7 @@ modules/video_filter/yuvp.c
modules/video_output/aa.c modules/video_output/aa.c
modules/video_output/androidsurface.c modules/video_output/androidsurface.c
modules/video_output/caca.c modules/video_output/caca.c
modules/video_output/decklink.cpp
modules/video_output/directfb.c modules/video_output/directfb.c
modules/video_output/drawable.c modules/video_output/drawable.c
modules/video_output/egl.c modules/video_output/egl.c
......
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