/*****************************************************************************
* bridge.c: bridge stream output module
*****************************************************************************
- * Copyright (C) 2005-2008 the VideoLAN team
+ * Copyright (C) 2005-2008 VLC authors and VideoLAN
* $Id$
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Antoine Cellerier <dionoea at videolan dot org>
*
- * 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
+ * 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 General Public License for more details.
+ * 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 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.
+ * 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.
*****************************************************************************/
/*****************************************************************************
# include "config.h"
#endif
-#include <assert.h>
-
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_sout.h>
#include <vlc_block.h>
-#include <vlc_memory.h>
/*****************************************************************************
* Module descriptor
#define PLACEHOLDER_DELAY_LONGTEXT N_( \
"Delay (in ms) before the placeholder kicks in." )
-#define PLACEHOLDER_IFRAME_TEXT N_( "Wait for I frame before toggling placholder" )
+#define PLACEHOLDER_IFRAME_TEXT N_( "Wait for I frame before toggling placeholder" )
#define PLACEHOLDER_IFRAME_LONGTEXT N_( \
"If enabled, switching between the placeholder and the normal stream " \
"will only occur on I frames. This will remove artifacts on stream " \
/* Only usable with VLM. No category so not in gui preferences
set_category( CAT_SOUT )
set_subcategory( SUBCAT_SOUT_STREAM )*/
- add_integer( SOUT_CFG_PREFIX_OUT "id", 0, NULL, ID_TEXT, ID_LONGTEXT,
+ add_integer( SOUT_CFG_PREFIX_OUT "id", 0, ID_TEXT, ID_LONGTEXT,
false )
- add_string( SOUT_CFG_PREFIX_OUT "in-name", "default", NULL,
+ add_string( SOUT_CFG_PREFIX_OUT "in-name", "default",
DEST_TEXT, DEST_LONGTEXT, false )
set_callbacks( OpenOut, CloseOut )
add_shortcut( "bridge-in" )
/*set_category( CAT_SOUT )
set_subcategory( SUBCAT_SOUT_STREAM )*/
- add_integer( SOUT_CFG_PREFIX_IN "delay", 0, NULL, DELAY_TEXT,
+ add_integer( SOUT_CFG_PREFIX_IN "delay", 0, DELAY_TEXT,
DELAY_LONGTEXT, false )
- add_integer( SOUT_CFG_PREFIX_IN "id-offset", 8192, NULL, ID_OFFSET_TEXT,
+ add_integer( SOUT_CFG_PREFIX_IN "id-offset", 8192, ID_OFFSET_TEXT,
ID_OFFSET_LONGTEXT, false )
- add_string( SOUT_CFG_PREFIX_IN "name", "default", NULL,
+ add_string( SOUT_CFG_PREFIX_IN "name", "default",
NAME_TEXT, NAME_LONGTEXT, false )
- add_bool( SOUT_CFG_PREFIX_IN "placeholder", false, NULL,
+ add_bool( SOUT_CFG_PREFIX_IN "placeholder", false,
PLACEHOLDER_TEXT, PLACEHOLDER_LONGTEXT, false )
- add_integer( SOUT_CFG_PREFIX_IN "placeholder-delay", 200, NULL,
+ add_integer( SOUT_CFG_PREFIX_IN "placeholder-delay", 200,
PLACEHOLDER_DELAY_TEXT, PLACEHOLDER_DELAY_LONGTEXT, false )
- add_bool( SOUT_CFG_PREFIX_IN "placeholder-switch-on-iframe", true, NULL,
+ add_bool( SOUT_CFG_PREFIX_IN "placeholder-switch-on-iframe", true,
PLACEHOLDER_IFRAME_TEXT, PLACEHOLDER_IFRAME_LONGTEXT, false )
set_callbacks( OpenIn, CloseIn )
NULL
};
-static sout_stream_id_t *AddOut ( sout_stream_t *, es_format_t * );
-static int DelOut ( sout_stream_t *, sout_stream_id_t * );
-static int SendOut( sout_stream_t *, sout_stream_id_t *, block_t * );
+static sout_stream_id_sys_t *AddOut( sout_stream_t *, const es_format_t * );
+static void DelOut ( sout_stream_t *, sout_stream_id_sys_t * );
+static int SendOut( sout_stream_t *, sout_stream_id_sys_t *, block_t * );
-static sout_stream_id_t *AddIn ( sout_stream_t *, es_format_t * );
-static int DelIn ( sout_stream_t *, sout_stream_id_t * );
-static int SendIn( sout_stream_t *, sout_stream_id_t *, block_t * );
+static sout_stream_id_sys_t *AddIn( sout_stream_t *, const es_format_t * );
+static void DelIn ( sout_stream_t *, sout_stream_id_sys_t * );
+static int SendIn( sout_stream_t *, sout_stream_id_sys_t *, block_t * );
typedef struct bridged_es_t
{
bool b_empty;
/* bridge in part */
- sout_stream_id_t *id;
+ sout_stream_id_sys_t *id;
mtime_t i_last;
bool b_changed;
} bridged_es_t;
int i_es_num;
} bridge_t;
+static vlc_mutex_t lock = VLC_STATIC_MUTEX;
/*
* Bridge out
typedef struct out_sout_stream_sys_t
{
- vlc_mutex_t *p_lock;
bridged_es_t *p_es;
int i_id;
bool b_inited;
p_stream->p_cfg );
p_sys = malloc( sizeof( out_sout_stream_sys_t ) );
- assert( p_sys );
+ if( unlikely( !p_sys ) )
+ return VLC_ENOMEM;
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;
p_stream->pf_send = SendOut;
p_stream->p_sys = (sout_stream_sys_t *)p_sys;
-
- p_stream->p_sout->i_out_pace_nocontrol++;
+ p_stream->pace_nocontrol = true;
return VLC_SUCCESS;
}
sout_stream_t *p_stream = (sout_stream_t*)p_this;
out_sout_stream_sys_t *p_sys = (out_sout_stream_sys_t *)p_stream->p_sys;
- p_stream->p_sout->i_out_pace_nocontrol--;
-
free( p_sys->psz_name );
free( p_sys );
}
-static sout_stream_id_t * AddOut( sout_stream_t *p_stream, es_format_t *p_fmt )
+static sout_stream_id_sys_t * AddOut( sout_stream_t *p_stream, const es_format_t *p_fmt )
{
out_sout_stream_sys_t *p_sys = (out_sout_stream_sys_t *)p_stream->p_sys;
bridge_t *p_bridge;
}
p_sys->b_inited = true;
- vlc_mutex_lock( p_sys->p_lock );
+ vlc_mutex_lock( &lock );
p_bridge = var_GetAddress( p_stream->p_libvlc, p_sys->psz_name );
if ( p_bridge == NULL )
{
- p_bridge = malloc( sizeof( bridge_t ) );
- assert( p_bridge );
+ p_bridge = xmalloc( sizeof( bridge_t ) );
var_Create( p_stream->p_libvlc, p_sys->psz_name, VLC_VAR_ADDRESS );
var_SetAddress( p_stream->p_libvlc, p_sys->psz_name, p_bridge );
if ( i == p_bridge->i_es_num )
{
- p_bridge->pp_es = realloc_or_free( p_bridge->pp_es,
+ p_bridge->pp_es = xrealloc( p_bridge->pp_es,
(p_bridge->i_es_num + 1) * sizeof(bridged_es_t *) );
- assert( p_bridge->pp_es );
p_bridge->i_es_num++;
- p_bridge->pp_es[i] = malloc( sizeof(bridged_es_t) );
- assert( p_bridge->pp_es[i] );
+ p_bridge->pp_es[i] = xmalloc( sizeof(bridged_es_t) );
}
p_sys->p_es = p_es = p_bridge->pp_es[i];
p_es->b_empty = false;
p_es->id = NULL;
- p_es->i_last = 0;
+ p_es->i_last = VLC_TS_INVALID;
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, i );
- vlc_mutex_unlock( p_sys->p_lock );
+ vlc_mutex_unlock( &lock );
- return (sout_stream_id_t *)p_sys;
+ return (sout_stream_id_sys_t *)p_sys;
}
-static int DelOut( sout_stream_t *p_stream, sout_stream_id_t *id )
+static void DelOut( sout_stream_t *p_stream, sout_stream_id_sys_t *id )
{
VLC_UNUSED(id);
out_sout_stream_sys_t *p_sys = (out_sout_stream_sys_t *)p_stream->p_sys;
bridged_es_t *p_es;
if ( !p_sys->b_inited )
- {
- return VLC_SUCCESS;
- }
+ return;
- vlc_mutex_lock( p_sys->p_lock );
+ vlc_mutex_lock( &lock );
p_es = p_sys->p_es;
p_es->p_block = false;
p_es->b_changed = true;
- vlc_mutex_unlock( p_sys->p_lock );
+ vlc_mutex_unlock( &lock );
p_sys->b_inited = false;
-
- return VLC_SUCCESS;
}
-static int SendOut( sout_stream_t *p_stream, sout_stream_id_t *id,
+static int SendOut( sout_stream_t *p_stream, sout_stream_id_sys_t *id,
block_t *p_buffer )
{
out_sout_stream_sys_t *p_sys = (out_sout_stream_sys_t *)p_stream->p_sys;
return VLC_SUCCESS;
}
- vlc_mutex_lock( p_sys->p_lock );
+ vlc_mutex_lock( &lock );
p_es = p_sys->p_es;
*p_es->pp_last = p_buffer;
p_buffer = p_buffer->p_next;
}
- vlc_mutex_unlock( p_sys->p_lock );
+ vlc_mutex_unlock( &lock );
return VLC_SUCCESS;
}
typedef struct in_sout_stream_sys_t
{
- sout_stream_t *p_out;
- vlc_mutex_t *p_lock;
int i_id_offset;
mtime_t i_delay;
bool b_switch_on_iframe;
int i_state;
mtime_t i_placeholder_delay;
- sout_stream_id_t *id_video;
+ sout_stream_id_sys_t *id_video;
mtime_t i_last_video;
- sout_stream_id_t *id_audio;
+ sout_stream_id_sys_t *id_audio;
mtime_t i_last_audio;
} in_sout_stream_sys_t;
vlc_value_t val;
p_sys = malloc( sizeof( in_sout_stream_sys_t ) );
- assert( p_sys );
+ if( unlikely( !p_sys ) )
+ return VLC_ENOMEM;
- p_sys->p_out = sout_StreamNew( p_stream->p_sout, p_stream->psz_next );
- if( !p_sys->p_out )
+ if( !p_stream->p_next )
{
msg_Err( p_stream, "cannot create chain" );
free( p_sys );
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 "id-offset", &val );
p_sys->i_id_offset = val.i_int;
var_Get( p_stream, SOUT_CFG_PREFIX_IN "placeholder-delay", &val );
p_sys->i_placeholder_delay = (mtime_t)val.i_int * 1000;
- p_sys->i_last_video = 0;
- p_sys->i_last_audio = 0;
+ p_sys->i_last_video = VLC_TS_INVALID;
+ p_sys->i_last_audio = VLC_TS_INVALID;
p_sys->id_video = NULL;
p_sys->id_audio = NULL;
p_stream->pf_send = SendIn;
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++;
+ p_stream->pace_nocontrol = true;
return VLC_SUCCESS;
}
sout_stream_t *p_stream = (sout_stream_t*)p_this;
in_sout_stream_sys_t *p_sys = (in_sout_stream_sys_t *)p_stream->p_sys;
- sout_StreamDelete( p_sys->p_out );
- p_stream->p_sout->i_out_pace_nocontrol--;
-
free( p_sys->psz_name );
free( p_sys );
}
-struct sout_stream_id_t
+struct sout_stream_id_sys_t
{
- sout_stream_id_t *id;
+ sout_stream_id_sys_t *id;
int i_cat; /* es category. Used for placeholder option */
};
-static sout_stream_id_t * AddIn( sout_stream_t *p_stream, es_format_t *p_fmt )
+static sout_stream_id_sys_t * AddIn( sout_stream_t *p_stream, const es_format_t *p_fmt )
{
in_sout_stream_sys_t *p_sys = (in_sout_stream_sys_t *)p_stream->p_sys;
- sout_stream_id_t *id = malloc( sizeof( sout_stream_id_t ) );
+ sout_stream_id_sys_t *id = malloc( sizeof( sout_stream_id_sys_t ) );
if( !id ) return NULL;
- id->id = p_sys->p_out->pf_add( p_sys->p_out, p_fmt );
+ id->id = p_stream->p_next->pf_add( p_stream->p_next, p_fmt );
if( !id->id )
{
free( id );
return id;
}
-static int DelIn( sout_stream_t *p_stream, sout_stream_id_t *id )
+static void DelIn( sout_stream_t *p_stream, sout_stream_id_sys_t *id )
{
in_sout_stream_sys_t *p_sys = (in_sout_stream_sys_t *)p_stream->p_sys;
if( id == p_sys->id_video ) p_sys->id_video = NULL;
if( id == p_sys->id_audio ) p_sys->id_audio = NULL;
- int ret = p_sys->p_out->pf_del( p_sys->p_out, id->id );
-
+ p_stream->p_next->pf_del( p_stream->p_next, id->id );
free( id );
- return ret;
}
-static int SendIn( sout_stream_t *p_stream, sout_stream_id_t *id,
+static int SendIn( sout_stream_t *p_stream, sout_stream_id_sys_t *id,
block_t *p_buffer )
{
in_sout_stream_sys_t *p_sys = (in_sout_stream_sys_t *)p_stream->p_sys;
/* First forward the packet for our own ES */
if( !p_sys->b_placeholder )
- p_sys->p_out->pf_send( p_sys->p_out, id->id, p_buffer );
+ p_stream->p_next->pf_send( p_stream->p_next, id->id, p_buffer );
/* Then check all bridged streams */
- vlc_mutex_lock( p_sys->p_lock );
+ vlc_mutex_lock( &lock );
p_bridge = var_GetAddress( p_stream->p_libvlc, p_sys->psz_name );
{
if ( p_bridge->pp_es[i]->b_empty && p_bridge->pp_es[i]->id != NULL )
{
- p_sys->p_out->pf_del( p_sys->p_out, p_bridge->pp_es[i]->id );
+ p_stream->p_next->pf_del( p_stream->p_next, p_bridge->pp_es[i]->id );
}
else
{
p_bridge->pp_es[i]->fmt.i_id += p_sys->i_id_offset;
if( !p_sys->b_placeholder )
{
- p_bridge->pp_es[i]->id = p_sys->p_out->pf_add(
- p_sys->p_out, &p_bridge->pp_es[i]->fmt );
+ p_bridge->pp_es[i]->id = p_stream->p_next->pf_add(
+ p_stream->p_next, &p_bridge->pp_es[i]->fmt );
if ( p_bridge->pp_es[i]->id == NULL )
{
msg_Warn( p_stream, "couldn't create chain for id %d",
&& p_bridge->pp_es[i]->i_last < i_date )
{
if( !p_sys->b_placeholder )
- p_sys->p_out->pf_del( p_sys->p_out,
+ p_stream->p_next->pf_del( p_stream->p_next,
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 = true;
p_block->i_dts += p_sys->i_delay;
p_block = p_block->p_next;
}
- sout_stream_id_t *newid = NULL;
+ sout_stream_id_sys_t *newid = NULL;
if( p_sys->b_placeholder )
{
switch( p_bridge->pp_es[i]->fmt.i_cat )
( p_bridge->pp_es[i]->fmt.i_cat == VIDEO_ES &&
p_bridge->pp_es[i]->p_block->i_flags & BLOCK_FLAG_TYPE_I ) )
{
- p_sys->p_out->pf_send( p_sys->p_out,
+ p_stream->p_next->pf_send( p_stream->p_next,
newid,
p_bridge->pp_es[i]->p_block );
p_sys->i_state = placeholder_off;
break;
p_sys->i_last_audio = i_date;
default:
- p_sys->p_out->pf_send( p_sys->p_out,
+ p_stream->p_next->pf_send( p_stream->p_next,
newid?newid:p_bridge->pp_es[i]->id,
p_bridge->pp_es[i]->p_block );
break;
}
}
else /* !b_placeholder */
- p_sys->p_out->pf_send( p_sys->p_out,
+ p_stream->p_next->pf_send( p_stream->p_next,
p_bridge->pp_es[i]->id,
p_bridge->pp_es[i]->p_block );
}
|| p_buffer->i_flags & BLOCK_FLAG_TYPE_I ) )
|| p_sys->i_state == placeholder_on )
{
- p_sys->p_out->pf_send( p_sys->p_out, id->id, p_buffer );
+ p_stream->p_next->pf_send( p_stream->p_next, id->id, p_buffer );
p_sys->i_state = placeholder_on;
}
else
case AUDIO_ES:
if( p_sys->i_last_audio + p_sys->i_placeholder_delay < i_date )
- p_sys->p_out->pf_send( p_sys->p_out, id->id, p_buffer );
+ p_stream->p_next->pf_send( p_stream->p_next, id->id, p_buffer );
else
block_Release( p_buffer );
break;
}
}
- vlc_mutex_unlock( p_sys->p_lock );
+ vlc_mutex_unlock( &lock );
return VLC_SUCCESS;
}
projects / vlc / blobdiff