# include "config.h"
#endif
-#include <vlc/vlc.h>
+#ifdef WIN32
+# define _WIN32_WINNT 0x0501
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_sout.h>
#include <vlc_network.h>
#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" );
/*****************************************************************************
* 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
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 );
else
{
msg_Err( p_stream, "no access _and_ no muxer (fatal error)" );
+ free( psz_url );
+ free( p_sys );
return VLC_EGENERIC;
}
}
{
psz_mux = strdup("asfh");
}
- else if (!strcmp (psz_access, "udp")
- || !strcmp (psz_access, "rtp"))
+ else if (!strcmp (psz_access, "udp"))
{
psz_mux = strdup("ts");
}
else
{
msg_Err( p_stream, "no mux specified or found by extension" );
+ free( p_sys );
return VLC_EGENERIC;
}
}
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 ) &&
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" );
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" );
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,
p_sys->p_session =
sout_AnnounceRegisterSDP (p_sout, psz_sdp, dhost, p_method);
sout_MethodRelease (p_method);
+ free( psz_sdp );
}
free (dhost);
}