/*****************************************************************************
* Preamble
*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <vlc/vlc.h>
#include <vlc_sout.h>
-
#include <vlc_network.h>
#include "vlc_url.h"
#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_( \
+#define DEST_TEXT N_("Output destination")
+#define DEST_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 group for the session, that will be announced "\
"if you choose to use SAP." )
-#define DESC_TEXT N_("Session descriptipn")
+#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)." )
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_string( SOUT_CFG_PREFIX "dst", "", NULL, DEST_TEXT,
+ DEST_LONGTEXT, VLC_FALSE );
+ change_unsafe();
- add_bool( SOUT_CFG_PREFIX "sap", 0, NULL, SAP_TEXT, SAP_LONGTEXT, VLC_TRUE );
+ add_bool( SOUT_CFG_PREFIX "sap", VLC_FALSE, 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,
{
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;
char *psz_mux;
char *psz_access;
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_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 );
if( psz_url && strrchr( psz_url, '.' ) )
{
/* by extension */
- static struct { const char ext[6]; const char mux[16]; } exttomux[] =
+ static struct { const char ext[6]; const char mux[32]; } exttomux[] =
{
{ "avi", "avi" },
{ "ogg", "ogg" },
{ "mpeg1","mpeg1" },
{ "wav", "wav" },
{ "flv", "ffmpeg{mux=flv}" },
+ { "mkv", "ffmpeg{mux=matroska}"},
{ "", "" }
};
const char *psz_ext = strrchr( psz_url, '.' ) + 1;
}
}
else if( ( !strncmp( psz_access, "rtp", 3 ) ||
- !strncmp( psz_access, "udp", 3 ) ) &&
- strncmp( psz_mux, "ts", 2 ) )
+ !strncmp( psz_access, "udp", 3 ) ) )
{
- msg_Err( p_stream, "UDP and RTP are only valid with TS" );
+ 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" );
+ free( psz_ffmpeg_mux );
+ }
+ else if( strncmp( psz_mux, "ts", 2 ) )
+ {
+ msg_Err( p_stream, "UDP and RTP are only valid with TS" );
+ }
}
else if( strncmp( psz_access, "file", 4 ) &&
( !strncmp( psz_mux, "mov", 3 ) ||
/* *** Create the SAP Session structure *** */
if( var_GetBool( p_stream, SOUT_CFG_PREFIX"sap" ) )
{
- session_descriptor_t *p_session;
- announce_method_t *p_method = sout_SAPMethod ();
+ /* Create the SDP */
+ 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)
+ {
+ memcpy (&dst, res->ai_addr, dstlen = res->ai_addrlen);
+ vlc_freeaddrinfo (res);
+ }
- static const struct { const char *access; const char *fmt; } fmts[] =
- {
- /* Plain text: */
- { "udp", "udp mpeg" },
- { "rtp", "RTP/AVP 33" },
- { NULL, NULL }
- };
- const char *fmt = NULL;
- char *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)
- {
- fmt = fmts[i].fmt;
- break;
- }
+ if (vlc_getaddrinfo (VLC_OBJECT (p_stream), shost, sport, NULL, &res) == 0)
+ {
+ memcpy (&src, res->ai_addr, srclen = res->ai_addrlen);
+ vlc_freeaddrinfo (res);
+ }
- 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");
+ char *head = vlc_sdp_Start (VLC_OBJECT (p_stream), SOUT_CFG_PREFIX,
+ (struct sockaddr *)&src, srclen,
+ (struct sockaddr *)&dst, dstlen);
+ free (shost);
- msg_Dbg( p_stream, "SAP advertized format: %s", fmt);
- if ((fmt == NULL) || ((src == NULL) && (dst == NULL)))
+ char *psz_sdp = NULL;
+ if (head != NULL)
{
- msg_Err (p_access, "SAP announces not supported for access %s",
- psz_access);
- goto nosap;
+ if (asprintf (&psz_sdp, "%s"
+ "m=video %d udp mpeg\r\n", head, dport) == -1)
+ psz_sdp = NULL;
+ free (head);
}
- 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:
- free (src);
- free (dst);
+ /* Register the SDP with the SAP thread */
+ if (psz_sdp != NULL)
+ {
+ 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 (dhost);
}
p_stream->pf_add = Add;
p_stream->pf_del = Del;
p_stream->pf_send = Send;
- p_stream->p_sys->p_mux = p_mux;
+ p_sys->p_mux = p_mux;
free( psz_access );
free( psz_mux );
sout_access_out_t *p_access = p_sys->p_mux->p_access;
if( p_sys->p_session != NULL )
- {
sout_AnnounceUnRegister( p_stream->p_sout, p_sys->p_session );
- sout_AnnounceSessionDestroy( p_sys->p_session );
- }
-
sout_MuxDelete( p_sys->p_mux );
sout_AccessOutDelete( p_access );
projects / vlc / blobdiff