[vlc-commits] description: remove useless plugin
Rémi Denis-Courmont
git at videolan.org
Sat Feb 29 18:20:52 CET 2020
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Feb 29 17:31:40 2020 +0200| [591cc5c792c3999ef97437e1aab360764fffede4] | committer: Thomas Guillem
description: remove useless plugin
This was only used by VLM VoD.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=591cc5c792c3999ef97437e1aab360764fffede4
---
include/vlc_sout.h | 8 ---
modules/stream_out/Makefile.am | 2 -
modules/stream_out/description.c | 142 ---------------------------------------
po/POTFILES.in | 1 -
4 files changed, 153 deletions(-)
diff --git a/include/vlc_sout.h b/include/vlc_sout.h
index 4bbf5b0ecd..fccaf1f23a 100644
--- a/include/vlc_sout.h
+++ b/include/vlc_sout.h
@@ -293,14 +293,6 @@ VLC_API void sdp_AddMedia(struct vlc_memstream *, const char *type,
VLC_API void sdp_AddAttribute(struct vlc_memstream *, const char *name,
const char *fmt, ...) VLC_FORMAT(3, 4);
-/** Description module */
-typedef struct sout_description_data_t
-{
- int i_es;
- es_format_t **es;
- vlc_sem_t *sem;
-} sout_description_data_t;
-
/** @} */
#ifdef __cplusplus
diff --git a/modules/stream_out/Makefile.am b/modules/stream_out/Makefile.am
index f2ad0db3e3..e9a7feccfc 100644
--- a/modules/stream_out/Makefile.am
+++ b/modules/stream_out/Makefile.am
@@ -4,7 +4,6 @@ libstream_out_dummy_plugin_la_SOURCES = stream_out/dummy.c
libstream_out_cycle_plugin_la_SOURCES = stream_out/cycle.c
libstream_out_delay_plugin_la_SOURCES = stream_out/delay.c
libstream_out_stats_plugin_la_SOURCES = stream_out/stats.c
-libstream_out_description_plugin_la_SOURCES = stream_out/description.c
libstream_out_standard_plugin_la_SOURCES = stream_out/standard.c
libstream_out_standard_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_access_output_srt)
libstream_out_standard_plugin_la_LIBADD = $(SOCKET_LIBS)
@@ -36,7 +35,6 @@ sout_LTLIBRARIES = \
libstream_out_cycle_plugin.la \
libstream_out_delay_plugin.la \
libstream_out_stats_plugin.la \
- libstream_out_description_plugin.la \
libstream_out_standard_plugin.la \
libstream_out_duplicate_plugin.la \
libstream_out_es_plugin.la \
diff --git a/modules/stream_out/description.c b/modules/stream_out/description.c
deleted file mode 100644
index 4866eff069..0000000000
--- a/modules/stream_out/description.c
+++ /dev/null
@@ -1,142 +0,0 @@
-/*****************************************************************************
- * description.c: description stream output module (gathers ES info)
- *****************************************************************************
- * Copyright (C) 2003-2004 VLC authors and VideoLAN
- *
- * Authors: Gildas Bazin <gbazin at videolan.org>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-/*****************************************************************************
- * Preamble
- *****************************************************************************/
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <vlc_common.h>
-#include <vlc_plugin.h>
-#include <vlc_block.h>
-#include <vlc_sout.h>
-
-#include <assert.h>
-
-/*****************************************************************************
- * Exported prototypes
- *****************************************************************************/
-static int Open ( vlc_object_t * );
-static void Close ( vlc_object_t * );
-
-static void *Add( sout_stream_t *, const es_format_t * );
-static void Del( sout_stream_t *, void * );
-static int Send( sout_stream_t *, void *, block_t * );
-
-/*****************************************************************************
- * Module descriptor
- *****************************************************************************/
-vlc_module_begin ()
- set_description( N_("Description stream output") )
- set_capability( "sout stream", 50 )
- add_shortcut( "description" )
- set_callbacks( Open, Close )
-vlc_module_end ()
-
-typedef struct
-{
- sout_description_data_t *data;
- vlc_tick_t i_stream_start;
-} sout_stream_sys_t;
-
-/*****************************************************************************
- * Open:
- *****************************************************************************/
-static int Open( vlc_object_t *p_this )
-{
- sout_stream_t *p_stream = (sout_stream_t*)p_this;
- sout_stream_sys_t *p_sys = malloc(sizeof(sout_stream_sys_t));
- if( unlikely(p_sys == NULL) )
- return VLC_ENOMEM;
-
- p_stream->pf_add = Add;
- p_stream->pf_del = Del;
- p_stream->pf_send = Send;
- p_stream->p_sys = p_sys;
-
- p_sys->data = var_InheritAddress(p_stream, "sout-description-data");
- if (p_sys->data == NULL)
- {
- msg_Err(p_stream, "Missing data: the description stream output is "
- "not meant to be used without special setup from the core");
- free(p_sys);
- return VLC_EGENERIC;
- }
- p_sys->i_stream_start = VLC_TICK_INVALID;
-
- return VLC_SUCCESS;
-}
-
-/*****************************************************************************
- * Close:
- *****************************************************************************/
-static void Close( vlc_object_t *p_this )
-{
- sout_stream_t *p_stream = (sout_stream_t *)p_this;
- sout_stream_sys_t *p_sys = p_stream->p_sys;
-
- msg_Dbg( p_this, "Closing" );
-
- free( p_sys );
-}
-
-static void *Add( sout_stream_t *p_stream, const es_format_t *p_fmt )
-{
- sout_stream_sys_t *p_sys = p_stream->p_sys;
- es_format_t *p_fmt_copy = malloc( sizeof( *p_fmt_copy ) );
-
- if( unlikely(p_fmt_copy == NULL ) )
- return NULL;
-
- msg_Dbg( p_stream, "Adding a stream" );
- es_format_Copy( p_fmt_copy, p_fmt );
-
- TAB_APPEND( p_sys->data->i_es, p_sys->data->es, p_fmt_copy );
-
- if( p_sys->i_stream_start == VLC_TICK_INVALID )
- p_sys->i_stream_start = vlc_tick_now();
-
- return (void *)p_fmt_copy;
-}
-
-static void Del( sout_stream_t *p_stream, void *id )
-{
- msg_Dbg( p_stream, "Removing a stream" );
- /* NOTE: id should be freed by the input manager, not here. */
- (void) id;
-}
-
-static int Send( sout_stream_t *p_stream, void *id, block_t *p_buffer )
-{
- VLC_UNUSED(id);
- sout_stream_sys_t *p_sys = p_stream->p_sys;
-
- block_ChainRelease( p_buffer );
-
- if( p_sys->i_stream_start + VLC_TICK_FROM_MS(1500) < vlc_tick_now() )
- vlc_sem_post(p_sys->data->sem);
-
- return VLC_SUCCESS;
-}
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 4729b636c3..ce1709182d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1112,7 +1112,6 @@ modules/stream_out/chromecast/cast.cpp
modules/stream_out/chromecast/chromecast_demux.cpp
modules/stream_out/cycle.c
modules/stream_out/delay.c
-modules/stream_out/description.c
modules/stream_out/display.c
modules/stream_out/dlna/dlna.hpp
modules/stream_out/dummy.c
More information about the vlc-commits
mailing list