From 81305bf598bc633373ca5dff9bd045c00ba46d08 Mon Sep 17 00:00:00 2001 From: Christophe Massiot <massiot@via.ecp.fr> Date: Thu, 13 Jan 2011 21:42:42 +0100 Subject: [PATCH] New stream_out module setid to change IDs of streams Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org> --- modules/stream_out/Modules.am | 2 + modules/stream_out/setid.c | 158 ++++++++++++++++++++++++++++++++++ po/POTFILES.in | 1 + 3 files changed, 161 insertions(+) create mode 100644 modules/stream_out/setid.c diff --git a/modules/stream_out/Modules.am b/modules/stream_out/Modules.am index 19aea5627d09..a1dec91a7855 100644 --- a/modules/stream_out/Modules.am +++ b/modules/stream_out/Modules.am @@ -15,6 +15,7 @@ SOURCES_stream_out_autodel = autodel.c SOURCES_stream_out_record = record.c SOURCES_stream_out_raop = raop.c SOURCES_stream_out_smem = smem.c +SOURCES_stream_out_setid = setid.c libvlc_LTLIBRARIES += \ libstream_out_dummy_plugin.la \ @@ -30,6 +31,7 @@ libvlc_LTLIBRARIES += \ libstream_out_autodel_plugin.la \ libstream_out_record_plugin.la \ libstream_out_smem_plugin.la \ + libstream_out_setid_plugin.la \ $(NULL) # RTP plugin diff --git a/modules/stream_out/setid.c b/modules/stream_out/setid.c new file mode 100644 index 000000000000..c2c12ccb575c --- /dev/null +++ b/modules/stream_out/setid.c @@ -0,0 +1,158 @@ +/***************************************************************************** + * setid.c: set ID on a stream + ***************************************************************************** + * Copyright (C) 2009 VideoLAN and AUTHORS + * + * Authors: Christophe Massiot <massiot@via.ecp.fr> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + *****************************************************************************/ + +/***************************************************************************** + * Preamble + *****************************************************************************/ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include <stdlib.h> +#include <string.h> + +#include <vlc_common.h> +#include <vlc_plugin.h> +#include <vlc_sout.h> + +/***************************************************************************** + * Module descriptor + *****************************************************************************/ +#define ID_TEXT N_("ID") +#define ID_LONGTEXT N_( \ + "Specify an identifier integer for this elementary stream" ) + +#define NEWID_TEXT N_("New ID") +#define NEWID_LONGTEXT N_( \ + "Specify an new identifier integer for this elementary stream" ) + +static int Open ( vlc_object_t * ); +static void Close ( vlc_object_t * ); + +#define SOUT_CFG_PREFIX "sout-setid-" + +vlc_module_begin() + set_shortname( _("setid")) + set_description( _("Automatically add/delete input streams")) + set_capability( "sout stream", 50 ) + add_shortcut( "setid" ) + set_callbacks( Open, Close ) + add_integer( SOUT_CFG_PREFIX "id", 0, ID_TEXT, ID_LONGTEXT, + false ) + add_integer( SOUT_CFG_PREFIX "new-id", 0, NEWID_TEXT, NEWID_LONGTEXT, + false ) +vlc_module_end() + + +/***************************************************************************** + * Local prototypes + *****************************************************************************/ +static const char *ppsz_sout_options[] = { + "id", "new-id", NULL +}; + +static sout_stream_id_t *Add ( sout_stream_t *, es_format_t * ); +static int Del ( sout_stream_t *, sout_stream_id_t * ); +static int Send ( sout_stream_t *, sout_stream_id_t *, block_t * ); + +struct sout_stream_sys_t +{ + sout_stream_t *p_out; + int i_id, i_new_id; +}; + +/***************************************************************************** + * 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; + vlc_value_t val; + + p_sys = malloc( sizeof( sout_stream_sys_t ) ); + + if( !p_stream->p_next ) + { + msg_Err( p_stream, "cannot create chain" ); + free( p_sys ); + return VLC_EGENERIC; + } + + config_ChainParse( p_stream, SOUT_CFG_PREFIX, ppsz_sout_options, + p_stream->p_cfg ); + + var_Get( p_stream, SOUT_CFG_PREFIX "id", &val ); + p_sys->i_id = val.i_int; + var_Get( p_stream, SOUT_CFG_PREFIX "new-id", &val ); + p_sys->i_new_id = val.i_int; + + p_stream->pf_add = Add; + p_stream->pf_del = Del; + p_stream->pf_send = Send; + + p_stream->p_sys = p_sys; + + 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 = (sout_stream_sys_t *)p_stream->p_sys; + + free( p_sys ); +} + +static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt ) +{ + sout_stream_sys_t *p_sys = (sout_stream_sys_t *)p_stream->p_sys; + + if ( p_fmt->i_id == p_sys->i_id ) + { + msg_Dbg( p_stream, "turning ID %d to %d", + p_sys->i_id, p_sys->i_new_id ); + p_fmt->i_id = p_sys->i_new_id; + } + + + return p_sys->p_out->pf_add( p_sys->p_out, p_fmt ); +} + +static int Del( sout_stream_t *p_stream, sout_stream_id_t *id ) +{ + sout_stream_sys_t *p_sys = (sout_stream_sys_t *)p_stream->p_sys; + + return p_sys->p_out->pf_del( p_sys->p_out, id ); +} + +static int Send( sout_stream_t *p_stream, sout_stream_id_t *id, + block_t *p_buffer ) +{ + sout_stream_sys_t *p_sys = (sout_stream_sys_t *)p_stream->p_sys; + + return p_sys->p_out->pf_send( p_sys->p_out, id, p_buffer ); +} diff --git a/po/POTFILES.in b/po/POTFILES.in index 78d858a32cac..5ed2c5d91422 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1030,6 +1030,7 @@ modules/stream_out/rtp.c modules/stream_out/rtp.h modules/stream_out/rtpfmt.c modules/stream_out/rtsp.c +modules/stream_out/setid.c modules/stream_out/smem.c modules/stream_out/standard.c modules/stream_out/switcher.c -- GitLab