X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fstream_out%2Fstandard.c;h=ba4463932ddcd799a2a1350788ae5dfd57e92cc7;hb=ef6c490adcbcf6ad2cf3ac92b7a49016dce18042;hp=64b84b64f88e5f9e294dee8e71c9cf8cde76162a;hpb=69db2459e6fd502ef710e928fc1200287231db54;p=vlc diff --git a/modules/stream_out/standard.c b/modules/stream_out/standard.c index 64b84b64f8..ba4463932d 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-2007 the VideoLAN team * $Id$ * * Authors: Laurent Aimar @@ -18,49 +18,65 @@ * * 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. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ +#include +#include + #include #include -#include - -#include -#include +#include -#include "announce.h" -#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") -#define URL_LONGTEXT N_( \ - "Allows you to specify the output URL used for the streaming output." ) - + "Muxer to use for the stream." ) +#define DST_TEXT N_("Output destination") +#define DST_LONGTEXT N_( \ + "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 or SLP" ) - -#define SAP_TEXT N_("SAP announcing") -#define SAP_LONGTEXT N_("Announce this session 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_( \ + "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 SAPv6_TEXT N_("SAP IPv6 announcing") -#define SAPv6_LONGTEXT N_("Use IPv6 to announce this session with SAP") -#define SLP_TEXT N_("SLP announcing") -#define SLP_LONGTEXT N_("Announce this session with SLP") +#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 * ); @@ -68,25 +84,35 @@ static void Close ( vlc_object_t * ); #define SOUT_CFG_PREFIX "sout-standard-" 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 "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_string( SOUT_CFG_PREFIX "name", "", NULL, NAME_TEXT,NAME_LONGTEXT - , VLC_TRUE ); - add_bool( SOUT_CFG_PREFIX "sap-ipv6", 0, NULL, SAPv6_TEXT, SAPv6_LONGTEXT, + add_string( SOUT_CFG_PREFIX "name", "", NULL, NAME_TEXT, NAME_LONGTEXT, VLC_TRUE ); - - add_bool( SOUT_CFG_PREFIX "slp", 0, NULL, SLP_TEXT, SLP_LONGTEXT, VLC_TRUE ); + add_string( SOUT_CFG_PREFIX "group", "", NULL, GROUP_TEXT, GROUP_LONGTEXT, + VLC_TRUE ); + 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_suppressed_bool( SOUT_CFG_PREFIX "sap-ipv6" ); set_callbacks( Open, Close ); vlc_module_end(); @@ -96,12 +122,10 @@ vlc_module_end(); * Exported prototypes *****************************************************************************/ static const char *ppsz_sout_options[] = { - "access", "mux", "url", - "sap", "name", "sap-ipv6", - "slp",NULL + "access", "mux", "url", "dst", + "sap", "name", "group", "description", "url", "email", "phone", NULL }; -#define DEFAULT_IPV6_SCOPE '8' #define DEFAULT_PORT 1234 static sout_stream_id_t *Add ( sout_stream_t *, es_format_t * ); @@ -111,7 +135,6 @@ 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; session_descriptor_t *p_session; }; @@ -122,7 +145,6 @@ 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; char *psz_mux; char *psz_access; @@ -133,22 +155,23 @@ 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_ParseCfg( 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 ); psz_access = *val.psz_string ? val.psz_string : NULL; - if( val.psz_string && !*val.psz_string ) free( val.psz_string ); + 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 && !*val.psz_string ) free( val.psz_string ); + if( !*val.psz_string ) free( val.psz_string ); - var_Get( p_stream, SOUT_CFG_PREFIX "url", &val ); + + var_Get( p_stream, SOUT_CFG_PREFIX "dst", &val ); psz_url = *val.psz_string ? val.psz_string : NULL; - if( val.psz_string && !*val.psz_string ) free( val.psz_string ); + 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; @@ -158,8 +181,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; const char *mux; } exttomux[] = { { "avi", "avi" }, { "ogg", "ogg" }, @@ -176,12 +199,14 @@ static int Open( vlc_object_t *p_this ) { "mpeg","ps" }, { "ps", "ps" }, { "mpeg1","mpeg1" }, + { "wav","wav" }, + { "flv", "ffmpeg{mux=flv}" }, { NULL, NULL } }; - 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 ); + msg_Dbg( p_this, "extension is %s", psz_ext ); for( i = 0; exttomux[i].ext != NULL; i++ ) { if( !strcasecmp( psz_ext, exttomux[i].ext ) ) @@ -190,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 */ @@ -200,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); @@ -219,14 +244,22 @@ static int Open( vlc_object_t *p_this ) { psz_mux = strdup("asfh"); } - else if( !strncmp( psz_access, "udp", 3 ) ) + else if (!strcmp (psz_access, "udp") + || !strcmp (psz_access, "rtp") || !strcmp (psz_access, "udplite") + || !strcmp (psz_access, "tcp") || !strcmp (psz_access, "sctp") + || !strcmp (psz_access, "dccp")) { psz_mux = strdup("ts"); } - else + else if( psz_mux_byext ) { psz_mux = strdup(psz_mux_byext); } + else + { + msg_Err( p_stream, "no mux specified or found by extension" ); + return VLC_EGENERIC; + } } else if( psz_mux && !psz_access ) { @@ -242,7 +275,7 @@ static int Open( vlc_object_t *p_this ) } } - /* fix or warm of incompatible couple */ + /* fix or warn of incompatible couple */ if( psz_mux && psz_access ) { if( !strncmp( psz_access, "mmsh", 4 ) && @@ -304,99 +337,86 @@ static int Open( vlc_object_t *p_this ) } 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 - { - free( val.psz_string ); - p_session->psz_name = strdup( psz_url ); - } - var_Get( p_stream, SOUT_CFG_PREFIX "sap-ipv6", &val ); - p_method->i_ip_version = val.b_bool ? 6 : 4; - - /* 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 = 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"); + session_descriptor_t *p_session; + announce_method_t *p_method = sout_SAPMethod (); + const int payload_type = 33; - sout_AnnounceRegister( p_sout, p_session, p_method ); + static const struct { const char *access; const char *fmt; } fmts[] = + { + /* TLS/DTLS variants (none implemented): */ + { "dtlslite", "UDPLite/TLS/RTP/AVP %d" }, + { "dtls", "UDP/TLS/RTP/AVP %d" }, + { "dccps", "DCCP/TLS/RTP/AVP %d" }, + { "tls", "TCP/TLS/RTP/AVP %d" }, + /* Plain text: */ + { "udplite", "UDPLite/RTP/AVP %d" }, + { "udp", "udp mpeg" }, + { "rtp", "RTP/AVP %d" }, + /* Currently unsupported access outputs: */ + { "dccp", "DCCP/RTP/AVP %d" }, + { "tcp", "TCP/RTP/AVP %d" }, + /* SRTP (none implemented): */ + { "srtp", "RTP/SAVP %d" }, + { "sudplite", "UDPLite/RTP/SAVP %d" }, + { "sdccp", "DCCP/RTP/SAVP %d" }, + { "stcp", "TCP/RTP/SAVP %d" }, + { NULL, NULL } + }; + const char *psz_sdp_fmt = NULL; + char *fmt, *src, *dst; + int sport, dport; + + for (unsigned i = 0; fmts[i].access != NULL; i++) + if (strncasecmp (fmts[i].access, psz_access, strlen (fmts[i].access)) == 0) + { + psz_sdp_fmt = fmts[i].fmt; + break; + } - /* FIXME: Free p_method */ + src = var_GetNonEmptyString (p_access, "src-addr"); + dst = var_GetNonEmptyString (p_access, "dst-addr"); + sport = var_GetInteger (p_access, "src-port"); + dport = var_GetInteger (p_access, "dst-port"); - p_stream->p_sys->p_session = p_session; - } - vlc_UrlClean( &url ); - } + if ((psz_sdp_fmt == NULL) + || (asprintf (&fmt, psz_sdp_fmt, payload_type) == -1)) + fmt = NULL; - /* *** 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 + msg_Dbg( p_stream, "SAP advertized format: %s", fmt); + if ((fmt == NULL) || ((src == NULL) && (dst == NULL))) { - i_ret = sout_SLPReg( p_sout, psz_url, psz_url ); + msg_Err (p_access, "SAP announces not supported for access %s", + psz_access); + free (fmt); + free (src); + free (dst); + goto nosap; } - 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 ); + p_session = sout_AnnounceSessionCreate (VLC_OBJECT (p_stream), + SOUT_CFG_PREFIX); + sout_SessionSetMedia (VLC_OBJECT (p_stream), p_session, fmt, + src, sport, dst, dport); + sout_AnnounceRegister( p_sout, p_session, p_method ); + p_stream->p_sys->p_session = p_session; + sout_MethodRelease (p_method); } -#endif +nosap: p_stream->pf_add = Add; p_stream->pf_del = Del; p_stream->pf_send = Send; 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; } @@ -412,18 +432,9 @@ static void Close( vlc_object_t * p_this ) 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 );