X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fstream_out%2Fstandard.c;h=09fa0448e72ddb0dc804075d13754adb3204227d;hb=d7a21b12e9dc5e883e2401faa817fdf211372626;hp=069261247f14eaa4bf2f8c706679f2a983ae855b;hpb=97c19f23033a9582444c7317b247da0962f89562;p=vlc diff --git a/modules/stream_out/standard.c b/modules/stream_out/standard.c index 069261247f..09fa0448e7 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.17 2004/01/15 23:40:44 gbazin Exp $ + * Copyright (C) 2003-2007 the VideoLAN team + * $Id$ * * Authors: Laurent Aimar * @@ -18,48 +18,144 @@ * * 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 +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#ifdef WIN32 +# define _WIN32_WINNT 0x0501 +#endif -#include -#include -#include "announce.h" +#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 DEST_TEXT N_("Output destination") +#define DEST_LONGTEXT N_( \ + "Destination (URL) to use for the stream. Overrides path and bind parameters" ) +#define BIND_TEXT N_("address to bind to (helper setting for dst)") +#define BIND_LONGTEXT N_( \ + "address:port to bind vlc to listening incoming streams "\ + "helper setting for dst,dst=bind+'/'+path. dst-parameter overrides this" ) +#define PATH_TEXT N_("filename for stream (helper setting for dst)") +#define PATH_LONGTEXT N_( \ + "Filename for stream "\ + "helper setting for dst, dst=bind+'/'+path, dst-parameter overrides this" ) +#define NAME_TEXT N_("Session name") +#define NAME_LONGTEXT N_( \ + "This is the name of the session that will be announced in the SDP " \ + "(Session Descriptor)." ) + +#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 description") +#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 *, es_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( N_("Standard")); + set_description( N_("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, false ); + add_string( SOUT_CFG_PREFIX "mux", "", NULL, MUX_TEXT, + MUX_LONGTEXT, false ); + add_string( SOUT_CFG_PREFIX "dst", "", NULL, DEST_TEXT, + DEST_LONGTEXT, false ); + add_string( SOUT_CFG_PREFIX "bind", "", NULL, BIND_TEXT, + BIND_LONGTEXT, false ); + add_string( SOUT_CFG_PREFIX "path", "", NULL, PATH_TEXT, + PATH_LONGTEXT, false ); + change_unsafe(); + + add_bool( SOUT_CFG_PREFIX "sap", false, NULL, SAP_TEXT, SAP_LONGTEXT, + true ); + add_string( SOUT_CFG_PREFIX "name", "", NULL, NAME_TEXT, NAME_LONGTEXT, + true ); + add_string( SOUT_CFG_PREFIX "group", "", NULL, GROUP_TEXT, GROUP_LONGTEXT, + true ); + add_string( SOUT_CFG_PREFIX "description", "", NULL, DESC_TEXT, DESC_LONGTEXT, + true ); + add_string( SOUT_CFG_PREFIX "url", "", NULL, URL_TEXT, URL_LONGTEXT, + true ); + add_string( SOUT_CFG_PREFIX "email", "", NULL, EMAIL_TEXT, EMAIL_LONGTEXT, + true ); + add_string( SOUT_CFG_PREFIX "phone", "", NULL, PHONE_TEXT, PHONE_LONGTEXT, + true ); + add_obsolete_bool( SOUT_CFG_PREFIX "sap-ipv6" ); + set_callbacks( Open, Close ); vlc_module_end(); + +/***************************************************************************** + * Exported prototypes + *****************************************************************************/ +static const char *const ppsz_sout_options[] = { + "access", "mux", "url", "dst", + "sap", "name", "group", "description", "url", "email", "phone", + "bind", "path", 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,33 +165,68 @@ 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" ); - - 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 + sout_stream_sys_t *p_sys; + + char *psz_mux; + char *psz_access; + char *psz_url=NULL; + char *psz_bind; + char *psz_path; + + vlc_value_t val; sout_access_out_t *p_access; sout_mux_t *p_mux; - char *psz_mux_byext = NULL; + 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 "bind", &val ); + psz_bind = *val.psz_string ? val.psz_string : NULL; + if( !*val.psz_string ) free( val.psz_string); + + var_Get( p_stream, SOUT_CFG_PREFIX "path", &val ); + psz_path = *val.psz_string ? val.psz_string : NULL; + if( !*val.psz_string ) free( val.psz_string); + + if( psz_bind ) psz_url = psz_bind; + if( psz_url && psz_path ) + { + if( asprintf( &psz_url,"%s/%s",psz_url,psz_path ) == -1 ) + psz_url = NULL; + free( psz_path ); + } + + var_Get( p_stream, SOUT_CFG_PREFIX "dst", &val ); + if( *val.psz_string ) + { + free( psz_url); + psz_url = val.psz_string; + } + else + free( val.psz_string ); + + p_sys = p_stream->p_sys = malloc( sizeof( sout_stream_sys_t) ); + if( !p_sys ) return VLC_ENOMEM; + p_stream->p_sys->p_session = NULL; - msg_Dbg( p_this, "creating `%s/%s://%s'", - psz_access, psz_mux, psz_url ); + 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[] = + /* by extension */ + static struct { const char ext[6]; const char mux[32]; } exttomux[] = { { "avi", "avi" }, { "ogg", "ogg" }, @@ -112,13 +243,16 @@ static int Open( vlc_object_t *p_this ) { "mpeg","ps" }, { "ps", "ps" }, { "mpeg1","mpeg1" }, - { 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 ) ) { @@ -126,21 +260,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,70 +282,81 @@ 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 ) ) + else if (!strcmp (psz_access, "udp")) { - psz_mux = "ts"; + psz_mux = strdup("ts"); + } + else if( psz_mux_byext ) + { + 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( !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 = "asfh"; - } + msg_Warn( p_stream, "fixing to mmsh/asfh" ); + if( p ) + { + if( asprintf( &p, "asfh%s", p ) == -1 ) + p = NULL; + free( psz_mux ); + psz_mux = p; } - else if( ( !strncmp( psz_access, "rtp", 3 ) || - !strncmp( psz_access, "udp", 3 ) ) && - strncmp( psz_mux, "ts", 2 ) ) + else { - msg_Err( p_stream, "for now udp and rtp are only valid with TS" ); + free( psz_mux ); + psz_mux = strdup("asfh"); } - else if( strncmp( psz_access, "file", 4 ) && - ( !strncmp( psz_mux, "mov", 3 ) || - !strncmp( psz_mux, "mp4", 3 ) ) ) + } + else if( !strncmp( psz_access, "udp", 3 ) ) + { + if( !strncmp( psz_mux, "ffmpeg", 6 ) ) + { /* why would you use ffmpeg's ts muxer ? YOU DON'T LOVE VLC ??? */ + char *psz_ffmpeg_mux = var_CreateGetString( p_this, "ffmpeg-mux" ); + if( !psz_ffmpeg_mux || strncmp( psz_ffmpeg_mux, "mpegts", 6 ) ) + msg_Err( p_stream, "UDP is only valid with TS" ); + free( psz_ffmpeg_mux ); + } + else if( strncmp( psz_mux, "ts", 2 ) ) { - msg_Err( p_stream, "mov and mp4 work only with file output" ); + msg_Err( p_stream, "UDP is 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 ); @@ -222,7 +366,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 ); + free( psz_access ); + free( psz_mux ); + return VLC_EGENERIC; } msg_Dbg( p_stream, "access opened" ); @@ -234,73 +380,82 @@ static int Open( vlc_object_t *p_this ) psz_access, psz_mux, psz_url ); sout_AccessOutDelete( p_access ); - return( VLC_EGENERIC ); + free( psz_access ); + 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" ) ) ) + /* *** Create the SAP Session structure *** */ + if( var_GetBool( p_stream, SOUT_CFG_PREFIX"sap" ) ) { - msg_Info( p_this, "SAP Enabled"); - - if( psz_ipv == NULL ) + /* Create the SDP */ + static const struct addrinfo hints = { + .ai_family = AF_UNSPEC, + .ai_socktype = SOCK_DGRAM, + .ai_protocol = 0, + .ai_flags = AI_NUMERICHOST | AI_NUMERICSERV + }; + 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"); + char port[6]; + struct sockaddr_storage src, dst; + socklen_t srclen = 0, dstlen = 0; + struct addrinfo *res; + + snprintf (port, sizeof (port), "%d", dport); + if (getaddrinfo (dhost, port, &hints, &res) == 0) { - psz_ipv = "4"; + memcpy (&dst, res->ai_addr, dstlen = res->ai_addrlen); + freeaddrinfo (res); } - if( psz_v6_scope == NULL ) + + snprintf (port, sizeof (port), "%d", sport); + if (getaddrinfo (shost, port, &hints, &res) == 0) { - psz_v6_scope = DEFAULT_IPV6_SCOPE; + memcpy (&src, res->ai_addr, srclen = res->ai_addrlen); + freeaddrinfo (res); } - 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 ); + char *head = vlc_sdp_Start (VLC_OBJECT (p_stream), SOUT_CFG_PREFIX, + (struct sockaddr *)&src, srclen, + (struct sockaddr *)&dst, dstlen); + free (shost); - if( !p_sap ) - msg_Err( p_sout,"Unable to initialize SAP. SAP disabled"); - } - - /* *** 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) ) + char *psz_sdp = NULL; + if (head != NULL) { - msg_Warn( p_sout, "SLP Registering failed"); + if (asprintf (&psz_sdp, "%s" + "m=video %d udp mpeg\r\n", head, dport) == -1) + psz_sdp = NULL; + free (head); } - else + + /* Register the SDP with the SAP thread */ + if (psz_sdp != NULL) { - 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); + announce_method_t *p_method = sout_SAPMethod (); + msg_Dbg (p_stream, "Generated SDP:\n%s", psz_sdp); + + p_sys->p_session = + sout_AnnounceRegisterSDP (p_sout, psz_sdp, dhost, p_method); + sout_MethodRelease (p_method); + free( psz_sdp ); } + free (dhost); } -#endif - - /* XXX beurk */ - p_sout->i_preheader = __MAX( p_sout->i_preheader, p_mux->i_preheader ); 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; + p_sys->p_mux = p_mux; + + free( psz_access ); + free( psz_mux ); + free( psz_url ); return VLC_SUCCESS; } @@ -308,26 +463,14 @@ static int Open( vlc_object_t *p_this ) /***************************************************************************** * 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 ) - { - 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 - + if( p_sys->p_session != NULL ) + sout_AnnounceUnRegister( p_stream->p_sout, p_sys->p_session ); sout_MuxDelete( p_sys->p_mux ); sout_AccessOutDelete( p_access ); @@ -369,15 +512,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; }