Commit 30f5abc3 authored by George Kiagiadakis's avatar George Kiagiadakis

ipcpipeline: move to sys/ and make it dependent on platform support for unix sockets

parent a2053380
......@@ -469,7 +469,6 @@ AG_GST_CHECK_PLUGIN(gdp)
AG_GST_CHECK_PLUGIN(id3tag)
AG_GST_CHECK_PLUGIN(inter)
AG_GST_CHECK_PLUGIN(interlace)
AG_GST_CHECK_PLUGIN(ipcpipeline)
AG_GST_CHECK_PLUGIN(ivfparse)
AG_GST_CHECK_PLUGIN(ivtc)
AG_GST_CHECK_PLUGIN(jp2kdecimator)
......@@ -1876,6 +1875,20 @@ AG_GST_CHECK_FEATURE(SHM, [POSIX shared memory source and sink], shm, [
fi
])
dnl check for unix sockets (ipcpipeline plugin)
translit(dnm, m, l) AM_CONDITIONAL(USE_IPCPIPELINE, true)
AG_GST_CHECK_FEATURE(IPCPIPELINE, [Unix sockets], ipcpipeline, [
if test "x$HAVE_SYS_SOCKET_H" = "xyes"; then
AC_CHECK_FUNC(pipe, [
AC_CHECK_FUNC(socketpair, [HAVE_IPCPIPELINE=yes], [HAVE_IPCPIPELINE=no])
], [
HAVE_IPCPIPELINE=no
])
else
HAVE_IPCPIPELINE=no
fi
])
dnl check for Video CD
translit(dnm, m, l) AM_CONDITIONAL(USE_VCD, true)
AG_GST_CHECK_FEATURE(VCD, [Video CD], vcdsrc, [
......@@ -3588,7 +3601,6 @@ gst/gdp/Makefile
gst/id3tag/Makefile
gst/inter/Makefile
gst/interlace/Makefile
gst/ipcpipeline/Makefile
gst/ivfparse/Makefile
gst/ivtc/Makefile
gst/jp2kdecimator/Makefile
......@@ -3663,6 +3675,7 @@ sys/dshowsrcwrapper/Makefile
sys/dshowvideosink/Makefile
sys/dvb/Makefile
sys/fbdev/Makefile
sys/ipcpipeline/Makefile
sys/kms/Makefile
sys/msdk/Makefile
sys/nvdec/Makefile
......
......@@ -27,7 +27,6 @@ subdir('geometrictransform')
subdir('id3tag')
subdir('inter')
subdir('interlace')
subdir('ipcpipeline')
subdir('ivfparse')
subdir('ivtc')
subdir('jp2kdecimator')
......
......@@ -58,6 +58,12 @@ else
FBDEV_DIR=
endif
if USE_IPCPIPELINE
IPCPIPELINE_DIR=ipcpipeline
else
IPCPIPELINE_DIR=
endif
if USE_KMS
KMS_DIR=kms
else
......@@ -130,9 +136,9 @@ else
MSDK_DIR=
endif
SUBDIRS = $(ACM_DIR) $(ANDROID_MEDIA_DIR) $(APPLE_MEDIA_DIR) $(BLUEZ_DIR) $(D3DVIDEOSINK_DIR) $(DECKLINK_DIR) $(DIRECTSOUND_DIR) $(WINKS_DIR) $(DVB_DIR) $(FBDEV_DIR) $(KMS_DIR) $(OPENSLES_DIR) $(SHM_DIR) $(UVCH264_DIR) $(VCD_DIR) $(VDPAU_DIR) $(WININET_DIR) $(WINSCREENCAP_DIR) $(WASAPI_DIR) $(NVDEC_DIR) $(NVENC_DIR) $(TINYALSA_DIR) $(MSDK_DIR)
SUBDIRS = $(ACM_DIR) $(ANDROID_MEDIA_DIR) $(APPLE_MEDIA_DIR) $(BLUEZ_DIR) $(D3DVIDEOSINK_DIR) $(DECKLINK_DIR) $(DIRECTSOUND_DIR) $(WINKS_DIR) $(DVB_DIR) $(FBDEV_DIR) $(IPCPIPELINE_DIR) $(KMS_DIR) $(OPENSLES_DIR) $(SHM_DIR) $(UVCH264_DIR) $(VCD_DIR) $(VDPAU_DIR) $(WININET_DIR) $(WINSCREENCAP_DIR) $(WASAPI_DIR) $(NVDEC_DIR) $(NVENC_DIR) $(TINYALSA_DIR) $(MSDK_DIR)
DIST_SUBDIRS = acmenc acmmp3dec androidmedia applemedia bluez d3dvideosink decklink directsound dvb fbdev kms dshowdecwrapper dshowsrcwrapper dshowvideosink \
DIST_SUBDIRS = acmenc acmmp3dec androidmedia applemedia bluez d3dvideosink decklink directsound dvb fbdev ipcpipeline kms dshowdecwrapper dshowsrcwrapper dshowvideosink \
opensles shm uvch264 vcd vdpau wasapi winks winscreencap \
nvdec nvenc tinyalsa msdk
......
......@@ -6,11 +6,15 @@ ipcpipeline_sources = [
'gstipcslavepipeline.c'
]
gstipcpipeline = library('gstipcpipeline',
ipcpipeline_sources,
c_args : gst_plugins_bad_args,
include_directories : [configinc],
dependencies : [gstbase_dep],
install : true,
install_dir : plugins_install_dir,
)
if cc.has_header ('sys/socket.h') and cc.has_function ('pipe') and cc.has_function ('socketpair')
gstipcpipeline = library('gstipcpipeline',
ipcpipeline_sources,
c_args : gst_plugins_bad_args,
include_directories : [configinc],
dependencies : [gstbase_dep],
install : true,
install_dir : plugins_install_dir,
)
endif
......@@ -12,6 +12,7 @@ subdir('directsound')
#subdir('dshowvideosink')
subdir('dvb')
subdir('fbdev')
subdir('ipcpipeline')
subdir('kms')
subdir('msdk')
#subdir('nvenc')
......
......@@ -198,6 +198,12 @@ else
check_shm=
endif
if USE_IPCPIPELINE
check_ipcpipeline=pipelines/ipcpipeline
else
check_ipcpipeline=
endif
if USE_GL
check_gl=libs/gstglcontext \
libs/gstglmemory \
......@@ -272,7 +278,7 @@ check_PROGRAMS = \
elements/rtponviftimestamp \
elements/id3mux \
pipelines/mxf \
pipelines/ipcpipeline \
$(check_ipcpipeline) \
libs/mpegvideoparser \
libs/mpegts \
libs/h264parser \
......
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