X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fstream_out%2Fstandard.c;h=c65781c94fca8612d98a4252c913f252e4ced898;hb=69196d4b10c91bc39efe2b26121d5e64981036f2;hp=148f1537e2dcb93aa2275465042c8f82a3dffcfd;hpb=80a74d66eb92914ffba1e4996de3bf74060ba5e5;p=vlc diff --git a/modules/stream_out/standard.c b/modules/stream_out/standard.c index 148f1537e2..c65781c94f 100644 --- a/modules/stream_out/standard.c +++ b/modules/stream_out/standard.c @@ -28,11 +28,16 @@ # include "config.h" #endif -#include +#ifndef _WIN32_WINNT +# define _WIN32_WINNT 0x0500 +#endif + +#include +#include #include #include -#include "vlc_url.h" +#include /***************************************************************************** * Module descriptor @@ -45,19 +50,19 @@ "Muxer to use for the stream." ) #define DEST_TEXT N_("Output destination") #define DEST_LONGTEXT N_( \ - "Destination (URL) to use for the stream." ) + "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" ) + "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" ) + "helper setting for dst, dst=bind+'/'+path, dst-parameter overrides this" ) #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." ) + "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_( \ @@ -91,51 +96,53 @@ 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 ); +vlc_module_begin () + set_shortname( N_("Standard")) + set_description( N_("Standard stream output") ) + set_capability( "sout stream", 50 ) + add_shortcut( "standard" ) + add_shortcut( "std" ) + add_shortcut( "file" ) + add_shortcut( "http" ) + add_shortcut( "udp" ) + set_category( CAT_SOUT ) + set_subcategory( SUBCAT_SOUT_STREAM ) add_string( SOUT_CFG_PREFIX "access", "", NULL, ACCESS_TEXT, - ACCESS_LONGTEXT, VLC_FALSE ); + ACCESS_LONGTEXT, false ) add_string( SOUT_CFG_PREFIX "mux", "", NULL, MUX_TEXT, - MUX_LONGTEXT, VLC_FALSE ); + MUX_LONGTEXT, false ) add_string( SOUT_CFG_PREFIX "dst", "", NULL, DEST_TEXT, - DEST_LONGTEXT, VLC_FALSE ); + DEST_LONGTEXT, false ) add_string( SOUT_CFG_PREFIX "bind", "", NULL, BIND_TEXT, - BIND_LONGTEXT, VLC_FALSE ); + BIND_LONGTEXT, false ) add_string( SOUT_CFG_PREFIX "path", "", NULL, PATH_TEXT, - PATH_LONGTEXT, VLC_FALSE ); - change_unsafe(); + PATH_LONGTEXT, false ) - add_bool( SOUT_CFG_PREFIX "sap", VLC_FALSE, NULL, SAP_TEXT, SAP_LONGTEXT, - VLC_TRUE ); + add_bool( SOUT_CFG_PREFIX "sap", false, NULL, SAP_TEXT, SAP_LONGTEXT, + true ) add_string( SOUT_CFG_PREFIX "name", "", NULL, NAME_TEXT, NAME_LONGTEXT, - VLC_TRUE ); + true ) add_string( SOUT_CFG_PREFIX "group", "", NULL, GROUP_TEXT, GROUP_LONGTEXT, - VLC_TRUE ); + true ) add_string( SOUT_CFG_PREFIX "description", "", NULL, DESC_TEXT, DESC_LONGTEXT, - VLC_TRUE ); + true ) add_string( SOUT_CFG_PREFIX "url", "", NULL, URL_TEXT, URL_LONGTEXT, - VLC_TRUE ); + true ) add_string( SOUT_CFG_PREFIX "email", "", NULL, EMAIL_TEXT, EMAIL_LONGTEXT, - VLC_TRUE ); + true ) add_string( SOUT_CFG_PREFIX "phone", "", NULL, PHONE_TEXT, PHONE_LONGTEXT, - VLC_TRUE ); - add_obsolete_bool( SOUT_CFG_PREFIX "sap-ipv6" ); + true ) + add_obsolete_bool( SOUT_CFG_PREFIX "sap-ipv6" ) - set_callbacks( Open, Close ); -vlc_module_end(); + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** * Exported prototypes *****************************************************************************/ -static const char *ppsz_sout_options[] = { +static const char *const ppsz_sout_options[] = { "access", "mux", "url", "dst", "sap", "name", "group", "description", "url", "email", "phone", "bind", "path", NULL @@ -164,7 +171,7 @@ static int Open( vlc_object_t *p_this ) char *psz_mux; char *psz_access; - char *psz_url; + char *psz_url=NULL; char *psz_bind; char *psz_path; @@ -178,36 +185,57 @@ static int Open( vlc_object_t *p_this ) 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); + psz_access = var_GetString( p_stream, SOUT_CFG_PREFIX "access" ); + if( EMPTY_STR(psz_access) ) + { + if( !strcmp( p_stream->psz_name, "http" ) ) + { + psz_access = strdup("http"); + } + else if (!strcmp (p_stream->psz_name, "udp")) + { + psz_access = strdup("udp"); + } + else if (!strcmp (p_stream->psz_name, "file")) + { + psz_access = strdup("file"); + } + } - 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); + psz_mux = var_GetNonEmptyString( p_stream, SOUT_CFG_PREFIX "mux" ); + psz_bind = var_GetNonEmptyString( p_stream, SOUT_CFG_PREFIX "bind" ); + psz_path = var_GetNonEmptyString( p_stream, SOUT_CFG_PREFIX "path" ); - if( psz_bind ) psz_url = psz_bind; - if( psz_url && psz_path ) + if( psz_bind && psz_path ) { - if( asprintf( &psz_url,"%s/%s",psz_url,psz_path ) == -1 ) + if( asprintf( &psz_url, "%s/%s", psz_bind, psz_path ) == -1 ) psz_url = NULL; - free( psz_path ); } + else if( psz_bind ) + { + psz_url = psz_bind; + psz_bind = NULL; + } + free( psz_path ); var_Get( p_stream, SOUT_CFG_PREFIX "dst", &val ); - if( *val.psz_string ) psz_url = val.psz_string; - if( !*val.psz_string ) free( val.psz_string ); + 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; + if( !p_sys ) + { + free( psz_access ); + free( psz_mux ); + free( psz_bind ); + free( psz_url ); + return VLC_ENOMEM; + } p_stream->p_sys->p_session = NULL; msg_Dbg( p_this, "creating `%s/%s://%s'", psz_access, psz_mux, psz_url ); @@ -268,6 +296,9 @@ static int Open( vlc_object_t *p_this ) else { msg_Err( p_stream, "no access _and_ no muxer (fatal error)" ); + free( psz_bind ); + free( psz_url ); + free( p_sys ); return VLC_EGENERIC; } } @@ -279,8 +310,7 @@ static int Open( vlc_object_t *p_this ) { psz_mux = strdup("asfh"); } - else if (!strcmp (psz_access, "udp") - || !strcmp (psz_access, "rtp")) + else if (!strcmp (psz_access, "udp")) { psz_mux = strdup("ts"); } @@ -291,6 +321,10 @@ static int Open( vlc_object_t *p_this ) else { msg_Err( p_stream, "no mux specified or found by extension" ); + free( psz_access ); + free( psz_bind ); + free( psz_url ); + free( p_sys ); return VLC_EGENERIC; } } @@ -328,19 +362,18 @@ static int Open( vlc_object_t *p_this ) psz_mux = strdup("asfh"); } } - else if( ( !strncmp( psz_access, "rtp", 3 ) || - !strncmp( psz_access, "udp", 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 and RTP are only valid with TS" ); + 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, "UDP and RTP are only valid with TS" ); + msg_Err( p_stream, "UDP is only valid with TS" ); } } else if( strncmp( psz_access, "file", 4 ) && @@ -360,6 +393,9 @@ static int Open( vlc_object_t *p_this ) psz_access, psz_mux, psz_url ); free( psz_access ); free( psz_mux ); + free( psz_bind ); + free( psz_url ); + free( p_sys ); return VLC_EGENERIC; } msg_Dbg( p_stream, "access opened" ); @@ -374,6 +410,9 @@ static int Open( vlc_object_t *p_this ) sout_AccessOutDelete( p_access ); free( psz_access ); free( psz_mux ); + free( psz_bind ); + free( psz_url ); + free( p_sys ); return VLC_EGENERIC; } msg_Dbg( p_stream, "mux opened" ); @@ -382,24 +421,30 @@ static int Open( vlc_object_t *p_this ) if( var_GetBool( p_stream, SOUT_CFG_PREFIX"sap" ) ) { /* 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"); 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) + + if ( vlc_getaddrinfo ( VLC_OBJECT(p_stream), dhost, dport, &hints, &res) == 0) { memcpy (&dst, res->ai_addr, dstlen = res->ai_addrlen); - vlc_freeaddrinfo (res); + freeaddrinfo (res); } - if (vlc_getaddrinfo (VLC_OBJECT (p_stream), shost, sport, NULL, &res) == 0) + if (vlc_getaddrinfo ( VLC_OBJECT(p_stream), shost, sport, &hints, &res) == 0) { memcpy (&src, res->ai_addr, srclen = res->ai_addrlen); - vlc_freeaddrinfo (res); + freeaddrinfo (res); } char *head = vlc_sdp_Start (VLC_OBJECT (p_stream), SOUT_CFG_PREFIX, @@ -425,6 +470,7 @@ static int Open( vlc_object_t *p_this ) p_sys->p_session = sout_AnnounceRegisterSDP (p_sout, psz_sdp, dhost, p_method); sout_MethodRelease (p_method); + free( psz_sdp ); } free (dhost); } @@ -437,8 +483,12 @@ static int Open( vlc_object_t *p_this ) free( psz_access ); free( psz_mux ); + free( psz_bind ); free( psz_url ); + if( !sout_AccessOutCanControlPace( p_access ) ) + p_sout->i_out_pace_nocontrol++; + return VLC_SUCCESS; } @@ -455,6 +505,8 @@ static void Close( vlc_object_t * p_this ) sout_AnnounceUnRegister( p_stream->p_sout, p_sys->p_session ); sout_MuxDelete( p_sys->p_mux ); + if( !sout_AccessOutCanControlPace( p_access ) ) + p_stream->p_sout->i_out_pace_nocontrol--; sout_AccessOutDelete( p_access ); free( p_sys ); @@ -472,10 +524,12 @@ static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt ) sout_stream_id_t *id; id = malloc( sizeof( sout_stream_id_t ) ); + if( !id ) + return NULL; + if( ( id->p_input = sout_MuxAddStream( p_sys->p_mux, p_fmt ) ) == NULL ) { free( id ); - return NULL; }