/*****************************************************************************
- * standard.c
+ * standard.c: standard stream output module
*****************************************************************************
- * Copyright (C) 2001, 2002 VideoLAN
- * $Id: standard.c,v 1.13 2003/08/28 21:02:14 fenrir Exp $
+ * Copyright (C) 2003-2004 the VideoLAN team
+ * $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
*****************************************************************************/
#include <stdlib.h>
#include <string.h>
-#include <unistd.h>
#include <vlc/vlc.h>
#include <vlc/sout.h>
-#include "announce.h"
-#define DEFAULT_IPV6_SCOPE "8"
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
+#include "announce.h"
+#include "network.h"
/*****************************************************************************
- * Exported prototypes
+ * Module descriptor
*****************************************************************************/
+#define ACCESS_TEXT N_("Output access method")
+#define ACCESS_LONGTEXT N_( \
+ "Allows you to specify the output access method used for the streaming " \
+ "output." )
+#define MUX_TEXT N_("Output muxer")
+#define MUX_LONGTEXT N_( \
+ "Allows you to specify the output muxer method used for the streaming " \
+ "output." )
+#define URL_TEXT N_("Output URL")
+#define URL_LONGTEXT N_( \
+ "Allows you to specify the output URL used for the streaming output." )
+
+#define NAME_TEXT N_("Session name")
+#define NAME_LONGTEXT N_( \
+ "Name of the session that will be announced with SAP or SLP" )
+
+#define GROUP_TEXT N_("Session groupname")
+#define GROUP_LONGTEXT N_( \
+ "Name of the group that will be announced for the session" )
+
+#define SAP_TEXT N_("SAP announcing")
+#define SAP_LONGTEXT N_("Announce this session with SAP")
+
+#define SLP_TEXT N_("SLP announcing")
+#define SLP_LONGTEXT N_("Announce this session with SLP")
+
static int Open ( vlc_object_t * );
static void Close ( vlc_object_t * );
-static sout_stream_id_t *Add ( sout_stream_t *, sout_format_t * );
-static int Del ( sout_stream_t *, sout_stream_id_t * );
-static int Send( sout_stream_t *, sout_stream_id_t *, sout_buffer_t* );
+#define SOUT_CFG_PREFIX "sout-standard-"
-/*****************************************************************************
- * Module descriptor
- *****************************************************************************/
vlc_module_begin();
- set_description( _("Standard stream") );
+ set_shortname( _("Standard"));
+ set_description( _("Standard stream output") );
set_capability( "sout stream", 50 );
add_shortcut( "standard" );
add_shortcut( "std" );
+ set_category( CAT_SOUT );
+ set_subcategory( SUBCAT_SOUT_STREAM );
+
+ add_string( SOUT_CFG_PREFIX "access", "", NULL, ACCESS_TEXT,
+ ACCESS_LONGTEXT, VLC_FALSE );
+ add_string( SOUT_CFG_PREFIX "mux", "", NULL, MUX_TEXT,
+ MUX_LONGTEXT, VLC_FALSE );
+ add_string( SOUT_CFG_PREFIX "url", "", NULL, URL_TEXT,
+ URL_LONGTEXT, VLC_FALSE );
+
+ add_bool( SOUT_CFG_PREFIX "sap", 0, NULL, SAP_TEXT, SAP_LONGTEXT, VLC_TRUE );
+ add_string( SOUT_CFG_PREFIX "name", "", NULL, NAME_TEXT, NAME_LONGTEXT,
+ VLC_TRUE );
+ add_string( SOUT_CFG_PREFIX "group", "", NULL, GROUP_TEXT, GROUP_LONGTEXT,
+ VLC_TRUE );
+ add_suppressed_bool( SOUT_CFG_PREFIX "sap-ipv6" );
+
+ add_bool( SOUT_CFG_PREFIX "slp", 0, NULL, SLP_TEXT, SLP_LONGTEXT, VLC_TRUE );
+
set_callbacks( Open, Close );
vlc_module_end();
+
+/*****************************************************************************
+ * Exported prototypes
+ *****************************************************************************/
+static const char *ppsz_sout_options[] = {
+ "access", "mux", "url",
+ "sap", "name", "group", "slp", NULL
+};
+
+#define DEFAULT_PORT 1234
+
+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_mux_t *p_mux;
slp_session_t *p_slp;
- sap_session_t *p_sap;
+ session_descriptor_t *p_session;
};
/*****************************************************************************
{
sout_stream_t *p_stream = (sout_stream_t*)p_this;
sout_instance_t *p_sout = p_stream->p_sout;
- sout_stream_sys_t *p_sys = malloc( sizeof( sout_stream_sys_t) );
+ slp_session_t *p_slp = NULL;
- char *psz_mux = sout_cfg_find_value( p_stream->p_cfg, "mux" );
- char *psz_access = sout_cfg_find_value( p_stream->p_cfg, "access" );
- char *psz_url = sout_cfg_find_value( p_stream->p_cfg, "url" );
- char *psz_ipv = sout_cfg_find_value( p_stream->p_cfg, "sap_ipv" );
- char *psz_v6_scope = sout_cfg_find_value( p_stream->p_cfg, "sap_v6scope" );
+ char *psz_mux;
+ char *psz_access;
+ char *psz_url;
- sout_cfg_t *p_sap_cfg = sout_cfg_find( p_stream->p_cfg, "sap" );
-#ifdef HAVE_SLP_H
- sout_cfg_t *p_slp_cfg = sout_cfg_find( p_stream->p_cfg, "slp" );
-#endif
+ vlc_value_t val;
sout_access_out_t *p_access;
sout_mux_t *p_mux;
char *psz_mux_byext = NULL;
- p_sys->p_sap = NULL;
- p_sys->p_slp = NULL;
+ sout_CfgParse( p_stream, SOUT_CFG_PREFIX, ppsz_sout_options,
+ p_stream->p_cfg );
+
+ var_Get( p_stream, SOUT_CFG_PREFIX "access", &val );
+ psz_access = *val.psz_string ? val.psz_string : NULL;
+ if( val.psz_string && !*val.psz_string ) free( val.psz_string );
- msg_Dbg( p_this, "creating `%s/%s://%s'",
- psz_access, psz_mux, psz_url );
+ var_Get( p_stream, SOUT_CFG_PREFIX "mux", &val );
+ psz_mux = *val.psz_string ? val.psz_string : NULL;
+ if( val.psz_string && !*val.psz_string ) free( val.psz_string );
+
+ var_Get( p_stream, SOUT_CFG_PREFIX "url", &val );
+ psz_url = *val.psz_string ? val.psz_string : NULL;
+ if( val.psz_string && !*val.psz_string ) free( val.psz_string );
+
+ p_stream->p_sys = malloc( sizeof( sout_stream_sys_t) );
+ p_stream->p_sys->p_session = NULL;
+
+ msg_Dbg( p_this, "creating `%s/%s://%s'", psz_access, psz_mux, psz_url );
/* ext -> muxer name */
if( psz_url && strrchr( psz_url, '.' ) )
{ "wma", "asf" },
{ "wmv", "asf" },
{ "trp", "ts" },
+ { "ts", "ts" },
{ "mpg", "ps" },
{ "mpeg","ps" },
+ { "ps", "ps" },
{ "mpeg1","mpeg1" },
{ NULL, NULL }
};
/* We fix access/mux to valid couple */
- if( ( psz_access == NULL || *psz_access == '\0' )&&
- ( psz_mux == NULL || *psz_mux == '\0' ) )
+ if( !psz_access && !psz_mux )
{
if( psz_mux_byext )
{
msg_Warn( p_stream,
"no access _and_ no muxer, extention gives file/%s",
psz_mux_byext );
- psz_access = "file";
- psz_mux = psz_mux_byext;
+ psz_access = strdup("file");
+ psz_mux = strdup(psz_mux_byext);
}
else
{
}
}
- if( psz_access && *psz_access &&
- ( psz_mux == NULL || *psz_mux == '\0' ) )
+ if( psz_access && !psz_mux )
{
/* access given, no mux */
- if( !strcmp( psz_access, "mmsh" ) )
+ if( !strncmp( psz_access, "mmsh", 4 ) )
+ {
+ psz_mux = strdup("asfh");
+ }
+ else if( !strncmp( psz_access, "udp", 3 ) )
{
- psz_mux = "asfh";
+ psz_mux = strdup("ts");
}
- else if( !strcmp( psz_access, "udp" ) )
+ else if( psz_mux_byext )
{
- psz_mux = "ts";
+ psz_mux = strdup(psz_mux_byext);
}
else
{
- psz_mux = psz_mux_byext;
+ msg_Err( p_stream, "no mux specified or found by extention" );
+ return VLC_EGENERIC;
}
}
- else if( psz_mux && *psz_mux &&
- ( psz_access == NULL || *psz_access == '\0' ) )
+ else if( psz_mux && !psz_access )
{
/* mux given, no access */
- if( !strcmp( psz_mux, "asfh" ) )
+ if( !strncmp( psz_mux, "asfh", 4 ) )
{
- psz_access = "mmsh";
+ psz_access = strdup("mmsh");
}
else
{
/* default file */
- psz_access = "file";
+ psz_access = strdup("file");
}
}
- /* fix or warm of incompatible couple */
- if( psz_mux && *psz_mux && psz_access && *psz_access )
+ /* fix or warn of incompatible couple */
+ if( psz_mux && psz_access )
{
- if( !strcmp( psz_access, "mmsh" ) && strcmp( psz_mux, "asfh" ) )
+ if( !strncmp( psz_access, "mmsh", 4 ) &&
+ strncmp( psz_mux, "asfh", 4 ) )
{
+ char *p = strchr( psz_mux,'{' );
+
msg_Warn( p_stream, "fixing to mmsh/asfh" );
- psz_mux = "asfh";
+ if( p )
+ {
+ /* -> a little memleak but ... */
+ psz_mux = malloc( strlen( "asfh" ) + strlen( p ) + 1);
+ sprintf( psz_mux, "asfh%s", p );
+ }
+ else
+ {
+ psz_mux = strdup("asfh");
+ }
}
- else if( ( !strcmp( psz_access, "rtp" ) ||
- !strcmp( psz_access, "udp" ) ) &&
+ else if( ( !strncmp( psz_access, "rtp", 3 ) ||
+ !strncmp( psz_access, "udp", 3 ) ) &&
strncmp( psz_mux, "ts", 2 ) )
{
msg_Err( p_stream, "for now udp and rtp are only valid with TS" );
}
- else if( strcmp( psz_access, "file" ) &&
- ( !strcmp( psz_mux, "mov" ) || !strcmp( psz_mux, "mp4" ) ) )
+ else if( strncmp( psz_access, "file", 4 ) &&
+ ( !strncmp( psz_mux, "mov", 3 ) ||
+ !strncmp( psz_mux, "mp4", 3 ) ) )
{
msg_Err( p_stream, "mov and mp4 work only with file output" );
}
{
msg_Err( p_stream, "no suitable sout access module for `%s/%s://%s'",
psz_access, psz_mux, psz_url );
- return( VLC_EGENERIC );
+ if( psz_access ) free( psz_access );
+ if( psz_mux ) free( psz_mux );
+ return VLC_EGENERIC;
}
msg_Dbg( p_stream, "access opened" );
psz_access, psz_mux, psz_url );
sout_AccessOutDelete( p_access );
- return( VLC_EGENERIC );
+ if( psz_access ) free( psz_access );
+ if( psz_mux ) free( psz_mux );
+ return VLC_EGENERIC;
}
msg_Dbg( p_stream, "mux opened" );
/* *** Create the SAP Session structure *** */
- if( psz_access &&
- p_sap_cfg &&
- ( strstr( psz_access, "udp" ) || strstr( psz_access , "rtp" ) ) )
+ var_Get( p_stream, SOUT_CFG_PREFIX "sap", &val );
+ if( val.b_bool &&
+ ( strstr( psz_access, "udp" ) || strstr( psz_access , "rtp" ) ) )
{
- msg_Info( p_this, "SAP Enabled");
-
- if( psz_ipv == NULL )
+ session_descriptor_t *p_session = sout_AnnounceSessionCreate();
+ announce_method_t *p_method =
+ sout_AnnounceMethodCreate( METHOD_TYPE_SAP );
+ vlc_url_t url;
+
+ var_Get( p_stream, SOUT_CFG_PREFIX "name", &val );
+ if( *val.psz_string )
+ p_session->psz_name = val.psz_string;
+ else
{
- psz_ipv = "4";
+ p_session->psz_name = strdup( psz_url );
+ free( val.psz_string );
}
- if( psz_v6_scope == NULL )
+
+ var_Get( p_stream, SOUT_CFG_PREFIX "group", &val );
+ if( *val.psz_string )
+ p_session->psz_group = val.psz_string;
+ else
+ free( val.psz_string );
+
+ /* Now, parse the URL to extract host and port */
+ vlc_UrlParse( &url, psz_url , 0);
+
+ if( url.psz_host )
{
- psz_v6_scope = DEFAULT_IPV6_SCOPE;
- }
- msg_Dbg( p_sout , "Creating SAP with IPv%i", atoi(psz_ipv) );
+ if( url.i_port == 0 ) url.i_port = DEFAULT_PORT;
+
+ p_session->psz_uri = strdup( url.psz_host );
+ p_session->i_port = url.i_port;
+ p_session->psz_sdp = NULL;
- p_sys->p_sap = sout_SAPNew( p_sout , psz_url ,
- p_sap_cfg->psz_value ? p_sap_cfg->psz_value : psz_url,
- atoi(psz_ipv), psz_v6_scope );
+ p_session->i_ttl = config_GetInt( p_sout, "ttl" );
+ p_session->i_payload = 33;
- if( !p_sys->p_sap )
- msg_Err( p_sout,"Unable to initialize SAP. SAP disabled");
+ msg_Info( p_this, "SAP Enabled");
+
+ sout_AnnounceRegister( p_sout, p_session, p_method );
+ p_stream->p_sys->p_session = p_session;
+ }
+ vlc_UrlClean( &url );
+
+ /* FIXME: Free p_method */
+ if( p_method->psz_address) free( p_method->psz_address );
+ free( p_method );
}
/* *** Register with slp *** */
#ifdef HAVE_SLP_H
- if( p_slp_cfg && ( strstr( psz_access, "udp" ) ||
- strstr( psz_access , "rtp" ) ) )
+ var_Get( p_stream, SOUT_CFG_PREFIX "slp", &val );
+ if( val.b_bool &&
+ ( strstr( psz_access, "udp" ) || strstr( psz_access , "rtp" ) ) )
{
+ int i_ret;
+
msg_Info( p_this, "SLP Enabled");
- if( sout_SLPReg( p_sout, psz_url,
- p_slp_cfg->psz_value ? p_slp_cfg->psz_value : psz_url) )
+ var_Get( p_stream, SOUT_CFG_PREFIX "name", &val );
+ if( *val.psz_string )
+ {
+ i_ret = sout_SLPReg( p_sout, psz_url, val.psz_string );
+ }
+ else
+ {
+ i_ret = sout_SLPReg( p_sout, psz_url, psz_url );
+ }
+
+ if( i_ret )
{
msg_Warn( p_sout, "SLP Registering failed");
}
else
{
- p_sys->p_slp = (slp_session_t*)malloc(sizeof(slp_session_t));
- if(!p_sys->p_slp)
- {
- msg_Warn(p_sout,"Out of memory");
- return -1;
- }
- p_sys->p_slp->psz_url= strdup(psz_url);
- p_sys->p_slp->psz_name = strdup(
- p_slp_cfg->psz_value ? p_slp_cfg->psz_value : psz_url);
+ p_slp = malloc(sizeof(slp_session_t));
+ p_slp->psz_url = strdup( psz_url );
+ p_slp->psz_name =
+ strdup( *val.psz_string ? val.psz_string : psz_url );
}
+ free( val.psz_string );
}
#endif
- /* XXX beurk */
- p_sout->i_preheader = __MAX( p_sout->i_preheader, p_mux->i_preheader );
-
-
- p_sys->p_mux = p_mux;
-
p_stream->pf_add = Add;
p_stream->pf_del = Del;
p_stream->pf_send = Send;
- p_stream->p_sys = p_sys;
+ p_stream->p_sys->p_mux = p_mux;
+ p_stream->p_sys->p_slp = p_slp;
+
+ if( psz_access ) free( psz_access );
+ if( psz_mux ) free( psz_mux );
+ if( psz_url ) free( psz_url );
+
+
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;
sout_access_out_t *p_access = p_sys->p_mux->p_access;
- if( p_sys->p_sap )
- sout_SAPDelete( (sout_instance_t *)p_this , p_sys->p_sap );
+ if( p_sys->p_session != NULL )
+ {
+ sout_AnnounceUnRegister( p_stream->p_sout, p_sys->p_session );
+ sout_AnnounceSessionDestroy( p_sys->p_session );
+ }
#ifdef HAVE_SLP_H
if( p_sys->p_slp )
};
-static sout_stream_id_t * Add( sout_stream_t *p_stream, sout_format_t *p_fmt )
+static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt )
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
sout_stream_id_t *id;
}
static int Send( sout_stream_t *p_stream, sout_stream_id_t *id,
- sout_buffer_t *p_buffer )
+ block_t *p_buffer )
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
- sout_instance_t *p_sout = p_stream->p_sout;
sout_MuxSendBuffer( p_sys->p_mux, id->p_input, p_buffer );
- if( p_sys->p_sap )
- sout_SAPSend( p_sout , p_sys->p_sap );
-
return VLC_SUCCESS;
}
projects / vlc / blobdiff