diff options
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | docs/plugins/inspect/plugin-hls.xml (renamed from docs/plugins/inspect/plugin-fragmented.xml) | 10 | ||||
| -rw-r--r-- | ext/hls/Makefile.am | 16 | ||||
| -rw-r--r-- | ext/hls/gstfragmented.h | 12 | ||||
| -rw-r--r-- | ext/hls/gsthls.h | 12 | ||||
| -rw-r--r-- | ext/hls/gsthlsdemux.h | 2 | ||||
| -rw-r--r-- | ext/hls/gsthlsplugin.c (renamed from ext/hls/gstfragmentedplugin.c) | 14 | ||||
| -rw-r--r-- | ext/hls/gstm3u8playlist.c | 4 | ||||
| -rw-r--r-- | ext/hls/m3u8.c | 4 | ||||
| -rw-r--r-- | gst-plugins-bad.spec.in | 2 | ||||
| -rw-r--r-- | tests/check/elements/hlsdemux_m3u8.c | 5 |
11 files changed, 41 insertions, 41 deletions
diff --git a/Makefile.am b/Makefile.am index 09615b9ba..6f7bcbf04 100644 --- a/Makefile.am +++ b/Makefile.am @@ -53,6 +53,7 @@ CRUFT_FILES = \ $(top_builddir)/common/shave \ $(top_builddir)/common/shave-libtool \ $(top_builddir)/ext/alsaspdif/.libs/*.{so,dll,DLL,dylib} \ + $(top_builddir)/ext/hls/.libs/libgstfragmented* \ $(top_builddir)/ext/ivorbis/.libs/*.{so,dll,DLL,dylib} \ $(top_builddir)/ext/jack/.libs/*.{so,dll,DLL,dylib} \ $(top_builddir)/gst/aacparse/.libs/*.{so,dll,DLL,dylib} \ diff --git a/docs/plugins/inspect/plugin-fragmented.xml b/docs/plugins/inspect/plugin-hls.xml index e5e847a3f..acbb5f28d 100644 --- a/docs/plugins/inspect/plugin-fragmented.xml +++ b/docs/plugins/inspect/plugin-hls.xml @@ -1,13 +1,13 @@ <plugin> - <name>fragmented</name> - <description>Fragmented streaming plugins</description> - <filename>../../ext/hls/.libs/libgstfragmented.so</filename> - <basename>libgstfragmented.so</basename> + <name>hls</name> + <description>HTTP Live Streaming (HLS)</description> + <filename>../../ext/hls/.libs/libgsthls.so</filename> + <basename>libgsthls.so</basename> <version>1.7.0.1</version> <license>LGPL</license> <source>gst-plugins-bad</source> <package>GStreamer Bad Plug-ins</package> - <origin>http://www.gstreamer.org/</origin> + <origin>Unknown package origin</origin> <elements> <element> <name>hlsdemux</name> diff --git a/ext/hls/Makefile.am b/ext/hls/Makefile.am index 2c287c70e..f1632028d 100644 --- a/ext/hls/Makefile.am +++ b/ext/hls/Makefile.am @@ -1,25 +1,25 @@ -plugin_LTLIBRARIES = libgstfragmented.la +plugin_LTLIBRARIES = libgsthls.la -libgstfragmented_la_SOURCES = \ +libgsthls_la_SOURCES = \ m3u8.c \ gsthlsdemux.c \ - gstfragmentedplugin.c \ + gsthlsplugin.c \ gsthlssink.c \ gstm3u8playlist.c -libgstfragmented_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(LIBGCRYPT_CFLAGS) $(NETTLE_CFLAGS) -libgstfragmented_la_LIBADD = \ +libgsthls_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(LIBGCRYPT_CFLAGS) $(NETTLE_CFLAGS) +libgsthls_la_LIBADD = \ $(top_builddir)/gst-libs/gst/uridownloader/libgsturidownloader-@GST_API_VERSION@.la \ $(top_builddir)/gst-libs/gst/adaptivedemux/libgstadaptivedemux-@GST_API_VERSION@.la \ $(GST_PLUGINS_BASE_LIBS) -lgstpbutils-$(GST_API_VERSION) -lgstvideo-$(GST_API_VERSION) \ $(GST_BASE_LIBS) $(GST_LIBS) $(LIBM) $(LIBGCRYPT_LIBS) $(NETTLE_LIBS) $(OPENSSL_LIBS) -libgstfragmented_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -no-undefined -libgstfragmented_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS) +libgsthls_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -no-undefined +libgsthls_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS) # headers we need but don't want installed noinst_HEADERS = \ - gstfragmented.h \ + gsthls.h \ gsthlsdemux.h \ gsthlssink.h \ gstm3u8playlist.h \ diff --git a/ext/hls/gstfragmented.h b/ext/hls/gstfragmented.h deleted file mode 100644 index 46656aca3..000000000 --- a/ext/hls/gstfragmented.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef __GST_FRAGMENTED_H__ -#define __GST_FRAGMENTED_H__ - -#include <gst/gst.h> - -G_BEGIN_DECLS - -GST_DEBUG_CATEGORY_EXTERN (fragmented_debug); - -G_END_DECLS - -#endif /* __GST_FRAGMENTED_H__ */ diff --git a/ext/hls/gsthls.h b/ext/hls/gsthls.h new file mode 100644 index 000000000..3806f4f21 --- /dev/null +++ b/ext/hls/gsthls.h @@ -0,0 +1,12 @@ +#ifndef __GST_HLS_H__ +#define __GST_HLS_H__ + +#include <gst/gst.h> + +G_BEGIN_DECLS + +GST_DEBUG_CATEGORY_EXTERN (hls_debug); + +G_END_DECLS + +#endif /* __GST_HLS_H__ */ diff --git a/ext/hls/gsthlsdemux.h b/ext/hls/gsthlsdemux.h index daa3670ce..1154236f6 100644 --- a/ext/hls/gsthlsdemux.h +++ b/ext/hls/gsthlsdemux.h @@ -26,7 +26,7 @@ #include <gst/gst.h> #include "m3u8.h" -#include "gstfragmented.h" +#include "gsthls.h" #include <gst/adaptivedemux/gstadaptivedemux.h> #if defined(HAVE_OPENSSL) #include <openssl/evp.h> diff --git a/ext/hls/gstfragmentedplugin.c b/ext/hls/gsthlsplugin.c index 89a77412a..552f514de 100644 --- a/ext/hls/gstfragmentedplugin.c +++ b/ext/hls/gsthlsplugin.c @@ -4,16 +4,16 @@ #include <gst/gst.h> -#include "gstfragmented.h" +#include "gsthls.h" #include "gsthlsdemux.h" #include "gsthlssink.h" -GST_DEBUG_CATEGORY (fragmented_debug); +GST_DEBUG_CATEGORY (hls_debug); static gboolean -fragmented_init (GstPlugin * plugin) +hls_init (GstPlugin * plugin) { - GST_DEBUG_CATEGORY_INIT (fragmented_debug, "fragmented", 0, "fragmented"); + GST_DEBUG_CATEGORY_INIT (hls_debug, "hls", 0, "HTTP Live Streaming (HLS)"); if (!gst_element_register (plugin, "hlsdemux", GST_RANK_PRIMARY, GST_TYPE_HLS_DEMUX) || FALSE) @@ -27,6 +27,6 @@ fragmented_init (GstPlugin * plugin) GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, - fragmented, - "Fragmented streaming plugins", - fragmented_init, VERSION, "LGPL", PACKAGE_NAME, "http://www.gstreamer.org/") + hls, + "HTTP Live Streaming (HLS)", + hls_init, VERSION, GST_LICENSE, PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/ext/hls/gstm3u8playlist.c b/ext/hls/gstm3u8playlist.c index e3eae94ed..c6007020b 100644 --- a/ext/hls/gstm3u8playlist.c +++ b/ext/hls/gstm3u8playlist.c @@ -21,10 +21,10 @@ #include <glib.h> -#include "gstfragmented.h" +#include "gsthls.h" #include "gstm3u8playlist.h" -#define GST_CAT_DEFAULT fragmented_debug +#define GST_CAT_DEFAULT hls_debug enum { diff --git a/ext/hls/m3u8.c b/ext/hls/m3u8.c index d1fa8a312..f161315c7 100644 --- a/ext/hls/m3u8.c +++ b/ext/hls/m3u8.c @@ -25,10 +25,10 @@ #include <glib.h> #include <string.h> -#include "gstfragmented.h" +#include "gsthls.h" #include "m3u8.h" -#define GST_CAT_DEFAULT fragmented_debug +#define GST_CAT_DEFAULT hls_debug static GstM3U8 *gst_m3u8_new (void); static void gst_m3u8_free (GstM3U8 * m3u8); diff --git a/gst-plugins-bad.spec.in b/gst-plugins-bad.spec.in index 907c632a5..0e717bb4f 100644 --- a/gst-plugins-bad.spec.in +++ b/gst-plugins-bad.spec.in @@ -231,7 +231,7 @@ make ERROR_CFLAGS='' ERROR_CXXFLAGS='' %{_libdir}/gstreamer-%{majorminor}/libgstsiren.so %{_libdir}/gstreamer-%{majorminor}/libgstdvbsuboverlay.so -%{_libdir}/gstreamer-%{majorminor}/libgstfragmented.so +%{_libdir}/gstreamer-%{majorminor}/libgsthls.so %{_libdir}/gstreamer-%{majorminor}/libgstvideoparsersbad.so %{_libdir}/gstreamer-%{majorminor}/libgsty4mdec.so %{_libdir}/gstreamer-%{majorminor}/libgstaudiovisualizers.so diff --git a/tests/check/elements/hlsdemux_m3u8.c b/tests/check/elements/hlsdemux_m3u8.c index b122921dc..c64640cb7 100644 --- a/tests/check/elements/hlsdemux_m3u8.c +++ b/tests/check/elements/hlsdemux_m3u8.c @@ -30,7 +30,7 @@ #include "m3u8.h" #include "m3u8.c" -GST_DEBUG_CATEGORY (fragmented_debug); +GST_DEBUG_CATEGORY (hls_debug); static const gchar *INVALID_PLAYLIST = "#EXTM3 UINVALID"; @@ -1328,8 +1328,7 @@ hlsdemux_suite (void) Suite *s = suite_create ("hlsdemux_m3u8"); TCase *tc_m3u8 = tcase_create ("m3u8client"); - GST_DEBUG_CATEGORY_INIT (fragmented_debug, "hlsdemux_m3u", 0, - "hlsdemux m3u test"); + GST_DEBUG_CATEGORY_INIT (hls_debug, "hlsdemux_m3u", 0, "hlsdemux m3u test"); suite_add_tcase (s, tc_m3u8); tcase_add_test (tc_m3u8, test_load_main_playlist_invalid); |