X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fstream_out%2Fstandard.c;h=477537c605a3a07864328ac5a3e40d66c61dc70d;hb=264bde566bb3ecee4700db7fd2f38b27f05d1ea4;hp=a8a1a32afa7c58efbf52a44641404b5c1aef44ac;hpb=2cb472dba008f7d877ffe6bae9c5575253365282;p=vlc diff --git a/modules/stream_out/standard.c b/modules/stream_out/standard.c index a8a1a32afa..477537c605 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 the VideoLAN team + * Copyright (C) 2003-2007 the VideoLAN team * $Id$ * * Authors: Laurent Aimar @@ -24,48 +24,56 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include - #include -#include +#include -#ifdef HAVE_UNISTD_H -# include -#endif -#include "network.h" +#include +#include "vlc_url.h" /***************************************************************************** * 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." ) + "Output method to use for the stream." ) #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 (deprecated)") -#define URL_LONGTEXT N_( \ - "Allows you to specify the output URL used for the streaming output." \ - "Deprecated, use dst instead." ) - + "Muxer to use for the stream." ) #define DST_TEXT N_("Output destination") #define DST_LONGTEXT N_( \ - "Allows you to specify the output destination used for the streaming output." ) - + "Destination (URL) to use for the stream." ) #define NAME_TEXT N_("Session name") #define NAME_LONGTEXT N_( \ - "Name of the session that will be announced with SAP" ) + "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_( \ - "Name of the group that will be announced for the session" ) + "This allows you to specify a group for the session, that will be announced "\ + "if you choose to use SAP." ) + +#define DESC_TEXT N_("Session descriptipn") +#define DESC_LONGTEXT N_( \ + "This allows you to give a short description with details about the stream, " \ + "that will be announced in the SDP (Session Descriptor)." ) +#define URL_TEXT N_("Session URL") +#define URL_LONGTEXT N_( \ + "This allows you to give an URL with more details about the stream " \ + "(often the website of the streaming organization), that will " \ + "be announced in the SDP (Session Descriptor)." ) +#define EMAIL_TEXT N_("Session email") +#define EMAIL_LONGTEXT N_( \ + "This allows you to give a contact mail address for the stream, that will " \ + "be announced in the SDP (Session Descriptor)." ) +#define PHONE_TEXT N_("Session phone number") +#define PHONE_LONGTEXT N_( \ + "This allows you to give a contact telephone number for the stream, that will " \ + "be announced in the SDP (Session Descriptor)." ) + #define SAP_TEXT N_("SAP announcing") -#define SAP_LONGTEXT N_("Announce this session with SAP") +#define SAP_LONGTEXT N_("Announce this session with SAP.") static int Open ( vlc_object_t * ); static void Close ( vlc_object_t * ); @@ -85,17 +93,24 @@ vlc_module_begin(); 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_string( SOUT_CFG_PREFIX "dst", "", NULL, DST_TEXT, DST_LONGTEXT, VLC_FALSE ); - add_bool( SOUT_CFG_PREFIX "sap", 0, NULL, SAP_TEXT, SAP_LONGTEXT, VLC_TRUE ); + add_bool( SOUT_CFG_PREFIX "sap", VLC_FALSE, 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_string( SOUT_CFG_PREFIX "description", "", NULL, DESC_TEXT, DESC_LONGTEXT, + VLC_TRUE ); + add_string( SOUT_CFG_PREFIX "url", "", NULL, URL_TEXT, URL_LONGTEXT, + VLC_TRUE ); + add_string( SOUT_CFG_PREFIX "email", "", NULL, EMAIL_TEXT, EMAIL_LONGTEXT, + VLC_TRUE ); + add_string( SOUT_CFG_PREFIX "phone", "", NULL, PHONE_TEXT, PHONE_LONGTEXT, + VLC_TRUE ); + add_obsolete_bool( SOUT_CFG_PREFIX "sap-ipv6" ); set_callbacks( Open, Close ); vlc_module_end(); @@ -106,7 +121,7 @@ vlc_module_end(); *****************************************************************************/ static const char *ppsz_sout_options[] = { "access", "mux", "url", "dst", - "sap", "name", "group", NULL + "sap", "name", "group", "description", "url", "email", "phone", NULL }; #define DEFAULT_PORT 1234 @@ -128,6 +143,7 @@ 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; char *psz_mux; char *psz_access; @@ -138,9 +154,9 @@ static int Open( vlc_object_t *p_this ) sout_access_out_t *p_access; sout_mux_t *p_mux; - char *psz_mux_byext = NULL; + const char *psz_mux_byext = NULL; - sout_CfgParse( p_stream, SOUT_CFG_PREFIX, ppsz_sout_options, + config_ChainParse( p_stream, SOUT_CFG_PREFIX, ppsz_sout_options, p_stream->p_cfg ); var_Get( p_stream, SOUT_CFG_PREFIX "access", &val ); @@ -155,15 +171,8 @@ static int Open( vlc_object_t *p_this ) 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 ); - if( !psz_url ) - { - /* XXX dst take preference over url (url will be removed later) */ - var_Get( p_stream, SOUT_CFG_PREFIX "url", &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_sys = 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 ); @@ -171,8 +180,8 @@ static int Open( vlc_object_t *p_this ) /* ext -> muxer name */ if( psz_url && strrchr( psz_url, '.' ) ) { - /* by extention */ - static struct { char *ext; char *mux; } exttomux[] = + /* by extension */ + static struct { const char ext[6]; const char mux[32]; } exttomux[] = { { "avi", "avi" }, { "ogg", "ogg" }, @@ -189,14 +198,16 @@ static int Open( vlc_object_t *p_this ) { "mpeg","ps" }, { "ps", "ps" }, { "mpeg1","mpeg1" }, - { "wav","wav" }, - { NULL, NULL } + { "wav", "wav" }, + { "flv", "ffmpeg{mux=flv}" }, + { "mkv", "ffmpeg{mux=matroska}"}, + { "", "" } }; - char *psz_ext = strrchr( psz_url, '.' ) + 1; + const 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++ ) + msg_Dbg( p_this, "extension is %s", psz_ext ); + for( i = 0; exttomux[i].ext[0]; i++ ) { if( !strcasecmp( psz_ext, exttomux[i].ext ) ) { @@ -204,7 +215,7 @@ 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 */ @@ -214,7 +225,7 @@ static int Open( vlc_object_t *p_this ) 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 = strdup("file"); psz_mux = strdup(psz_mux_byext); @@ -233,8 +244,8 @@ static int Open( vlc_object_t *p_this ) { psz_mux = strdup("asfh"); } - else if( !strncmp( psz_access, "udp", 3 ) || - !strncmp( psz_access, "rtp", 3 ) ) + else if (!strcmp (psz_access, "udp") + || !strcmp (psz_access, "rtp")) { psz_mux = strdup("ts"); } @@ -244,7 +255,7 @@ static int Open( vlc_object_t *p_this ) } else { - msg_Err( p_stream, "no mux specified or found by extention" ); + msg_Err( p_stream, "no mux specified or found by extension" ); return VLC_EGENERIC; } } @@ -263,38 +274,37 @@ static int Open( vlc_object_t *p_this ) } /* 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,'{' ); + 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_Warn( p_stream, "fixing to mmsh/asfh" ); + if( p ) { - msg_Err( p_stream, "for now udp and rtp are only valid with TS" ); + if( asprintf( &p, "asfh%s", p ) == -1 ) + p = NULL; + free( psz_mux ); + psz_mux = p; } - else if( strncmp( psz_access, "file", 4 ) && - ( !strncmp( psz_mux, "mov", 3 ) || - !strncmp( psz_mux, "mp4", 3 ) ) ) + else { - msg_Err( p_stream, "mov and mp4 work only with file output" ); + free( psz_mux ); + 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, "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 ); @@ -304,8 +314,8 @@ 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 ); - if( psz_access ) free( psz_access ); - if( psz_mux ) free( psz_mux ); + free( psz_access ); + free( psz_mux ); return VLC_EGENERIC; } msg_Dbg( p_stream, "access opened" ); @@ -318,74 +328,73 @@ static int Open( vlc_object_t *p_this ) psz_access, psz_mux, psz_url ); sout_AccessOutDelete( p_access ); - if( psz_access ) free( psz_access ); - if( psz_mux ) free( psz_mux ); + free( psz_access ); + free( psz_mux ); return VLC_EGENERIC; } msg_Dbg( p_stream, "mux opened" ); - /* *** Create the SAP Session structure *** */ - var_Get( p_stream, SOUT_CFG_PREFIX "sap", &val ); - if( val.b_bool && - ( strstr( psz_access, "udp" ) || strstr( psz_access , "rtp" ) ) ) + /* *** Create the SAP Session structure *** */ + if( var_GetBool( p_stream, SOUT_CFG_PREFIX"sap" ) ) { - 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 + /* Create the SDP */ + char *shost = var_GetNonEmptyString (p_access, "src-addr"); + char *dhost = var_GetNonEmptyString (p_access, "dst-addr"); + int sport = var_GetInteger (p_access, "src-port"); + int dport = var_GetInteger (p_access, "dst-port"); + struct sockaddr_storage src, dst; + socklen_t srclen = 0, dstlen = 0; + + struct addrinfo *res; + if (vlc_getaddrinfo (VLC_OBJECT (p_stream), dhost, dport, NULL, &res) == 0) { - p_session->psz_name = strdup( psz_url ); - free( val.psz_string ); + memcpy (&dst, res->ai_addr, dstlen = res->ai_addrlen); + vlc_freeaddrinfo (res); } - 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 ) + if (vlc_getaddrinfo (VLC_OBJECT (p_stream), shost, sport, NULL, &res) == 0) { - if( url.i_port == 0 ) url.i_port = DEFAULT_PORT; + memcpy (&src, res->ai_addr, srclen = res->ai_addrlen); + vlc_freeaddrinfo (res); + } - p_session->psz_uri = strdup( url.psz_host ); - p_session->i_port = url.i_port; - p_session->psz_sdp = NULL; + char *head = vlc_sdp_Start (VLC_OBJECT (p_stream), SOUT_CFG_PREFIX, + (struct sockaddr *)&src, srclen, + (struct sockaddr *)&dst, dstlen); + free (shost); - var_Get( p_access, "sout-udp-ttl", &val ); - p_session->i_ttl = val.i_int ? - val.i_int : config_GetInt( p_sout, "ttl" ); - p_session->i_payload = 33; - p_session->b_rtp = strstr( psz_access, "rtp") ? 1 : 0; + char *psz_sdp = NULL; + if (head != NULL) + { + if (asprintf (&psz_sdp, "%s" + "m=video %d udp mpeg\r\n", head, dport) == -1) + psz_sdp = NULL; + free (head); + } - msg_Info( p_this, "SAP Enabled"); + /* Register the SDP with the SAP thread */ + if (psz_sdp != NULL) + { + announce_method_t *p_method = sout_SAPMethod (); + msg_Dbg (p_stream, "Generated SDP:\n%s", psz_sdp); - sout_AnnounceRegister( p_sout, p_session, p_method ); - p_stream->p_sys->p_session = p_session; + p_sys->p_session = + sout_AnnounceRegisterSDP (p_sout, SOUT_CFG_PREFIX, psz_sdp, + dhost, p_method); + sout_MethodRelease (p_method); } - vlc_UrlClean( &url ); - - free( p_method ); + free (dhost); } p_stream->pf_add = Add; p_stream->pf_del = Del; p_stream->pf_send = Send; - p_stream->p_sys->p_mux = p_mux; - - if( psz_access ) free( psz_access ); - if( psz_mux ) free( psz_mux ); - if( psz_url ) free( psz_url ); + p_sys->p_mux = p_mux; + free( psz_access ); + free( psz_mux ); + free( psz_url ); return VLC_SUCCESS; } @@ -400,11 +409,7 @@ static void Close( vlc_object_t * p_this ) sout_access_out_t *p_access = p_sys->p_mux->p_access; if( p_sys->p_session != NULL ) - { sout_AnnounceUnRegister( p_stream->p_sout, p_sys->p_session ); - sout_AnnounceSessionDestroy( p_sys->p_session ); - } - sout_MuxDelete( p_sys->p_mux ); sout_AccessOutDelete( p_access );