X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fstream_out%2Fstandard.c;h=ab569a6e200c01737803809999a06a556cff94f3;hb=65abf030acb9d0e88b0e3e36666ab5d2c5b613db;hp=3d55e4e62417cc2eddfff20fe32c7290c4ea690c;hpb=8547ffaaeb80e961f0d5a415e863f9f2226629a4;p=vlc diff --git a/modules/stream_out/standard.c b/modules/stream_out/standard.c index 3d55e4e624..ab569a6e20 100644 --- a/modules/stream_out/standard.c +++ b/modules/stream_out/standard.c @@ -1,7 +1,7 @@ /***************************************************************************** * standard.c: standard stream output module ***************************************************************************** - * Copyright (C) 2003-2004 VideoLAN + * Copyright (C) 2003-2004 the VideoLAN team * $Id$ * * Authors: Laurent Aimar @@ -18,7 +18,7 @@ * * 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. *****************************************************************************/ /***************************************************************************** @@ -26,40 +26,92 @@ *****************************************************************************/ #include #include -#include #include #include -#include "announce.h" -#define DEFAULT_IPV6_SCOPE "8" +#include "network.h" +#include "vlc_url.h" /***************************************************************************** - * Exported prototypes + * Module descriptor *****************************************************************************/ +#define ACCESS_TEXT N_("Output access method") +/// \bug [String] "Output method to use for the stream." +#define ACCESS_LONGTEXT N_( \ + "This is the output access method that will be used." ) +#define MUX_TEXT N_("Output muxer") +/// \bug [String] "Muxer to use for the stream." +#define MUX_LONGTEXT N_( \ + "This is the muxer that will be used." ) +#define DST_TEXT N_("Output destination") +/// \bug [String] "Destination (URL) to use for the stream." +#define DST_LONGTEXT N_( \ + "This is the destination (URL) that will be used for the stream." ) +#define NAME_TEXT N_("Session name") +#define NAME_LONGTEXT N_( \ + "This allows you to specify a name for the session, that will be announced "\ + "if you choose to use SAP." ) + +#define GROUP_TEXT N_("Session groupname") +#define GROUP_LONGTEXT N_( \ + "This allows you to specify a group for the session, that will be announced "\ + "if you choose to use SAP." ) + +#define SAP_TEXT N_("SAP announcing") +#define SAP_LONGTEXT N_("Announce this session with SAP.") + static int Open ( vlc_object_t * ); static void Close ( vlc_object_t * ); -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* ); +#define SOUT_CFG_PREFIX "sout-standard-" -/***************************************************************************** - * Module descriptor - *****************************************************************************/ vlc_module_begin(); + 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 "dst", "", NULL, DST_TEXT, + DST_LONGTEXT, VLC_FALSE ); + add_deprecated( SOUT_CFG_PREFIX "url", 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" ); + set_callbacks( Open, Close ); vlc_module_end(); + +/***************************************************************************** + * Exported prototypes + *****************************************************************************/ +static const char *ppsz_sout_options[] = { + "access", "mux", "url", "dst", + "sap", "name", "group", 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; }; /***************************************************************************** @@ -69,32 +121,43 @@ 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; - slp_session_t *p_slp = NULL; - sap_session_t *p_sap = 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; - msg_Dbg( p_this, "creating `%s/%s://%s'", - psz_access, psz_mux, psz_url ); + config_ChainParse( 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 ) 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 ) free( val.psz_string ); + + + var_Get( p_stream, SOUT_CFG_PREFIX "dst", &val ); + psz_url = *val.psz_string ? val.psz_string : NULL; + if( !*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 */ + /* by extension */ static struct { char *ext; char *mux; } exttomux[] = { { "avi", "avi" }, @@ -112,12 +175,13 @@ static int Open( vlc_object_t *p_this ) { "mpeg","ps" }, { "ps", "ps" }, { "mpeg1","mpeg1" }, + { "wav","wav" }, { NULL, NULL } }; char *psz_ext = strrchr( psz_url, '.' ) + 1; int i; - msg_Dbg( p_this, "extention is %s", psz_ext ); + msg_Dbg( p_this, "extension is %s", psz_ext ); for( i = 0; exttomux[i].ext != NULL; i++ ) { if( !strcasecmp( psz_ext, exttomux[i].ext ) ) @@ -126,21 +190,20 @@ static int Open( vlc_object_t *p_this ) break; } } - msg_Dbg( p_this, "extention -> mux=%s", psz_mux_byext ); + msg_Dbg( p_this, "extension -> mux=%s", psz_mux_byext ); } /* 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", + "no access _and_ no muxer, extension 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 { @@ -149,42 +212,47 @@ static int Open( vlc_object_t *p_this ) } } - if( psz_access && *psz_access && - ( psz_mux == NULL || *psz_mux == '\0' ) ) + if( psz_access && !psz_mux ) { /* access given, no mux */ if( !strncmp( psz_access, "mmsh", 4 ) ) { - psz_mux = "asfh"; + psz_mux = strdup("asfh"); + } + else if( !strncmp( psz_access, "udp", 3 ) || + !strncmp( psz_access, "rtp", 3 ) ) + { + psz_mux = strdup("ts"); } - else if( !strncmp( psz_access, "udp", 3 ) ) + 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 extension" ); + 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( !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( !strncmp( psz_access, "mmsh", 4 ) && strncmp( psz_mux, "asfh", 4 ) ) + if( !strncmp( psz_access, "mmsh", 4 ) && + strncmp( psz_mux, "asfh", 4 ) ) { char *p = strchr( psz_mux,'{' ); @@ -197,7 +265,7 @@ static int Open( vlc_object_t *p_this ) } else { - psz_mux = "asfh"; + psz_mux = strdup("asfh"); } } else if( ( !strncmp( psz_access, "rtp", 3 ) || @@ -222,7 +290,9 @@ static int Open( vlc_object_t *p_this ) { 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" ); @@ -234,70 +304,73 @@ 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( 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 ) - { - psz_ipv = "4"; - } - if( psz_v6_scope == 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_v6_scope = DEFAULT_IPV6_SCOPE; + p_session->psz_name = strdup( psz_url ); + free( val.psz_string ); } - msg_Dbg( p_sout , "Creating SAP with IPv%i", atoi(psz_ipv) ); - 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 ); + 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 ); - if( !p_sap ) - msg_Err( p_sout,"Unable to initialize SAP. SAP disabled"); - } + /* Now, parse the URL to extract host and port */ + vlc_UrlParse( &url, psz_url , 0); - /* *** Register with slp *** */ -#ifdef HAVE_SLP_H - if( p_slp_cfg && ( strstr( psz_access, "udp" ) || - strstr( psz_access , "rtp" ) ) ) - { - 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) ) + if( url.psz_host ) { - msg_Warn( p_sout, "SLP Registering failed"); - } - else - { - p_slp = (slp_session_t*)malloc(sizeof(slp_session_t)); - if(!p_slp) - { - msg_Warn(p_sout,"Out of memory"); - if( p_sap ) free( p_sap ); - return -1; - } - p_slp->psz_url= strdup(psz_url); - p_slp->psz_name = strdup( - p_slp_cfg->psz_value ? p_slp_cfg->psz_value : psz_url); + 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; + + var_Get( p_access, "sout-udp-ttl", &val ); + p_session->i_ttl = val.i_int; + p_session->i_payload = 33; + p_session->b_rtp = strstr( psz_access, "rtp") ? 1 : 0; + + 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 ); + + free( p_method ); } -#endif p_stream->pf_add = Add; p_stream->pf_del = Del; p_stream->pf_send = Send; - p_stream->p_sys = malloc( sizeof( sout_stream_sys_t) ); p_stream->p_sys->p_mux = p_mux; - p_stream->p_sys->p_slp = p_slp; - p_stream->p_sys->p_sap = p_sap; + + if( psz_access ) free( psz_access ); + if( psz_mux ) free( psz_mux ); + if( psz_url ) free( psz_url ); + return VLC_SUCCESS; } @@ -311,18 +384,11 @@ static void Close( vlc_object_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 ); - -#ifdef HAVE_SLP_H - if( p_sys->p_slp ) + if( p_sys->p_session != NULL ) { - sout_SLPDereg( (sout_instance_t *)p_this, - p_sys->p_slp->psz_url, - p_sys->p_slp->psz_name); - free( p_sys->p_slp); + sout_AnnounceUnRegister( p_stream->p_sout, p_sys->p_session ); + sout_AnnounceSessionDestroy( p_sys->p_session ); } -#endif sout_MuxDelete( p_sys->p_mux ); @@ -368,12 +434,8 @@ 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->p_sap ) - sout_SAPSend( p_sout , p_sys->p_sap ); - return VLC_SUCCESS; }