mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 12:11:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

hls: rename plugin from fragmented to hls

Browse source
This commit is contained in:
Tim-Philipp Müller 2015-11-01 13:21:45 +00:00
parent fac4ed18d4
commit efe62292a3
11 changed files with 41 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Makefile.am
View file

@ -53,6 +53,7 @@ CRUFT_FILES = \
$(top_builddir)/common/shave \ $(top_builddir)/common/shave \
$(top_builddir)/common/shave-libtool \ $(top_builddir)/common/shave-libtool \
$(top_builddir)/ext/alsaspdif/.libs/*.{so,dll,DLL,dylib} \ $(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/ivorbis/.libs/*.{so,dll,DLL,dylib} \
$(top_builddir)/ext/jack/.libs/*.{so,dll,DLL,dylib} \ $(top_builddir)/ext/jack/.libs/*.{so,dll,DLL,dylib} \
$(top_builddir)/gst/aacparse/.libs/*.{so,dll,DLL,dylib} \ $(top_builddir)/gst/aacparse/.libs/*.{so,dll,DLL,dylib} \

10
docs/plugins/inspect/plugin-fragmented.xml → docs/plugins/inspect/plugin-hls.xml
View file

@ -1,13 +1,13 @@
<plugin> <plugin>
<name>fragmented</name> <name>hls</name>
<description>Fragmented streaming plugins</description> <description>HTTP Live Streaming (HLS)</description>
<filename>../../ext/hls/.libs/libgstfragmented.so</filename> <filename>../../ext/hls/.libs/libgsthls.so</filename>
<basename>libgstfragmented.so</basename> <basename>libgsthls.so</basename>
<version>1.7.0.1</version> <version>1.7.0.1</version>
<license>LGPL</license> <license>LGPL</license>
<source>gst-plugins-bad</source> <source>gst-plugins-bad</source>
<package>GStreamer Bad Plug-ins</package> <package>GStreamer Bad Plug-ins</package>
<origin>http://www.gstreamer.org/</origin> <origin>Unknown package origin</origin>
<elements> <elements>
<element> <element>
<name>hlsdemux</name> <name>hlsdemux</name>

16
ext/hls/Makefile.am
View file

@ -1,25 +1,25 @@
plugin_LTLIBRARIES = libgstfragmented.la plugin_LTLIBRARIES = libgsthls.la
libgstfragmented_la_SOURCES = \ libgsthls_la_SOURCES = \
m3u8.c \ m3u8.c \
gsthlsdemux.c \ gsthlsdemux.c \
gstfragmentedplugin.c \ gsthlsplugin.c \
gsthlssink.c \ gsthlssink.c \
gstm3u8playlist.c gstm3u8playlist.c
libgstfragmented_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(LIBGCRYPT_CFLAGS) $(NETTLE_CFLAGS) libgsthls_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(LIBGCRYPT_CFLAGS) $(NETTLE_CFLAGS)
libgstfragmented_la_LIBADD = \ libgsthls_la_LIBADD = \
$(top_builddir)/gst-libs/gst/uridownloader/libgsturidownloader-@GST_API_VERSION@.la \ $(top_builddir)/gst-libs/gst/uridownloader/libgsturidownloader-@GST_API_VERSION@.la \
$(top_builddir)/gst-libs/gst/adaptivedemux/libgstadaptivedemux-@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_PLUGINS_BASE_LIBS) -lgstpbutils-$(GST_API_VERSION) -lgstvideo-$(GST_API_VERSION) \
$(GST_BASE_LIBS) $(GST_LIBS) $(LIBM) $(LIBGCRYPT_LIBS) $(NETTLE_LIBS) $(OPENSSL_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) $(LIBM) $(LIBGCRYPT_LIBS) $(NETTLE_LIBS) $(OPENSSL_LIBS)
libgstfragmented_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -no-undefined libgsthls_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -no-undefined
libgstfragmented_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS) libgsthls_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
# headers we need but don't want installed # headers we need but don't want installed
noinst_HEADERS = \ noinst_HEADERS = \
gstfragmented.h \ gsthls.h \
gsthlsdemux.h \ gsthlsdemux.h \
gsthlssink.h \ gsthlssink.h \
gstm3u8playlist.h \ gstm3u8playlist.h \

12
ext/hls/gstfragmented.h
View file

@ -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__ */

12
ext/hls/gsthls.h Normal file
View file

@ -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__ */

2
ext/hls/gsthlsdemux.h
View file

@ -26,7 +26,7 @@
#include <gst/gst.h> #include <gst/gst.h>
#include "m3u8.h" #include "m3u8.h"
#include "gstfragmented.h" #include "gsthls.h"
#include <gst/adaptivedemux/gstadaptivedemux.h> #include <gst/adaptivedemux/gstadaptivedemux.h>
#if defined(HAVE_OPENSSL) #if defined(HAVE_OPENSSL)
#include <openssl/evp.h> #include <openssl/evp.h>

