X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fstream_out%2Fstandard.c;h=5d2cc39b34ea037b839b982bfd60284795f7f583;hb=85b29bdc288a1573d43bd524908be5748a9b3640;hp=4b70ec95e6f32a9d3c85c5355196c03a0f12e37d;hpb=b861cc00ff8921f226ff64c272d3c92655d88cb2;p=vlc diff --git a/modules/stream_out/standard.c b/modules/stream_out/standard.c index 4b70ec95e6..5d2cc39b34 100644 --- a/modules/stream_out/standard.c +++ b/modules/stream_out/standard.c @@ -1,8 +1,8 @@ /***************************************************************************** - * standard.c + * standard.c: standard stream output module ***************************************************************************** - * Copyright (C) 2001, 2002 VideoLAN - * $Id: standard.c,v 1.7 2003/07/05 15:00:28 zorglub Exp $ + * Copyright (C) 2003-2004 VideoLAN (Centrale Réseaux) and its contributors + * $Id$ * * Authors: Laurent Aimar * @@ -26,40 +26,99 @@ *****************************************************************************/ #include #include -#include #include #include -#include -#define DEFAULT_IPV6_SCOPE "8" +#ifdef HAVE_UNISTD_H +# include +#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; - sap_session_t *p_sap; - vlc_bool_t b_sap; + slp_session_t *p_slp; + session_descriptor_t *p_session; }; /***************************************************************************** @@ -69,58 +128,176 @@ static int Open( vlc_object_t *p_this ) { 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) ); - - 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"); - sout_cfg_t *p_sap_cfg = sout_cfg_find( p_stream->p_cfg, "sap" ); - - - char *psz_sap = NULL; - - sap_session_t *p_sap = NULL; - - sout_access_out_t *p_access; - sout_mux_t *p_mux; - - p_sys->b_sap=0; - /* SAP is only valid for UDP or RTP streaming */ - if( psz_access == NULL ) - psz_access="udp"; - - if(p_sap_cfg && (strstr(psz_access,"udp") || strstr( psz_access , "rtp" ))) - { - msg_Info( p_this, "SAP Enabled"); - p_sys->b_sap=1; - if(p_sap_cfg->psz_value) - { - psz_sap = strdup( p_sap_cfg->psz_value ); + slp_session_t *p_slp = NULL; + + char *psz_mux; + char *psz_access; + char *psz_url; + + vlc_value_t val; + + sout_access_out_t *p_access; + sout_mux_t *p_mux; + + char *psz_mux_byext = 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 ); + + 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, '.' ) ) + { + /* by extention */ + static struct { char *ext; char *mux; } exttomux[] = + { + { "avi", "avi" }, + { "ogg", "ogg" }, + { "ogm", "ogg" }, + { "mp4", "mp4" }, + { "mov", "mov" }, + { "moov","mov" }, + { "asf", "asf" }, + { "wma", "asf" }, + { "wmv", "asf" }, + { "trp", "ts" }, + { "ts", "ts" }, + { "mpg", "ps" }, + { "mpeg","ps" }, + { "ps", "ps" }, + { "mpeg1","mpeg1" }, + { NULL, NULL } + }; + char *psz_ext = strrchr( psz_url, '.' ) + 1; + int i; + + msg_Dbg( p_this, "extention is %s", psz_ext ); + for( i = 0; exttomux[i].ext != NULL; i++ ) + { + if( !strcasecmp( psz_ext, exttomux[i].ext ) ) + { + psz_mux_byext = exttomux[i].mux; + break; + } + } + msg_Dbg( p_this, "extention -> mux=%s", psz_mux_byext ); + } + + /* We fix access/mux to valid couple */ + + 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 = strdup("file"); + psz_mux = strdup(psz_mux_byext); + } + else + { + msg_Err( p_stream, "no access _and_ no muxer (fatal error)" ); + return VLC_EGENERIC; + } + } + + if( psz_access && !psz_mux ) + { + /* access given, no mux */ + if( !strncmp( psz_access, "mmsh", 4 ) ) + { + psz_mux = strdup("asfh"); + } + else if( !strncmp( psz_access, "udp", 3 ) ) + { + psz_mux = strdup("ts"); + } + else if( psz_mux_byext ) + { + psz_mux = strdup(psz_mux_byext); + } + else + { + msg_Err( p_stream, "no mux specified or found by extention" ); + return VLC_EGENERIC; + } + } + else if( psz_mux && !psz_access ) + { + /* mux given, no access */ + if( !strncmp( psz_mux, "asfh", 4 ) ) + { + psz_access = strdup("mmsh"); } else { - psz_sap = strdup ( psz_url ); - } - } - - /* Get SAP IP version to use */ - if(psz_ipv == NULL) - psz_ipv = "4"; - if(psz_v6_scope == NULL) - psz_v6_scope= DEFAULT_IPV6_SCOPE; - - msg_Dbg( p_this, "creating `%s/%s://%s'", - psz_access, psz_mux, psz_url ); - + /* default file */ + psz_access = strdup("file"); + } + } + + /* fix or warn of incompatible couple */ + if( psz_mux && psz_access ) + { + if( !strncmp( psz_access, "mmsh", 4 ) && + strncmp( psz_mux, "asfh", 4 ) ) + { + char *p = strchr( psz_mux,'{' ); + + msg_Warn( p_stream, "fixing to mmsh/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( ( !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( 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_Dbg( p_this, "using `%s/%s://%s'", psz_access, psz_mux, psz_url ); + /* *** find and open appropriate access module *** */ p_access = sout_AccessOutNew( p_sout, psz_access, psz_url ); if( p_access == NULL ) { 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" ); @@ -132,50 +309,140 @@ static int Open( vlc_object_t *p_this ) 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(p_sys->b_sap) - { - msg_Dbg( p_sout , "Creating SAP with IPv%i",atoi(psz_ipv) ); - p_sap = sout_SAPNew( p_sout , psz_url , psz_sap, atoi(psz_ipv), psz_v6_scope ); - if(!p_sap) + var_Get( p_stream, SOUT_CFG_PREFIX "sap", &val ); + if( val.b_bool && + ( strstr( psz_access, "udp" ) || strstr( psz_access , "rtp" ) ) ) + { + 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 ) { - msg_Err( p_sout,"Unable to initialize SAP. SAP disabled"); - p_sys->b_sap=0; + p_session->psz_name = strdup( val.psz_string ); } - } - - /* XXX beurk */ - p_sout->i_preheader = __MAX( p_sout->i_preheader, p_mux->i_preheader ); + else + { + p_session->psz_name = strdup( psz_url ); + } + free( val.psz_string ); + + var_Get( p_stream, SOUT_CFG_PREFIX "group", &val ); + if( *val.psz_string ) + { + p_session->psz_group = strdup( val.psz_string ); + } + free( val.psz_string ); + /* Now, parse the URL to extract host and port */ + vlc_UrlParse( &url, psz_url , 0); + + if( url.psz_host ) + { + 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_session->i_ttl = config_GetInt( p_sout, "ttl" ); + p_session->i_payload = 33; + + 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 + 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"); + 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_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 - p_sys->p_mux = p_mux; - p_sys->p_sap = p_sap; - 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_stream_sys_t *p_sys = p_stream->p_sys; sout_access_out_t *p_access = p_sys->p_mux->p_access; - if(p_sys -> b_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 ) + { + sout_SLPDereg( (sout_instance_t *)p_this, + p_sys->p_slp->psz_url, + p_sys->p_slp->psz_name); + free( p_sys->p_slp); + } +#endif + sout_MuxDelete( p_sys->p_mux ); sout_AccessOutDelete( p_access ); @@ -189,7 +456,7 @@ struct sout_stream_id_t }; -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; @@ -205,7 +472,7 @@ static sout_stream_id_t * Add ( sout_stream_t *p_stream, sout_format_t *p_f return id; } -static int Del ( sout_stream_t *p_stream, sout_stream_id_t *id ) +static int Del( sout_stream_t *p_stream, sout_stream_id_t *id ) { sout_stream_sys_t *p_sys = p_stream->p_sys; @@ -216,18 +483,12 @@ static int Del ( sout_stream_t *p_stream, sout_stream_id_t *id ) return VLC_SUCCESS; } -static int Send ( sout_stream_t *p_stream, sout_stream_id_t *id, sout_buffer_t *p_buffer ) +static int Send( sout_stream_t *p_stream, sout_stream_id_t *id, + 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 -> b_sap) - sout_SAPSend( p_sout , p_sys->p_sap ); - return VLC_SUCCESS; } -