X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fstream_out%2Fstandard.c;h=a386801421967d1a08a04d0fc71736657b04b0e5;hb=62a5a151673cdc8fc1300d93789006cdbcdf8873;hp=c805146ed69efa9e85f40bb1545ebbf82c8eff53;hpb=d3fe7f28797d4dba65ffcdd60bf932e758a48a9e;p=vlc diff --git a/modules/stream_out/standard.c b/modules/stream_out/standard.c index c805146ed6..a386801421 100644 --- a/modules/stream_out/standard.c +++ b/modules/stream_out/standard.c @@ -1,62 +1,82 @@ /***************************************************************************** * standard.c: standard stream output module ***************************************************************************** - * Copyright (C) 2003-2004 the VideoLAN team + * Copyright (C) 2003-2011 VLC authors and VideoLAN * $Id$ * * Authors: Laurent Aimar * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif -#include +#include +#include #include #include -#include "vlc_url.h" +#include /***************************************************************************** * Module descriptor *****************************************************************************/ #define ACCESS_TEXT N_("Output access method") -/// \bug [String] "Output method to use for the stream." #define ACCESS_LONGTEXT N_( \ - "This is the output access method that will be used." ) + "Output method to use for the stream." ) #define MUX_TEXT N_("Output muxer") -/// \bug [String] "Muxer to use for the stream." #define MUX_LONGTEXT N_( \ - "This is the muxer that will be used." ) -#define DST_TEXT N_("Output destination") -/// \bug [String] "Destination (URL) to use for the stream." -#define DST_LONGTEXT N_( \ - "This is the destination (URL) that will be used for the stream." ) + "Muxer to use for the stream." ) +#define DEST_TEXT N_("Output destination") +#define DEST_LONGTEXT N_( \ + "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. 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, 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 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)." ) +#define URL_TEXT N_("Session URL") +#define URL_LONGTEXT N_( \ + "This allows you to give a 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 GROUP_TEXT N_("Session groupname") -#define GROUP_LONGTEXT N_( \ - "This allows you to specify a group for the session, that will be announced "\ - "if you choose to use SAP." ) #define SAP_TEXT N_("SAP announcing") #define SAP_LONGTEXT N_("Announce this session with SAP.") @@ -66,311 +86,345 @@ 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 ); - - add_string( SOUT_CFG_PREFIX "access", "", NULL, ACCESS_TEXT, - 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_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_suppressed_bool( SOUT_CFG_PREFIX "sap-ipv6" ); - - set_callbacks( Open, Close ); -vlc_module_end(); +vlc_module_begin () + set_shortname( N_("Standard")) + set_description( N_("Standard stream output") ) + set_capability( "sout stream", 50 ) + add_shortcut( "standard", "std", "file", "http", "udp" ) + set_category( CAT_SOUT ) + set_subcategory( SUBCAT_SOUT_STREAM ) + + add_string( SOUT_CFG_PREFIX "access", "", ACCESS_TEXT, ACCESS_LONGTEXT, false ) + add_string( SOUT_CFG_PREFIX "mux", "", MUX_TEXT, MUX_LONGTEXT, false ) + add_string( SOUT_CFG_PREFIX "dst", "", DEST_TEXT, DEST_LONGTEXT, false ) + add_string( SOUT_CFG_PREFIX "bind", "", BIND_TEXT, BIND_LONGTEXT, false ) + add_string( SOUT_CFG_PREFIX "path", "", PATH_TEXT, PATH_LONGTEXT, false ) + add_bool( SOUT_CFG_PREFIX "sap", false, SAP_TEXT, SAP_LONGTEXT, true ) + add_string( SOUT_CFG_PREFIX "name", "", NAME_TEXT, NAME_LONGTEXT, true ) + add_obsolete_string( SOUT_CFG_PREFIX "group" ) /* since 2.1.0 */ + add_string( SOUT_CFG_PREFIX "description", "", DESC_TEXT, DESC_LONGTEXT, true ) + add_string( SOUT_CFG_PREFIX "url", "", URL_TEXT, URL_LONGTEXT, true ) + add_string( SOUT_CFG_PREFIX "email", "", EMAIL_TEXT, EMAIL_LONGTEXT, true ) + add_string( SOUT_CFG_PREFIX "phone", "", PHONE_TEXT, PHONE_LONGTEXT, true ) + + 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", NULL + "sap", "name", "description", "url", "email", "phone", + "bind", "path", NULL }; #define DEFAULT_PORT 1234 -static sout_stream_id_t *Add ( sout_stream_t *, es_format_t * ); -static int Del ( sout_stream_t *, sout_stream_id_t * ); -static int Send( sout_stream_t *, sout_stream_id_t *, block_t* ); - struct sout_stream_sys_t { sout_mux_t *p_mux; session_descriptor_t *p_session; }; -/***************************************************************************** - * Open: - *****************************************************************************/ -static int Open( vlc_object_t *p_this ) +struct sout_stream_id_sys_t { - sout_stream_t *p_stream = (sout_stream_t*)p_this; - sout_instance_t *p_sout = p_stream->p_sout; - - char *psz_mux; - char *psz_access; - char *psz_url; - - vlc_value_t val; +}; - sout_access_out_t *p_access; - sout_mux_t *p_mux; +static sout_stream_id_sys_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt ) +{ + return (sout_stream_id_sys_t*)sout_MuxAddStream( p_stream->p_sys->p_mux, p_fmt ); +} - char *psz_mux_byext = NULL; +static int Del( sout_stream_t *p_stream, sout_stream_id_sys_t *id ) +{ + sout_MuxDeleteStream( p_stream->p_sys->p_mux, (sout_input_t*)id ); + return VLC_SUCCESS; +} - config_ChainParse( p_stream, SOUT_CFG_PREFIX, ppsz_sout_options, - p_stream->p_cfg ); +static int Send( sout_stream_t *p_stream, sout_stream_id_sys_t *id, + block_t *p_buffer ) +{ + return sout_MuxSendBuffer( p_stream->p_sys->p_mux, (sout_input_t*)id, p_buffer ); +} +static void create_SDP(sout_stream_t *p_stream, sout_access_out_t *p_access) +{ + sout_stream_sys_t *p_sys = p_stream->p_sys; + + static const struct addrinfo hints = { + .ai_family = AF_UNSPEC, + .ai_socktype = SOCK_DGRAM, + .ai_protocol = 0, + .ai_flags = AI_NUMERICHOST | AI_NUMERICSERV | AI_IDN, + }; + 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 (dhost, dport, &hints, &res)) + { + memcpy (&dst, res->ai_addr, dstlen = res->ai_addrlen); + freeaddrinfo (res); + } - 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 ); + if (!vlc_getaddrinfo (shost, sport, &hints, &res)) + { + memcpy (&src, res->ai_addr, srclen = res->ai_addrlen); + freeaddrinfo (res); + } - 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 ); + char *head = vlc_sdp_Start (VLC_OBJECT (p_stream), SOUT_CFG_PREFIX, + (struct sockaddr *)&src, srclen, + (struct sockaddr *)&dst, dstlen); + free (shost); + if (head != NULL) + { + char *psz_sdp = NULL; + if (asprintf (&psz_sdp, "%s" + "m=video %d udp mpeg\r\n", head, dport) == -1) + psz_sdp = NULL; + free (head); + + /* Register the SDP with the SAP thread */ + if (psz_sdp) + { + msg_Dbg (p_stream, "Generated SDP:\n%s", psz_sdp); + p_sys->p_session = + sout_AnnounceRegisterSDP (p_stream, psz_sdp, dhost); + free( psz_sdp ); + } + } + free (dhost); +} - 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 ); +static const char *getMuxFromAlias( const char *psz_alias ) +{ + static struct { const char alias[6]; const char mux[32]; } mux_alias[] = + { + { "avi", "avi" }, + { "ogg", "ogg" }, + { "ogm", "ogg" }, + { "ogv", "ogg" }, + { "flac","raw" }, + { "mp3", "raw" }, + { "mp4", "mp4" }, + { "mov", "mov" }, + { "moov","mov" }, + { "asf", "asf" }, + { "wma", "asf" }, + { "wmv", "asf" }, + { "trp", "ts" }, + { "ts", "ts" }, + { "mpg", "ps" }, + { "mpeg","ps" }, + { "ps", "ps" }, + { "mpeg1","mpeg1" }, + { "wav", "wav" }, + { "flv", "avformat{mux=flv}" }, + { "mkv", "avformat{mux=matroska}"}, + { "webm", "avformat{mux=webm}"}, + }; + + if( !psz_alias ) + return NULL; - p_stream->p_sys = malloc( sizeof( sout_stream_sys_t) ); - p_stream->p_sys->p_session = NULL; + for( size_t i = 0; i < sizeof mux_alias / sizeof *mux_alias; i++ ) + if( !strcasecmp( psz_alias, mux_alias[i].alias ) ) + return mux_alias[i].mux; - msg_Dbg( p_this, "creating `%s/%s://%s'", psz_access, psz_mux, psz_url ); + return NULL; +} - /* ext -> muxer name */ - if( psz_url && strrchr( psz_url, '.' ) ) +static int fixAccessMux( sout_stream_t *p_stream, char **ppsz_mux, + char **ppsz_access, const char *psz_url ) +{ + char *psz_mux = *ppsz_mux; + char *psz_access = *ppsz_access; + if( !psz_mux ) { - /* by extension */ - static struct { char *ext; char *mux; } exttomux[] = - { - { "avi", "avi" }, - { "ogg", "ogg" }, - { "ogm", "ogg" }, - { "mp4", "mp4" }, - { "mov", "mov" }, - { "moov","mov" }, - { "asf", "asf" }, - { "wma", "asf" }, - { "wmv", "asf" }, - { "trp", "ts" }, - { "ts", "ts" }, - { "mpg", "ps" }, - { "mpeg","ps" }, - { "ps", "ps" }, - { "mpeg1","mpeg1" }, - { "wav","wav" }, - { NULL, NULL } - }; - char *psz_ext = strrchr( psz_url, '.' ) + 1; - int i; - - msg_Dbg( p_this, "extension is %s", psz_ext ); - for( i = 0; exttomux[i].ext != NULL; i++ ) + const char *psz_ext = psz_url ? strrchr( psz_url, '.' ) : NULL; + if( psz_ext ) + psz_ext++; /* use extension */ + const char *psz_mux_byext = getMuxFromAlias( psz_ext ); + + if( !psz_access ) { - if( !strcasecmp( psz_ext, exttomux[i].ext ) ) + if( !psz_mux_byext ) { - psz_mux_byext = exttomux[i].mux; - break; + msg_Err( p_stream, "no access _and_ no muxer" ); + return 1; } - } - msg_Dbg( p_this, "extension -> mux=%s", psz_mux_byext ); - } - - /* We fix access/mux to valid couple */ - if( !psz_access && !psz_mux ) - { - if( psz_mux_byext ) - { msg_Warn( p_stream, - "no access _and_ no muxer, extension gives file/%s", - psz_mux_byext ); - psz_access = strdup("file"); - psz_mux = strdup(psz_mux_byext); + "no access _and_ no muxer, extension gives file/%s", + psz_mux_byext ); + *ppsz_access = strdup("file"); + *ppsz_mux = strdup(psz_mux_byext); } else { - msg_Err( p_stream, "no access _and_ no muxer (fatal error)" ); - return VLC_EGENERIC; + if( !strncmp( psz_access, "mmsh", 4 ) ) + *ppsz_mux = strdup("asfh"); + else if (!strcmp (psz_access, "udp")) + *ppsz_mux = strdup("ts"); + else if( psz_mux_byext ) + *ppsz_mux = strdup(psz_mux_byext); + else + { + msg_Err( p_stream, "no mux specified or found by extension" ); + return 1; + } } } - - if( psz_access && !psz_mux ) + else if( !psz_access ) { - /* access given, no mux */ - if( !strncmp( psz_access, "mmsh", 4 ) ) - { - psz_mux = strdup("asfh"); - } - else if( !strncmp( psz_access, "udp", 3 ) || - !strncmp( psz_access, "rtp", 3 ) ) - { - psz_mux = strdup("ts"); - } - else if( psz_mux_byext ) - { - psz_mux = strdup(psz_mux_byext); - } - else - { - msg_Err( p_stream, "no mux specified or found by extension" ); - return VLC_EGENERIC; - } + if( !strncmp( psz_mux, "asfh", 4 ) ) + *ppsz_access = strdup("mmsh"); + else /* default file */ + *ppsz_access = strdup("file"); } - else if( psz_mux && !psz_access ) + return 0; +} + +static bool exactMatch( const char *psz_target, const char *psz_string, + size_t i_len ) +{ + if ( strncmp( psz_target, psz_string, i_len ) ) + return false; + else + return ( psz_target[i_len] < 'a' || psz_target[i_len] > 'z' ); +} + +static void checkAccessMux( sout_stream_t *p_stream, char *psz_access, + char *psz_mux ) +{ + if( exactMatch( psz_access, "mmsh", 4 ) && !exactMatch( psz_mux, "asfh", 4 ) ) + msg_Err( p_stream, "mmsh output is only valid with asfh mux" ); + else if( !exactMatch( psz_access, "file", 4 ) && + ( exactMatch( psz_mux, "mov", 3 ) || exactMatch( psz_mux, "mp4", 3 ) ) ) + msg_Err( p_stream, "mov and mp4 mux are only valid with file output" ); + else if( exactMatch( psz_access, "udp", 3 ) ) { - /* mux given, no access */ - if( !strncmp( psz_mux, "asfh", 4 ) ) - { - psz_access = strdup("mmsh"); - } - else - { - /* default file */ - psz_access = strdup("file"); + if( exactMatch( psz_mux, "ffmpeg", 6 ) || exactMatch( psz_mux, "avformat", 8 ) ) + { /* why would you use ffmpeg's ts muxer ? YOU DON'T LOVE VLC ??? */ + char *psz_ffmpeg_mux = var_CreateGetString( p_stream, "sout-avformat-mux" ); + if( !psz_ffmpeg_mux || strncmp( psz_ffmpeg_mux, "mpegts", 6 ) ) + msg_Err( p_stream, "UDP output is only valid with TS mux" ); + free( psz_ffmpeg_mux ); } + else if( !exactMatch( psz_mux, "ts", 2 ) ) + msg_Err( p_stream, "UDP output is only valid with TS mux" ); } +} + +/***************************************************************************** + * Open: + *****************************************************************************/ +static int Open( vlc_object_t *p_this ) +{ + sout_stream_t *p_stream = (sout_stream_t*)p_this; + sout_stream_sys_t *p_sys; + char *psz_mux, *psz_access, *psz_url; + sout_access_out_t *p_access; + int ret = VLC_EGENERIC; + + config_ChainParse( p_stream, SOUT_CFG_PREFIX, ppsz_sout_options, + p_stream->p_cfg ); + + psz_mux = var_GetNonEmptyString( p_stream, SOUT_CFG_PREFIX "mux" ); + + psz_access = var_GetNonEmptyString( p_stream, SOUT_CFG_PREFIX "access" ); + if( !psz_access ) + psz_access = strdup(p_stream->psz_name); - /* fix or warn of incompatible couple */ - if( psz_mux && psz_access ) + psz_url = var_GetNonEmptyString( p_stream, SOUT_CFG_PREFIX "dst" ); + if (!psz_url) { - if( !strncmp( psz_access, "mmsh", 4 ) && - strncmp( psz_mux, "asfh", 4 ) ) + char *psz_bind = var_GetNonEmptyString( p_stream, SOUT_CFG_PREFIX "bind" ); + if( psz_bind ) { - char *p = strchr( psz_mux,'{' ); - - msg_Warn( p_stream, "fixing to mmsh/asfh" ); - if( p ) + char *psz_path = var_GetNonEmptyString( p_stream, SOUT_CFG_PREFIX "path" ); + if( psz_path ) { - /* -> a little memleak but ... */ - psz_mux = malloc( strlen( "asfh" ) + strlen( p ) + 1); - sprintf( psz_mux, "asfh%s", p ); + if( asprintf( &psz_url, "%s/%s", psz_bind, psz_path ) == -1 ) + psz_url = NULL; + free(psz_bind); + free( psz_path ); } else - { - psz_mux = strdup("asfh"); - } - } - else if( ( !strncmp( psz_access, "rtp", 3 ) || - !strncmp( psz_access, "udp", 3 ) ) && - strncmp( psz_mux, "ts", 2 ) ) - { - msg_Err( p_stream, "for now udp and rtp are only valid with TS" ); - } - else if( strncmp( psz_access, "file", 4 ) && - ( !strncmp( psz_mux, "mov", 3 ) || - !strncmp( psz_mux, "mp4", 3 ) ) ) - { - msg_Err( p_stream, "mov and mp4 work only with file output" ); + psz_url = psz_bind; } } - msg_Dbg( p_this, "using `%s/%s://%s'", psz_access, psz_mux, psz_url ); - - /* *** find and open appropriate access module *** */ - p_access = sout_AccessOutNew( p_sout, psz_access, psz_url ); - if( p_access == NULL ) + p_sys = p_stream->p_sys = malloc( sizeof( sout_stream_sys_t) ); + if( !p_sys ) { - msg_Err( p_stream, "no suitable sout access module for `%s/%s://%s'", - psz_access, psz_mux, psz_url ); - if( psz_access ) free( psz_access ); - if( psz_mux ) free( psz_mux ); - return VLC_EGENERIC; + ret = VLC_ENOMEM; + goto end; } - msg_Dbg( p_stream, "access opened" ); + p_sys->p_session = NULL; + + if( fixAccessMux( p_stream, &psz_mux, &psz_access, psz_url ) ) + goto end; - /* *** find and open appropriate mux module *** */ - p_mux = sout_MuxNew( p_sout, psz_mux, p_access ); - if( p_mux == NULL ) + checkAccessMux( p_stream, psz_access, psz_mux ); + + p_access = sout_AccessOutNew( p_stream, psz_access, psz_url ); + if( p_access == NULL ) { - msg_Err( p_stream, "no suitable sout mux module for `%s/%s://%s'", + msg_Err( p_stream, "no suitable sout access module for `%s/%s://%s'", psz_access, psz_mux, psz_url ); - - sout_AccessOutDelete( p_access ); - if( psz_access ) free( psz_access ); - if( psz_mux ) free( psz_mux ); - return VLC_EGENERIC; + goto end; } - 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" ) ) ) + p_sys->p_mux = sout_MuxNew( p_stream->p_sout, psz_mux, p_access ); + if( !p_sys->p_mux ) { - session_descriptor_t *p_session = sout_AnnounceSessionCreate(); - announce_method_t *p_method = - sout_AnnounceMethodCreate( METHOD_TYPE_SAP ); - vlc_url_t url; - - var_Get( p_stream, SOUT_CFG_PREFIX "name", &val ); - if( *val.psz_string ) - p_session->psz_name = val.psz_string; - else + const char *psz_mux_guess = getMuxFromAlias( psz_mux ); + if( psz_mux_guess && strcmp( psz_mux_guess, psz_mux ) ) { - p_session->psz_name = strdup( psz_url ); - free( val.psz_string ); + msg_Dbg( p_stream, "Couldn't open mux `%s', trying `%s' instead", + psz_mux, psz_mux_guess ); + p_sys->p_mux = sout_MuxNew( p_stream->p_sout, psz_mux_guess, p_access ); } - 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 ); - - /* Now, parse the URL to extract host and port */ - vlc_UrlParse( &url, psz_url , 0); - - if( url.psz_host ) + if( !p_sys->p_mux ) { - if( url.i_port == 0 ) url.i_port = DEFAULT_PORT; - - p_session->psz_uri = strdup( url.psz_host ); - p_session->i_port = url.i_port; - p_session->psz_sdp = NULL; - p_session->i_ttl = var_CreateGetInteger (p_access, "ttl"); - p_session->i_payload = 33; - p_session->b_rtp = strstr( psz_access, "rtp") ? 1 : 0; - - msg_Info( p_this, "SAP Enabled"); + msg_Err( p_stream, "no suitable sout mux module for `%s/%s://%s'", + psz_access, psz_mux, psz_url ); - sout_AnnounceRegister( p_sout, p_session, p_method ); - p_stream->p_sys->p_session = p_session; + sout_AccessOutDelete( p_access ); + goto end; } - vlc_UrlClean( &url ); - - free( p_method ); } + if( var_GetBool( p_stream, SOUT_CFG_PREFIX"sap" ) ) + create_SDP( p_stream, p_access ); + p_stream->pf_add = Add; p_stream->pf_del = Del; p_stream->pf_send = Send; + if( !sout_AccessOutCanControlPace( p_access ) ) + p_stream->pace_nocontrol = true; - p_stream->p_sys->p_mux = p_mux; + ret = VLC_SUCCESS; - if( psz_access ) free( psz_access ); - if( psz_mux ) free( psz_mux ); - if( psz_url ) free( psz_url ); + msg_Dbg( p_this, "using `%s/%s://%s'", psz_access, psz_mux, psz_url ); +end: + if( ret != VLC_SUCCESS ) + free( p_sys ); + free( psz_access ); + free( psz_mux ); + free( psz_url ); - return VLC_SUCCESS; + return ret; } /***************************************************************************** @@ -383,57 +437,10 @@ static void Close( vlc_object_t * p_this ) 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_AnnounceUnRegister( p_stream, p_sys->p_session ); sout_MuxDelete( p_sys->p_mux ); sout_AccessOutDelete( p_access ); free( p_sys ); } - -struct sout_stream_id_t -{ - sout_input_t *p_input; -}; - - -static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt ) -{ - sout_stream_sys_t *p_sys = p_stream->p_sys; - sout_stream_id_t *id; - - id = malloc( sizeof( sout_stream_id_t ) ); - if( ( id->p_input = sout_MuxAddStream( p_sys->p_mux, p_fmt ) ) == NULL ) - { - free( id ); - - return NULL; - } - - return id; -} - -static int Del( sout_stream_t *p_stream, sout_stream_id_t *id ) -{ - sout_stream_sys_t *p_sys = p_stream->p_sys; - - sout_MuxDeleteStream( p_sys->p_mux, id->p_input ); - - free( id ); - - return VLC_SUCCESS; -} - -static int Send( sout_stream_t *p_stream, sout_stream_id_t *id, - block_t *p_buffer ) -{ - sout_stream_sys_t *p_sys = p_stream->p_sys; - - sout_MuxSendBuffer( p_sys->p_mux, id->p_input, p_buffer ); - - return VLC_SUCCESS; -}