/*****************************************************************************
* bridge.c: bridge stream output module
*****************************************************************************
- * Copyright (C) 2005 VideoLAN
+ * Copyright (C) 2005 the VideoLAN team
* $Id$
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
* 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.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h>
-#include <string.h>
-#include <vlc/vlc.h>
-#include <vlc/sout.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_sout.h>
+#include <vlc_block.h>
/*****************************************************************************
* Module descriptor
*****************************************************************************/
#define ID_TEXT N_("ID")
#define ID_LONGTEXT N_( \
- "Specify an identifier integer for this elementary stream" )
+ "Integer identifier for this elementary stream. This will be used to " \
+ "\"find\" this stream later." )
+
+#define DEST_TEXT N_( "Destination bridge-in name" )
+#define DEST_LONGTEXT N_( \
+ "Name of the destination bridge-in. If you do not need more " \
+ "than one bridge-in at a time, you can discard this option." )
#define DELAY_TEXT N_("Delay")
#define DELAY_LONGTEXT N_("Pictures coming from the picture video outputs " \
- "will be delayed accordingly (in milliseconds, >= 100 ms). For high " \
- "values you will need to raise file-caching and others.")
+ "will be delayed according to this value (in milliseconds, should be "\
+ ">= 100 ms). For high values, you will need to raise caching values." )
#define ID_OFFSET_TEXT N_("ID Offset")
#define ID_OFFSET_LONGTEXT N_("Offset to add to the stream IDs specified in " \
"bridge_out to obtain the stream IDs bridge_in will register.")
+#define NAME_TEXT N_( "Name of current instance" )
+#define NAME_LONGTEXT N_( \
+ "Name of this bridge-in instance. If you do not need more " \
+ "than one bridge-in at a time, you can discard this option." )
+
static int OpenOut ( vlc_object_t * );
static void CloseOut( vlc_object_t * );
static int OpenIn ( vlc_object_t * );
#define SOUT_CFG_PREFIX_IN "sout-bridge-in-"
vlc_module_begin();
+ set_shortname( N_("Bridge"));
+ set_description( N_("Bridge stream output"));
add_submodule();
- set_shortname( _("Bridge out"));
- set_description( _("Bridge out stream output") );
+ set_section( N_("Bridge out"), NULL );
set_capability( "sout stream", 50 );
add_shortcut( "bridge-out" );
+ /* Only usable with VLM. No category so not in gui preferences
set_category( CAT_SOUT );
- set_subcategory( SUBCAT_SOUT_STREAM );
+ set_subcategory( SUBCAT_SOUT_STREAM );*/
add_integer( SOUT_CFG_PREFIX_OUT "id", 0, NULL, ID_TEXT, ID_LONGTEXT,
- VLC_FALSE );
+ false );
+ add_string( SOUT_CFG_PREFIX_OUT "in-name", "default", NULL,
+ DEST_TEXT, DEST_LONGTEXT, false );
set_callbacks( OpenOut, CloseOut );
add_submodule();
- set_shortname( _("Bridge in"));
- set_description( _("Bridge in stream output") );
+ set_section( N_("Bridge in"), NULL );
set_capability( "sout stream", 50 );
add_shortcut( "bridge-in" );
- set_category( CAT_SOUT );
- set_subcategory( SUBCAT_SOUT_STREAM );
- add_integer( SOUT_CFG_PREFIX_IN "delay", 100, NULL, DELAY_TEXT,
- DELAY_LONGTEXT, VLC_FALSE );
+ /*set_category( CAT_SOUT );
+ set_subcategory( SUBCAT_SOUT_STREAM );*/
+ add_integer( SOUT_CFG_PREFIX_IN "delay", 0, NULL, DELAY_TEXT,
+ DELAY_LONGTEXT, false );
add_integer( SOUT_CFG_PREFIX_IN "id-offset", 8192, NULL, ID_OFFSET_TEXT,
- ID_OFFSET_LONGTEXT, VLC_FALSE );
+ ID_OFFSET_LONGTEXT, false );
+ add_string( SOUT_CFG_PREFIX_IN "name", "default", NULL,
+ NAME_TEXT, NAME_LONGTEXT, false );
set_callbacks( OpenIn, CloseIn );
- var_Create( p_module->p_libvlc, "bridge-lock", VLC_VAR_MUTEX );
vlc_module_end();
/*****************************************************************************
* Local prototypes
*****************************************************************************/
-static const char *ppsz_sout_options_out[] = {
- "id", NULL
+static const char *const ppsz_sout_options_out[] = {
+ "id", "in-name", NULL
};
-static const char *ppsz_sout_options_in[] = {
- "delay", "id-offset", NULL
+static const char *const ppsz_sout_options_in[] = {
+ "delay", "id-offset", "name", NULL
};
static sout_stream_id_t *AddOut ( sout_stream_t *, es_format_t * );
es_format_t fmt;
block_t *p_block;
block_t **pp_last;
- vlc_bool_t b_empty;
- int i_id;
+ bool b_empty;
/* bridge in part */
sout_stream_id_t *id;
mtime_t i_last;
- vlc_bool_t b_changed;
+ bool b_changed;
} bridged_es_t;
typedef struct bridge_t
int i_es_num;
} bridge_t;
-#define GetBridge(a) __GetBridge( VLC_OBJECT(a) )
-static bridge_t *__GetBridge( vlc_object_t *p_object )
+#define GetBridge(a,b) __GetBridge( VLC_OBJECT(a), b )
+static bridge_t *__GetBridge( vlc_object_t *p_object, const char *psz_name )
{
- libvlc_t *p_libvlc = p_object->p_libvlc;
bridge_t *p_bridge;
vlc_value_t val;
- if( var_Get( p_libvlc, "bridge-struct", &val ) != VLC_SUCCESS )
+ if( var_Get( p_object->p_libvlc, psz_name, &val ) )
{
p_bridge = NULL;
}
else
{
p_bridge = val.p_address;
- }
+ }
return p_bridge;
}
typedef struct out_sout_stream_sys_t
{
vlc_mutex_t *p_lock;
+ bridged_es_t *p_es;
int i_id;
- vlc_bool_t b_inited;
- int i_position;
+ bool b_inited;
+
+ char *psz_name;
} out_sout_stream_sys_t;
/*****************************************************************************
*****************************************************************************/
static int OpenOut( vlc_object_t *p_this )
{
- sout_stream_t *p_stream = (sout_stream_t*)p_this;
+ sout_stream_t *p_stream = (sout_stream_t *)p_this;
out_sout_stream_sys_t *p_sys;
vlc_value_t val;
- sout_CfgParse( p_stream, SOUT_CFG_PREFIX_OUT, ppsz_sout_options_out,
+ config_ChainParse( p_stream, SOUT_CFG_PREFIX_OUT, ppsz_sout_options_out,
p_stream->p_cfg );
p_sys = malloc( sizeof( out_sout_stream_sys_t ) );
- p_sys->b_inited = VLC_FALSE;
+ p_sys->b_inited = false;
+ var_Create( p_this->p_libvlc, "bridge-lock", VLC_VAR_MUTEX );
var_Get( p_this->p_libvlc, "bridge-lock", &val );
p_sys->p_lock = val.p_address;
var_Get( p_stream, SOUT_CFG_PREFIX_OUT "id", &val );
p_sys->i_id = val.i_int;
+ var_Get( p_stream, SOUT_CFG_PREFIX_OUT "in-name", &val );
+ if( asprintf( &p_sys->psz_name, "bridge-struct-%s", val.psz_string )<0 )
+ {
+ free( val.psz_string );
+ free( p_sys );
+ return VLC_ENOMEM;
+ }
+ free( val.psz_string );
+
p_stream->pf_add = AddOut;
p_stream->pf_del = DelOut;
p_stream->pf_send = SendOut;
p_stream->p_sys = (sout_stream_sys_t *)p_sys;
- /* update p_sout->i_out_pace_nocontrol */
p_stream->p_sout->i_out_pace_nocontrol++;
return VLC_SUCCESS;
p_stream->p_sout->i_out_pace_nocontrol--;
+ free( p_sys->psz_name );
free( p_sys );
}
{
return NULL;
}
- p_sys->b_inited = VLC_TRUE;
+ p_sys->b_inited = true;
vlc_mutex_lock( p_sys->p_lock );
- p_bridge = GetBridge( p_stream );
+ p_bridge = GetBridge( p_stream, p_sys->psz_name );
if ( p_bridge == NULL )
{
- libvlc_t *p_libvlc = p_stream->p_libvlc;
+ vlc_object_t *p_libvlc = VLC_OBJECT( p_stream->p_libvlc );
vlc_value_t val;
p_bridge = malloc( sizeof( bridge_t ) );
- var_Create( p_libvlc, "bridge-struct", VLC_VAR_ADDRESS );
+ var_Create( p_libvlc, p_sys->psz_name, VLC_VAR_ADDRESS );
val.p_address = p_bridge;
- var_Set( p_libvlc, "bridge-struct", val );
+ var_Set( p_libvlc, p_sys->psz_name, val );
p_bridge->i_es_num = 0;
p_bridge->pp_es = NULL;
p_bridge->pp_es = realloc( p_bridge->pp_es,
(p_bridge->i_es_num + 1)
* sizeof(bridged_es_t *) );
- p_sys->i_position = p_bridge->i_es_num;
p_bridge->i_es_num++;
p_bridge->pp_es[i] = malloc( sizeof(bridged_es_t) );
}
- else
- p_sys->i_position = i;
- p_es = p_bridge->pp_es[ p_sys->i_position ];
+ p_sys->p_es = p_es = p_bridge->pp_es[i];
+
p_es->fmt = *p_fmt;
p_es->fmt.i_id = p_sys->i_id;
p_es->p_block = NULL;
p_es->pp_last = &p_es->p_block;
- p_es->b_empty = VLC_FALSE;
+ p_es->b_empty = false;
p_es->id = NULL;
p_es->i_last = 0;
- p_es->b_changed = VLC_TRUE;
+ p_es->b_changed = true;
msg_Dbg( p_stream, "bridging out input codec=%4.4s id=%d pos=%d",
- (char*)&p_es->fmt.i_codec, p_es->fmt.i_id, p_sys->i_position );
+ (char*)&p_es->fmt.i_codec, p_es->fmt.i_id, i );
vlc_mutex_unlock( p_sys->p_lock );
static int DelOut( sout_stream_t *p_stream, sout_stream_id_t *id )
{
+ VLC_UNUSED(id);
out_sout_stream_sys_t *p_sys = (out_sout_stream_sys_t *)p_stream->p_sys;
- bridge_t *p_bridge;
bridged_es_t *p_es;
if ( !p_sys->b_inited )
vlc_mutex_lock( p_sys->p_lock );
- p_bridge = GetBridge( p_stream );
- p_es = p_bridge->pp_es[ p_sys->i_position ];
+ p_es = p_sys->p_es;
- p_es->b_empty = VLC_TRUE;
+ p_es->b_empty = true;
block_ChainRelease( p_es->p_block );
- p_es->p_block = VLC_FALSE;
+ p_es->p_block = false;
- p_es->b_changed = VLC_TRUE;
+ p_es->b_changed = true;
vlc_mutex_unlock( p_sys->p_lock );
+ p_sys->b_inited = false;
+
return VLC_SUCCESS;
}
block_t *p_buffer )
{
out_sout_stream_sys_t *p_sys = (out_sout_stream_sys_t *)p_stream->p_sys;
- bridge_t *p_bridge;
bridged_es_t *p_es;
if ( (out_sout_stream_sys_t *)id != p_sys )
vlc_mutex_lock( p_sys->p_lock );
- p_bridge = GetBridge( p_stream );
- p_es = p_bridge->pp_es[ p_sys->i_position ];
+ p_es = p_sys->p_es;
*p_es->pp_last = p_buffer;
while ( p_buffer != NULL )
{
vlc_mutex_t *p_lock;
int i_id_offset;
mtime_t i_delay;
+
+ char *psz_name;
} in_sout_stream_sys_t;
/*****************************************************************************
return VLC_EGENERIC;
}
- sout_CfgParse( p_stream, SOUT_CFG_PREFIX_IN, ppsz_sout_options_in,
+ config_ChainParse( p_stream, SOUT_CFG_PREFIX_IN, ppsz_sout_options_in,
p_stream->p_cfg );
+ var_Create( p_this->p_libvlc, "bridge-lock", VLC_VAR_MUTEX );
var_Get( p_this->p_libvlc, "bridge-lock", &val );
p_sys->p_lock = val.p_address;
var_Get( p_stream, SOUT_CFG_PREFIX_IN "delay", &val );
p_sys->i_delay = (mtime_t)val.i_int * 1000;
+ var_Get( p_stream, SOUT_CFG_PREFIX_IN "name", &val );
+ if( asprintf( &p_sys->psz_name, "bridge-struct-%s", val.psz_string )<0 )
+ {
+ free( val.psz_string );
+ free( p_sys );
+ return VLC_ENOMEM;
+ }
+ free( val.psz_string );
+
p_stream->pf_add = AddIn;
p_stream->pf_del = DelIn;
p_stream->pf_send = SendIn;
sout_StreamDelete( p_sys->p_out );
p_stream->p_sout->i_out_pace_nocontrol--;
+ free( p_sys->psz_name );
free( p_sys );
}
{
in_sout_stream_sys_t *p_sys = (in_sout_stream_sys_t *)p_stream->p_sys;
bridge_t *p_bridge;
- vlc_bool_t b_no_es = VLC_TRUE;
+ bool b_no_es = true;
int i;
/* First forward the packet for our own ES */
/* Then check all bridged streams */
vlc_mutex_lock( p_sys->p_lock );
- p_bridge = GetBridge( p_stream );
+ p_bridge = GetBridge( p_stream, p_sys->psz_name );
if ( p_bridge == NULL )
{
vlc_mutex_unlock( p_sys->p_lock );
for ( i = 0; i < p_bridge->i_es_num; i++ )
{
if ( !p_bridge->pp_es[i]->b_empty )
- b_no_es = VLC_FALSE;
+ b_no_es = false;
while ( p_bridge->pp_es[i]->p_block != NULL
- && (p_bridge->pp_es[i]->p_block->i_dts < mdate()
+ && (p_bridge->pp_es[i]->p_block->i_dts + p_sys->i_delay
+ < mdate()
|| p_bridge->pp_es[i]->p_block->i_dts + p_sys->i_delay
< p_bridge->pp_es[i]->i_last) )
{
block_t *p_block = p_bridge->pp_es[i]->p_block;
+ msg_Dbg( p_stream, "dropping a packet (%"PRId64 ")",
+ mdate() - p_block->i_dts - p_sys->i_delay );
p_bridge->pp_es[i]->p_block
= p_bridge->pp_es[i]->p_block->p_next;
block_Release( p_block );
}
else
{
- if ( p_bridge->pp_es[i]->p_block == NULL )
+ /* We need at least two packets to enter the mux. */
+ if ( p_bridge->pp_es[i]->p_block == NULL
+ || p_bridge->pp_es[i]->p_block->p_next == NULL )
{
continue;
}
p_bridge->pp_es[i]->fmt.i_id, i );
}
}
- p_bridge->pp_es[i]->b_changed = VLC_FALSE;
+ p_bridge->pp_es[i]->b_changed = false;
if ( p_bridge->pp_es[i]->b_empty )
continue;
{
p_sys->p_out->pf_del( p_sys->p_out, p_bridge->pp_es[i]->id );
p_bridge->pp_es[i]->fmt.i_id -= p_sys->i_id_offset;
- p_bridge->pp_es[i]->b_changed = VLC_TRUE;
+ p_bridge->pp_es[i]->b_changed = true;
p_bridge->pp_es[i]->id = NULL;
}
continue;
if ( p_bridge->pp_es[i]->id != NULL )
{
block_t *p_block = p_bridge->pp_es[i]->p_block;
- p_bridge->pp_es[i]->i_last = p_bridge->pp_es[i]->p_block->i_dts
- + p_bridge->pp_es[i]->p_block->i_length;
while ( p_block != NULL )
{
+ p_bridge->pp_es[i]->i_last = p_block->i_dts;
p_block->i_pts += p_sys->i_delay;
p_block->i_dts += p_sys->i_delay;
p_block = p_block->p_next;
if( b_no_es )
{
- libvlc_t *p_libvlc = p_stream->p_libvlc;
+ vlc_object_t *p_libvlc = VLC_OBJECT( p_stream->p_libvlc );
for ( i = 0; i < p_bridge->i_es_num; i++ )
free( p_bridge->pp_es[i] );
free( p_bridge->pp_es );
free( p_bridge );
- var_Destroy( p_libvlc, "bridge-struct" );
+ var_Destroy( p_libvlc, p_sys->psz_name );
}
vlc_mutex_unlock( p_sys->p_lock );
projects / vlc / blobdiff