X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fstream_out%2Fstandard.c;h=a7c5d24904372fd5d21905f1c3e227ed80dc2712;hb=47e69cf6132dfd1daa1ef8fb17fa6b2af5c16e18;hp=c318f018a31087a41159cba48cb33bf7ae1885bd;hpb=4e976a6e0f356e0c1ce576461bb54f65dd42392f;p=vlc diff --git a/modules/stream_out/standard.c b/modules/stream_out/standard.c index c318f018a3..a7c5d24904 100644 --- a/modules/stream_out/standard.c +++ b/modules/stream_out/standard.c @@ -28,7 +28,12 @@ # include "config.h" #endif -#include +#ifdef WIN32 +# define _WIN32_WINNT 0x0501 +#endif + +#include +#include #include #include @@ -56,8 +61,8 @@ "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_( \ @@ -92,8 +97,8 @@ static void Close ( vlc_object_t * ); #define SOUT_CFG_PREFIX "sout-standard-" vlc_module_begin(); - set_shortname( _("Standard")); - set_description( _("Standard stream output") ); + set_shortname( N_("Standard")); + set_description( N_("Standard stream output") ); set_capability( "sout stream", 50 ); add_shortcut( "standard" ); add_shortcut( "std" ); @@ -101,31 +106,31 @@ vlc_module_begin(); 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 ); + PATH_LONGTEXT, false ); change_unsafe(); - 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 ); + true ); add_obsolete_bool( SOUT_CFG_PREFIX "sap-ipv6" ); set_callbacks( Open, Close ); @@ -135,7 +140,7 @@ 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 @@ -212,7 +217,11 @@ static int Open( vlc_object_t *p_this ) 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_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 ); @@ -273,6 +282,8 @@ static int Open( vlc_object_t *p_this ) else { msg_Err( p_stream, "no access _and_ no muxer (fatal error)" ); + free( psz_url ); + free( p_sys ); return VLC_EGENERIC; } } @@ -284,8 +295,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"); } @@ -296,6 +306,7 @@ static int Open( vlc_object_t *p_this ) else { msg_Err( p_stream, "no mux specified or found by extension" ); + free( p_sys ); return VLC_EGENERIC; } } @@ -333,19 +344,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 ) && @@ -365,6 +375,8 @@ static int Open( vlc_object_t *p_this ) psz_access, psz_mux, psz_url ); free( psz_access ); free( psz_mux ); + free( psz_url ); + free( p_sys ); return VLC_EGENERIC; } msg_Dbg( p_stream, "access opened" ); @@ -379,6 +391,8 @@ static int Open( vlc_object_t *p_this ) sout_AccessOutDelete( p_access ); free( psz_access ); free( psz_mux ); + free( psz_url ); + free( p_sys ); return VLC_EGENERIC; } msg_Dbg( p_stream, "mux opened" ); @@ -387,24 +401,33 @@ 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"); + char port[6]; 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) + + snprintf (port, sizeof (port), "%d", dport); + if (getaddrinfo (dhost, port, &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) + snprintf (port, sizeof (port), "%d", sport); + if (getaddrinfo (shost, port, &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, @@ -430,6 +453,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); }