From d2d6798087e7c82e948aac1c373380bc7ee1451f Mon Sep 17 00:00:00 2001 From: Alessandro Decina Date: Tue, 19 Mar 2013 10:47:25 +0100 Subject: [PATCH] Make the hls plugin depend on gnutls and move to ext/hls/ gnutls is used to implement AES decryption --- Makefile.am | 1 + configure.ac | 9 +++++++-- ext/Makefile.am | 9 ++++++++- {gst => ext}/hls/Makefile.am | 4 ++-- {gst => ext}/hls/gstfragment.c | 0 {gst => ext}/hls/gstfragment.h | 0 {gst => ext}/hls/gstfragmented.h | 0 {gst => ext}/hls/gstfragmentedplugin.c | 0 {gst => ext}/hls/gsthlsdemux.c | 0 {gst => ext}/hls/gsthlsdemux.h | 0 {gst => ext}/hls/gsthlssink.c | 0 {gst => ext}/hls/gsthlssink.h | 0 {gst => ext}/hls/gstm3u8playlist.c | 0 {gst => ext}/hls/gstm3u8playlist.h | 0 {gst => ext}/hls/gsturidownloader.c | 0 {gst => ext}/hls/gsturidownloader.h | 0 {gst => ext}/hls/m3u8.c | 0 {gst => ext}/hls/m3u8.h | 0 18 files changed, 18 insertions(+), 5 deletions(-) rename {gst => ext}/hls/Makefile.am (93%) rename {gst => ext}/hls/gstfragment.c (100%) rename {gst => ext}/hls/gstfragment.h (100%) rename {gst => ext}/hls/gstfragmented.h (100%) rename {gst => ext}/hls/gstfragmentedplugin.c (100%) rename {gst => ext}/hls/gsthlsdemux.c (100%) rename {gst => ext}/hls/gsthlsdemux.h (100%) rename {gst => ext}/hls/gsthlssink.c (100%) rename {gst => ext}/hls/gsthlssink.h (100%) rename {gst => ext}/hls/gstm3u8playlist.c (100%) rename {gst => ext}/hls/gstm3u8playlist.h (100%) rename {gst => ext}/hls/gsturidownloader.c (100%) rename {gst => ext}/hls/gsturidownloader.h (100%) rename {gst => ext}/hls/m3u8.c (100%) rename {gst => ext}/hls/m3u8.h (100%) diff --git a/Makefile.am b/Makefile.am index 63487e167e..8184f22e6e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -83,6 +83,7 @@ CRUFT_DIRS = \ $(top_srcdir)/gst/aacparse \ $(top_srcdir)/gst/amrparse \ $(top_srcdir)/gst/flacparse \ + $(top_srcdir)/gst/hls \ $(top_srcdir)/gst/imagefreeze \ $(top_srcdir)/gst/invtelecine \ $(top_srcdir)/gst/mpeg4videoparse \ diff --git a/configure.ac b/configure.ac index 62cfc88635..b79a335fdb 100644 --- a/configure.ac +++ b/configure.ac @@ -357,7 +357,6 @@ AG_GST_CHECK_PLUGIN(gaudieffects) AG_GST_CHECK_PLUGIN(geometrictransform) AG_GST_CHECK_PLUGIN(gdp) AG_GST_CHECK_PLUGIN(hdvparse) -AG_GST_CHECK_PLUGIN(hls) AG_GST_CHECK_PLUGIN(id3tag) AG_GST_CHECK_PLUGIN(inter) AG_GST_CHECK_PLUGIN(interlace) @@ -2124,6 +2123,12 @@ AG_GST_CHECK_FEATURE(SNDIO, [sndio audio], sndio, [ fi ]) +dnl *** hls *** +translit(dnm, m, l) AM_CONDITIONAL(USE_HLS, true) +AG_GST_CHECK_FEATURE(HLS, [http live streaming plugin], hls, [ + AG_GST_PKG_CHECK_MODULES(GNUTLS, gnutls) +]) + else dnl not building plugins with external dependencies, @@ -2303,7 +2308,6 @@ gst/gaudieffects/Makefile gst/geometrictransform/Makefile gst/gdp/Makefile gst/hdvparse/Makefile -gst/hls/Makefile gst/id3tag/Makefile gst/inter/Makefile gst/interlace/Makefile @@ -2413,6 +2417,7 @@ ext/faac/Makefile ext/faad/Makefile ext/flite/Makefile ext/gsm/Makefile +ext/hls/Makefile ext/kate/Makefile ext/ladspa/Makefile ext/lv2/Makefile diff --git a/ext/Makefile.am b/ext/Makefile.am index c9c5f96e99..57ec38e51e 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -360,6 +360,12 @@ else RTMP_DIR = endif +if USE_HLS +HLS_DIR = hls +else +HLS_DIR = +endif + SUBDIRS=\ $(VOAACENC_DIR) \ @@ -420,7 +426,8 @@ SUBDIRS=\ $(TIMIDITY_DIR) \ $(XVID_DIR) \ $(ZBAR_DIR) \ - $(RTMP_DIR) + $(RTMP_DIR) \ + $(HLS_DIR) DIST_SUBDIRS = \ assrender \ diff --git a/gst/hls/Makefile.am b/ext/hls/Makefile.am similarity index 93% rename from gst/hls/Makefile.am rename to ext/hls/Makefile.am index 1a50906ea9..7750395a89 100644 --- a/gst/hls/Makefile.am +++ b/ext/hls/Makefile.am @@ -10,10 +10,10 @@ libgstfragmented_la_SOURCES = \ gsthlssink.c \ gstm3u8playlist.c -libgstfragmented_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(GIO_CFLAGS) +libgstfragmented_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(GIO_CFLAGS) $(GNUTLS_CFLAGS) libgstfragmented_la_LIBADD = \ $(GST_PLUGINS_BASE_LIBS) -lgstpbutils-$(GST_API_VERSION) -lgstvideo-$(GST_API_VERSION) \ - $(GST_BASE_LIBS) $(GST_LIBS) $(GIO_LIBS) $(LIBM) + $(GST_BASE_LIBS) $(GST_LIBS) $(GIO_LIBS) $(LIBM) $(GNUTLS_LIBS) libgstfragmented_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -no-undefined libgstfragmented_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/gst/hls/gstfragment.c b/ext/hls/gstfragment.c similarity index 100% rename from gst/hls/gstfragment.c rename to ext/hls/gstfragment.c diff --git a/gst/hls/gstfragment.h b/ext/hls/gstfragment.h similarity index 100% rename from gst/hls/gstfragment.h rename to ext/hls/gstfragment.h diff --git a/gst/hls/gstfragmented.h b/ext/hls/gstfragmented.h similarity index 100% rename from gst/hls/gstfragmented.h rename to ext/hls/gstfragmented.h diff --git a/gst/hls/gstfragmentedplugin.c b/ext/hls/gstfragmentedplugin.c similarity index 100% rename from gst/hls/gstfragmentedplugin.c rename to ext/hls/gstfragmentedplugin.c diff --git a/gst/hls/gsthlsdemux.c b/ext/hls/gsthlsdemux.c similarity index 100% rename from gst/hls/gsthlsdemux.c rename to ext/hls/gsthlsdemux.c diff --git a/gst/hls/gsthlsdemux.h b/ext/hls/gsthlsdemux.h similarity index 100% rename from gst/hls/gsthlsdemux.h rename to ext/hls/gsthlsdemux.h diff --git a/gst/hls/gsthlssink.c b/ext/hls/gsthlssink.c similarity index 100% rename from gst/hls/gsthlssink.c rename to ext/hls/gsthlssink.c diff --git a/gst/hls/gsthlssink.h b/ext/hls/gsthlssink.h similarity index 100% rename from gst/hls/gsthlssink.h rename to ext/hls/gsthlssink.h diff --git a/gst/hls/gstm3u8playlist.c b/ext/hls/gstm3u8playlist.c similarity index 100% rename from gst/hls/gstm3u8playlist.c rename to ext/hls/gstm3u8playlist.c diff --git a/gst/hls/gstm3u8playlist.h b/ext/hls/gstm3u8playlist.h similarity index 100% rename from gst/hls/gstm3u8playlist.h rename to ext/hls/gstm3u8playlist.h diff --git a/gst/hls/gsturidownloader.c b/ext/hls/gsturidownloader.c similarity index 100% rename from gst/hls/gsturidownloader.c rename to ext/hls/gsturidownloader.c diff --git a/gst/hls/gsturidownloader.h b/ext/hls/gsturidownloader.h similarity index 100% rename from gst/hls/gsturidownloader.h rename to ext/hls/gsturidownloader.h diff --git a/gst/hls/m3u8.c b/ext/hls/m3u8.c similarity index 100% rename from gst/hls/m3u8.c rename to ext/hls/m3u8.c diff --git a/gst/hls/m3u8.h b/ext/hls/m3u8.h similarity index 100% rename from gst/hls/m3u8.h rename to ext/hls/m3u8.h