X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fstream_out%2Fstandard.c;h=ba4463932ddcd799a2a1350788ae5dfd57e92cc7;hb=37b0b026bbe92b1bda266e6f30ec37c7ceee767d;hp=c25e3918b39afac93cd9ffea57839fbcf16eff66;hpb=b83deb14dfba98e2695e437b7f66c65fd8bb2713;p=vlc diff --git a/modules/stream_out/standard.c b/modules/stream_out/standard.c index c25e3918b3..ba4463932d 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.9 2003/08/13 14:17:26 zorglub Exp $ + * Copyright (C) 2003-2007 the VideoLAN team + * $Id$ * * Authors: Laurent Aimar * @@ -18,48 +18,124 @@ * * 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 -#define DEFAULT_IPV6_SCOPE "8" +#include +#include "vlc_url.h" /***************************************************************************** - * Exported prototypes + * Module descriptor *****************************************************************************/ +#define ACCESS_TEXT N_("Output access method") +#define ACCESS_LONGTEXT N_( \ + "Output method to use for the stream." ) +#define MUX_TEXT N_("Output muxer") +#define MUX_LONGTEXT N_( \ + "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_( \ + "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 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 *, 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 "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_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(); + +/***************************************************************************** + * Exported prototypes + *****************************************************************************/ +static const char *ppsz_sout_options[] = { + "access", "mux", "url", "dst", + "sap", "name", "group", "description", "url", "email", "phone", 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,30 +145,171 @@ 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" ); - sout_cfg_t *p_slp_cfg = sout_cfg_find( p_stream->p_cfg, "slp" ); - + + char *psz_mux; + char *psz_access; + char *psz_url; + + vlc_value_t val; + sout_access_out_t *p_access; - sout_mux_t *p_mux; + sout_mux_t *p_mux; + + const char *psz_mux_byext = NULL; + + 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 extension */ + static struct { const char *ext; const 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" }, + { "wav","wav" }, + { "flv", "ffmpeg{mux=flv}" }, + { NULL, NULL } + }; + const char *psz_ext = strrchr( psz_url, '.' ) + 1; + int i; + + msg_Dbg( p_this, "extension 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, "extension -> 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, extension 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 (!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 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 ) + { + /* mux given, no access */ + if( !strncmp( psz_mux, "asfh", 4 ) ) + { + psz_access = strdup("mmsh"); + } + else + { + /* default file */ + psz_access = strdup("file"); + } + } - /* SAP is only valid for UDP or RTP streaming */ - if( psz_access == NULL ) psz_access = "udp"; + /* 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,'{' ); - /* Get SAP IP version to use */ - if(psz_ipv == NULL) psz_ipv = "4"; - if(psz_v6_scope == NULL) psz_v6_scope = DEFAULT_IPV6_SCOPE; - p_sys->p_sap = NULL; + 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, "creating `%s/%s://%s'", - psz_access, psz_mux, psz_url ); + 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 ); @@ -100,7 +317,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" ); @@ -112,90 +331,111 @@ 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_sap_cfg && ( strstr( psz_access, "udp" ) || - strstr( psz_access , "rtp" ) ) ) + /* *** Create the SAP Session structure *** */ + if( var_GetBool( p_stream, SOUT_CFG_PREFIX"sap" ) ) { - msg_Info( p_this, "SAP Enabled"); - msg_Dbg( p_sout , "Creating SAP with IPv%i", atoi(psz_ipv) ); + session_descriptor_t *p_session; + announce_method_t *p_method = sout_SAPMethod (); + const int payload_type = 33; - 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 ); + 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; + } - if( !p_sys->p_sap ) - msg_Err( p_sout,"Unable to initialize SAP. SAP disabled"); - } + 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"); - /* *** Register with slp *** */ - #ifdef HAVE_SLP_H - if( p_slp_cfg && ( strstr( psz_access, "udp" ) || - strstr( psz_access , "rtp" ) ) ) - { - p_sys->p_slp = NULL ; - 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 ((psz_sdp_fmt == NULL) + || (asprintf (&fmt, psz_sdp_fmt, payload_type) == -1)) + fmt = NULL; + + msg_Dbg( p_stream, "SAP advertized format: %s", fmt); + if ((fmt == NULL) || ((src == NULL) && (dst == NULL))) { - msg_Warn( p_sout, "SLP Registering failed"); + msg_Err (p_access, "SAP announces not supported for access %s", + psz_access); + free (fmt); + free (src); + free (dst); + goto nosap; } - 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); - } - } - #endif - - /* XXX beurk */ - p_sout->i_preheader = __MAX( p_sout->i_preheader, p_mux->i_preheader ); - - p_sys->p_mux = p_mux; + 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); + } +nosap: 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; + + 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 ); - - #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 ); sout_AccessOutDelete( p_access ); @@ -208,7 +448,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; @@ -236,15 +476,11 @@ static int Del( sout_stream_t *p_stream, 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; }