/*****************************************************************************
* Preamble
*****************************************************************************/
+#include <vlc/vlc.h>
+#include <vlc_sout.h>
+
#include <stdlib.h>
#include <string.h>
+#include <stdio.h>
-#include <vlc/vlc.h>
-#include <vlc/sout.h>
-
-#include "network.h"
+#include <vlc_network.h>
#include "vlc_url.h"
/*****************************************************************************
"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_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.")
MUX_LONGTEXT, VLC_FALSE );
add_string( SOUT_CFG_PREFIX "dst", "", NULL, DST_TEXT,
DST_LONGTEXT, VLC_FALSE );
- add_deprecated( SOUT_CFG_PREFIX "url", VLC_FALSE );
add_bool( SOUT_CFG_PREFIX "sap", 0, 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,
VLC_TRUE );
+ add_string( SOUT_CFG_PREFIX "description", "", NULL, DESC_TEXT, DESC_LONGTEXT,
+ VLC_TRUE );
+ add_string( SOUT_CFG_PREFIX "url", "", NULL, URL_TEXT, URL_LONGTEXT,
+ VLC_TRUE );
+ add_string( SOUT_CFG_PREFIX "email", "", NULL, EMAIL_TEXT, EMAIL_LONGTEXT,
+ VLC_TRUE );
+ add_string( SOUT_CFG_PREFIX "phone", "", NULL, PHONE_TEXT, PHONE_LONGTEXT,
+ VLC_TRUE );
add_suppressed_bool( SOUT_CFG_PREFIX "sap-ipv6" );
set_callbacks( Open, Close );
*****************************************************************************/
static const char *ppsz_sout_options[] = {
"access", "mux", "url", "dst",
- "sap", "name", "group", NULL
+ "sap", "name", "group", "description", "url", "email", "phone", NULL
};
#define DEFAULT_PORT 1234
sout_access_out_t *p_access;
sout_mux_t *p_mux;
- char *psz_mux_byext = NULL;
+ const char *psz_mux_byext = NULL;
- sout_CfgParse( p_stream, SOUT_CFG_PREFIX, ppsz_sout_options,
+ config_ChainParse( p_stream, SOUT_CFG_PREFIX, ppsz_sout_options,
p_stream->p_cfg );
var_Get( p_stream, SOUT_CFG_PREFIX "access", &val );
if( psz_url && strrchr( psz_url, '.' ) )
{
/* by extension */
- static struct { char *ext; char *mux; } exttomux[] =
+ static struct { const char *ext; const char *mux; } exttomux[] =
{
{ "avi", "avi" },
{ "ogg", "ogg" },
{ "wav","wav" },
{ NULL, NULL }
};
- char *psz_ext = strrchr( psz_url, '.' ) + 1;
+ const char *psz_ext = strrchr( psz_url, '.' ) + 1;
int i;
msg_Dbg( p_this, "extension is %s", psz_ext );
{
psz_mux = strdup("asfh");
}
- else if( !strncmp( psz_access, "udp", 3 ) ||
- !strncmp( psz_access, "rtp", 3 ) )
+ else if (!strcmp (psz_access, "udp")
+ || !strcmp (psz_access, "rtp") || !strcmp (psz_access, "udplite")
+ || !strcmp (psz_access, "tcp") || !strcmp (psz_access, "sctp")
+ || !strcmp (psz_access, "dccp"))
{
psz_mux = strdup("ts");
}
}
msg_Dbg( p_stream, "mux opened" );
- /* *** Create the SAP Session structure *** */
- var_Get( p_stream, SOUT_CFG_PREFIX "sap", &val );
- if( val.b_bool &&
- ( strstr( psz_access, "udp" ) || strstr( psz_access , "rtp" ) ) )
+ /* *** Create the SAP Session structure *** */
+ if( var_GetBool( p_stream, SOUT_CFG_PREFIX"sap" ) )
{
- session_descriptor_t *p_session = sout_AnnounceSessionCreate();
- announce_method_t *p_method =
- sout_AnnounceMethodCreate( METHOD_TYPE_SAP );
+ session_descriptor_t *p_session;
+ announce_method_t *p_method = sout_SAPMethod ();
vlc_url_t url;
+ const int payload_type = 33;
- var_Get( p_stream, SOUT_CFG_PREFIX "name", &val );
- if( *val.psz_string )
- p_session->psz_name = val.psz_string;
- else
+ static const struct { const char *access; const char *fmt; } fmts[] =
+ {
+ { "udp", "udp mpeg" },
+ { "rtp", "RTP/AVP %d" },
+ { "udplite", "UDPLite/RTP/AVP %d" },
+ /* Currently unsupported access outputs: */
+ { "dccp", "DCCP/RTP/AVP %d" },
+ { "tcp", "TCP/RTP/AVP %d" },
+ /* TLS/DTLS variants (none implemented). */
+ { "dtls", "UDP/TLS/RTP/AVP %d" },
+ { "dtlslite", "UDPLite/TLS/RTP/AVP %d" },
+ { "dccps", "DCCP/TLS/RTP/AVP %d" },
+ { "tls", "TCP/TLS/RTP/AVP %d" },
+ /* SRTP (not implemented) */
+ { "srtp", "RTP/SAVP %d" },
+ { "sudplite", "UDPLite/RTP/SAVP %d" },
+ { "sdccp", "DCCP/RTP/SAVP %d" },
+ { "stcp", "TCP/RTP/SAVP %d" },
+ { NULL, NULL }
+ };
+ const char *psz_sdp_fmt = NULL;
+ char *fmt, *src, *dst;
+ int sport, dport;
+
+ for (unsigned i = 0; fmts[i].access != NULL; i++)
+ if (strcasecmp (fmts[i].access, psz_access) == 0)
+ {
+ psz_sdp_fmt = fmts[i].fmt;
+ break;
+ }
+
+ 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");
+ msg_Err (p_stream, "%p, %p, %d, %d", src, dst, sport, dport);
+
+ if ((psz_sdp_fmt == NULL)
+ || (asprintf (&fmt, psz_sdp_fmt, payload_type) == -1))
+ fmt = NULL;
+
+ msg_Dbg( p_stream, "SAP advertized format: %s", fmt);
+ if ((fmt == NULL) || ((src == NULL) && (dst == NULL)))
{
- p_session->psz_name = strdup( psz_url );
- free( val.psz_string );
+ msg_Err (p_access, "SAP announces not supported for access %s",
+ psz_access);
+ free (fmt);
+ free (src);
+ free (dst);
+ goto nosap;
}
- var_Get( p_stream, SOUT_CFG_PREFIX "group", &val );
- if( *val.psz_string )
- p_session->psz_group = val.psz_string;
- else
- free( val.psz_string );
+ p_session = sout_AnnounceSessionCreate (VLC_OBJECT (p_stream),
+ SOUT_CFG_PREFIX);
+ sout_SessionSetMedia (VLC_OBJECT (p_stream), p_session, fmt,
+ src, sport, dst, dport);
/* Now, parse the URL to extract host and port */
vlc_UrlParse( &url, psz_url , 0);
{
if( url.i_port == 0 ) url.i_port = DEFAULT_PORT;
+#if 0
p_session->psz_uri = strdup( url.psz_host );
p_session->i_port = url.i_port;
- p_session->psz_sdp = NULL;
-
- var_Get( p_access, "sout-udp-ttl", &val );
- p_session->i_ttl = val.i_int;
- p_session->i_payload = 33;
p_session->b_rtp = strstr( psz_access, "rtp") ? 1 : 0;
-
+#endif
msg_Info( p_this, "SAP Enabled");
sout_AnnounceRegister( p_sout, p_session, p_method );
p_stream->p_sys->p_session = p_session;
}
vlc_UrlClean( &url );
-
- free( p_method );
+ sout_MethodRelease (p_method);
}
+nosap:
p_stream->pf_add = Add;
p_stream->pf_del = Del;
projects / vlc / blobdiff