14
ext/hls/gstfragmentedplugin.c → ext/hls/gsthlsplugin.c
View file

@ -4,16 +4,16 @@
#include <gst/gst.h> #include <gst/gst.h>
#include "gstfragmented.h" #include "gsthls.h"
#include "gsthlsdemux.h" #include "gsthlsdemux.h"
#include "gsthlssink.h" #include "gsthlssink.h"
GST_DEBUG_CATEGORY (fragmented_debug); GST_DEBUG_CATEGORY (hls_debug);
static gboolean 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, if (!gst_element_register (plugin, "hlsdemux", GST_RANK_PRIMARY,
GST_TYPE_HLS_DEMUX) || FALSE) GST_TYPE_HLS_DEMUX) || FALSE)
@ -27,6 +27,6 @@ fragmented_init (GstPlugin * plugin)
GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
GST_VERSION_MINOR, GST_VERSION_MINOR,
fragmented, hls,
"Fragmented streaming plugins", "HTTP Live Streaming (HLS)",
fragmented_init, VERSION, "LGPL", PACKAGE_NAME, "http://www.gstreamer.org/") hls_init, VERSION, GST_LICENSE, PACKAGE_NAME, GST_PACKAGE_ORIGIN)

4
ext/hls/gstm3u8playlist.c
View file

@ -21,10 +21,10 @@
#include <glib.h> #include <glib.h>
#include "gstfragmented.h" #include "gsthls.h"
#include "gstm3u8playlist.h" #include "gstm3u8playlist.h"
#define GST_CAT_DEFAULT fragmented_debug #define GST_CAT_DEFAULT hls_debug
enum enum
{ {

4
ext/hls/m3u8.c
View file

@ -25,10 +25,10 @@
#include <glib.h> #include <glib.h>
#include <string.h> #include <string.h>
#include "gstfragmented.h" #include "gsthls.h"
#include "m3u8.h" #include "m3u8.h"
#define GST_CAT_DEFAULT fragmented_debug #define GST_CAT_DEFAULT hls_debug
static GstM3U8 *gst_m3u8_new (void); static GstM3U8 *gst_m3u8_new (void);
static void gst_m3u8_free (GstM3U8 * m3u8); static void gst_m3u8_free (GstM3U8 * m3u8);

2
gst-plugins-bad.spec.in
View file

@ -231,7 +231,7 @@ make ERROR_CFLAGS='' ERROR_CXXFLAGS=''
%{_libdir}/gstreamer-%{majorminor}/libgstsiren.so %{_libdir}/gstreamer-%{majorminor}/libgstsiren.so
%{_libdir}/gstreamer-%{majorminor}/libgstdvbsuboverlay.so %{_libdir}/gstreamer-%{majorminor}/libgstdvbsuboverlay.so
%{_libdir}/gstreamer-%{majorminor}/libgstfragmented.so %{_libdir}/gstreamer-%{majorminor}/libgsthls.so
%{_libdir}/gstreamer-%{majorminor}/libgstvideoparsersbad.so %{_libdir}/gstreamer-%{majorminor}/libgstvideoparsersbad.so
%{_libdir}/gstreamer-%{majorminor}/libgsty4mdec.so %{_libdir}/gstreamer-%{majorminor}/libgsty4mdec.so
%{_libdir}/gstreamer-%{majorminor}/libgstaudiovisualizers.so %{_libdir}/gstreamer-%{majorminor}/libgstaudiovisualizers.so

5
tests/check/elements/hlsdemux_m3u8.c
View file

@ -30,7 +30,7 @@
#include "m3u8.h" #include "m3u8.h"
#include "m3u8.c" #include "m3u8.c"
GST_DEBUG_CATEGORY (fragmented_debug); GST_DEBUG_CATEGORY (hls_debug);
static const gchar *INVALID_PLAYLIST = "#EXTM3 UINVALID"; static const gchar *INVALID_PLAYLIST = "#EXTM3 UINVALID";
@ -1328,8 +1328,7 @@ hlsdemux_suite (void)
Suite *s = suite_create ("hlsdemux_m3u8"); Suite *s = suite_create ("hlsdemux_m3u8");
TCase *tc_m3u8 = tcase_create ("m3u8client"); TCase *tc_m3u8 = tcase_create ("m3u8client");
GST_DEBUG_CATEGORY_INIT (fragmented_debug, "hlsdemux_m3u", 0, GST_DEBUG_CATEGORY_INIT (hls_debug, "hlsdemux_m3u", 0, "hlsdemux m3u test");
"hlsdemux m3u test");
suite_add_tcase (s, tc_m3u8); suite_add_tcase (s, tc_m3u8);
tcase_add_test (tc_m3u8, test_load_main_playlist_invalid); tcase_add_test (tc_m3u8, test_load_main_playlist_invalid);