X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fstream_out%2Fstandard.c;h=c86adf910d4eb4ae825fa69c13808e4d6779180a;hb=21dfee9de8ebccda05a8c8d41182df41e505db20;hp=0e4addf7eca7f6feac526b0851299232cb9f3b3f;hpb=13ae40b0efc4f1b1ce205d9a057537047fcab3f4;p=vlc diff --git a/modules/stream_out/standard.c b/modules/stream_out/standard.c index 0e4addf7ec..c86adf910d 100644 --- a/modules/stream_out/standard.c +++ b/modules/stream_out/standard.c @@ -1,24 +1,24 @@ /***************************************************************************** * standard.c: standard stream output module ***************************************************************************** - * Copyright (C) 2003-2007 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. *****************************************************************************/ /***************************************************************************** @@ -28,12 +28,12 @@ # include "config.h" #endif -#include +#include #include #include #include -#include "vlc_url.h" +#include /***************************************************************************** * Module descriptor @@ -59,19 +59,13 @@ #define NAME_LONGTEXT N_( \ "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_( \ - "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 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 an URL with more details about the stream " \ + "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") @@ -92,359 +86,340 @@ static void Close ( vlc_object_t * ); #define SOUT_CFG_PREFIX "sout-standard-" -vlc_module_begin(); - set_shortname( N_("Standard")); - set_description( N_("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, false ); - add_string( SOUT_CFG_PREFIX "mux", "", NULL, MUX_TEXT, - MUX_LONGTEXT, false ); - add_string( SOUT_CFG_PREFIX "dst", "", NULL, DEST_TEXT, - DEST_LONGTEXT, false ); - add_string( SOUT_CFG_PREFIX "bind", "", NULL, BIND_TEXT, - BIND_LONGTEXT, false ); - add_string( SOUT_CFG_PREFIX "path", "", NULL, PATH_TEXT, - PATH_LONGTEXT, false ); - change_unsafe(); - - add_bool( SOUT_CFG_PREFIX "sap", false, NULL, SAP_TEXT, SAP_LONGTEXT, - true ); - add_string( SOUT_CFG_PREFIX "name", "", NULL, NAME_TEXT, NAME_LONGTEXT, - true ); - add_string( SOUT_CFG_PREFIX "group", "", NULL, GROUP_TEXT, GROUP_LONGTEXT, - true ); - add_string( SOUT_CFG_PREFIX "description", "", NULL, DESC_TEXT, DESC_LONGTEXT, - true ); - add_string( SOUT_CFG_PREFIX "url", "", NULL, URL_TEXT, URL_LONGTEXT, - true ); - add_string( SOUT_CFG_PREFIX "email", "", NULL, EMAIL_TEXT, EMAIL_LONGTEXT, - true ); - add_string( SOUT_CFG_PREFIX "phone", "", NULL, PHONE_TEXT, PHONE_LONGTEXT, - true ); - add_obsolete_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", "description", "url", "email", "phone", + "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 ) +static sout_stream_id_sys_t * Add( sout_stream_t *p_stream, const es_format_t *p_fmt ) { - 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; - char *psz_url=NULL; - char *psz_bind; - char *psz_path; - - vlc_value_t val; - - sout_access_out_t *p_access; - sout_mux_t *p_mux; - - const char *psz_mux_byext = NULL; - - config_ChainParse( p_stream, SOUT_CFG_PREFIX, ppsz_sout_options, - p_stream->p_cfg ); - - 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 ); - - 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 ); - - var_Get( p_stream, SOUT_CFG_PREFIX "bind", &val ); - psz_bind = *val.psz_string ? val.psz_string : NULL; - if( !*val.psz_string ) free( val.psz_string); + return (sout_stream_id_sys_t*)sout_MuxAddStream( p_stream->p_sys->p_mux, p_fmt ); +} - var_Get( p_stream, SOUT_CFG_PREFIX "path", &val ); - psz_path = *val.psz_string ? val.psz_string : NULL; - if( !*val.psz_string ) free( val.psz_string); +static void Del( sout_stream_t *p_stream, sout_stream_id_sys_t *id ) +{ + sout_MuxDeleteStream( p_stream->p_sys->p_mux, (sout_input_t*)id ); +} - if( psz_bind ) psz_url = psz_bind; - if( psz_url && psz_path ) +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)) { - if( asprintf( &psz_url,"%s/%s",psz_url,psz_path ) == -1 ) - psz_url = NULL; - free( psz_path ); + memcpy (&dst, res->ai_addr, dstlen = res->ai_addrlen); + freeaddrinfo (res); } - var_Get( p_stream, SOUT_CFG_PREFIX "dst", &val ); - if( *val.psz_string ) + if (!vlc_getaddrinfo (shost, sport, &hints, &res)) { - free( psz_url); - psz_url = val.psz_string; + memcpy (&src, res->ai_addr, srclen = res->ai_addrlen); + freeaddrinfo (res); } - else - free( val.psz_string ); - - 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 ); + char *head = vlc_sdp_Start (VLC_OBJECT (p_stream), SOUT_CFG_PREFIX, + (struct sockaddr *)&src, srclen, + (struct sockaddr *)&dst, dstlen); + free (shost); - /* ext -> muxer name */ - if( psz_url && strrchr( psz_url, '.' ) ) + if (head != NULL) { - /* by extension */ - static struct { const char ext[6]; const char mux[32]; } 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" }, - { "flv", "ffmpeg{mux=flv}" }, - { "mkv", "ffmpeg{mux=matroska}"}, - { "", "" } - }; - const char *psz_ext = strrchr( psz_url, '.' ) + 1; - int i; - - msg_Dbg( p_this, "extension is %s", psz_ext ); - for( i = 0; exttomux[i].ext[0]; i++ ) + 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) { - if( !strcasecmp( psz_ext, exttomux[i].ext ) ) - { - psz_mux_byext = exttomux[i].mux; - break; - } + msg_Dbg (p_stream, "Generated SDP:\n%s", psz_sdp); + p_sys->p_session = + sout_AnnounceRegisterSDP (p_stream, psz_sdp, dhost); + free( psz_sdp ); } - msg_Dbg( p_this, "extension -> mux=%s", psz_mux_byext ); } + free (dhost); +} - /* We fix access/mux to valid couple */ - - if( !psz_access && !psz_mux ) +static const char *getMuxFromAlias( const char *psz_alias ) +{ + static struct { const char alias[6]; const char mux[32]; } mux_alias[] = { - 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); - } - else - { - msg_Err( p_stream, "no access _and_ no muxer (fatal error)" ); - return VLC_EGENERIC; - } - } + { "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; + + 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; - if( psz_access && !psz_mux ) + return NULL; +} + +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 ) { - /* access given, no mux */ - if( !strncmp( psz_access, "mmsh", 4 ) ) - { - psz_mux = strdup("asfh"); - } - else if (!strcmp (psz_access, "udp")) - { - psz_mux = strdup("ts"); - } - else if( psz_mux_byext ) + 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 ) { - psz_mux = strdup(psz_mux_byext); + if( !psz_mux_byext ) + { + msg_Err( p_stream, "no access _and_ no muxer" ); + return 1; + } + + msg_Warn( p_stream, + "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 mux specified or found by extension" ); - 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; + } } } - else if( psz_mux && !psz_access ) + else if( !psz_access ) { - /* mux given, no access */ if( !strncmp( psz_mux, "asfh", 4 ) ) - { - psz_access = strdup("mmsh"); - } - else - { - /* default file */ - psz_access = strdup("file"); - } + *ppsz_access = strdup("mmsh"); + else /* default file */ + *ppsz_access = strdup("file"); } + return 0; +} - /* fix or warn of incompatible couple */ - if( !strncmp( psz_access, "mmsh", 4 ) && - strncmp( psz_mux, "asfh", 4 ) ) - { - char *p = strchr( psz_mux,'{' ); +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' ); +} - msg_Warn( p_stream, "fixing to mmsh/asfh" ); - if( p ) - { - if( asprintf( &p, "asfh%s", p ) == -1 ) - p = NULL; - free( psz_mux ); - psz_mux = p; - } - else - { - free( psz_mux ); - psz_mux = strdup("asfh"); - } - } - else if( !strncmp( psz_access, "udp", 3 ) ) +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 ) ) { - if( !strncmp( psz_mux, "ffmpeg", 6 ) ) + 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_this, "ffmpeg-mux" ); + 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 is only valid with TS" ); + msg_Err( p_stream, "UDP output is only valid with TS mux" ); free( psz_ffmpeg_mux ); } - else if( strncmp( psz_mux, "ts", 2 ) ) + 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); + + psz_url = var_GetNonEmptyString( p_stream, SOUT_CFG_PREFIX "dst" ); + if (!psz_url) + { + char *psz_bind = var_GetNonEmptyString( p_stream, SOUT_CFG_PREFIX "bind" ); + if( psz_bind ) { - msg_Err( p_stream, "UDP is only valid with TS" ); + char *psz_path = var_GetNonEmptyString( p_stream, SOUT_CFG_PREFIX "path" ); + if( psz_path ) + { + if( asprintf( &psz_url, "%s/%s", psz_bind, psz_path ) == -1 ) + psz_url = NULL; + free(psz_bind); + free( psz_path ); + } + else + psz_url = psz_bind; } } - else if( strncmp( psz_access, "file", 4 ) && - ( !strncmp( psz_mux, "mov", 3 ) || - !strncmp( psz_mux, "mp4", 3 ) ) ) + + p_sys = p_stream->p_sys = malloc( sizeof( sout_stream_sys_t) ); + if( !p_sys ) { - msg_Err( p_stream, "mov and mp4 work only with file output" ); + ret = VLC_ENOMEM; + goto end; } + p_sys->p_session = NULL; - msg_Dbg( p_this, "using `%s/%s://%s'", psz_access, psz_mux, psz_url ); + if( fixAccessMux( p_stream, &psz_mux, &psz_access, psz_url ) ) + goto end; + + checkAccessMux( p_stream, psz_access, psz_mux ); - /* *** find and open appropriate access module *** */ - p_access = sout_AccessOutNew( p_sout, psz_access, psz_url ); + p_access = sout_AccessOutNew( p_stream, psz_access, psz_url ); if( p_access == NULL ) { msg_Err( p_stream, "no suitable sout access module for `%s/%s://%s'", psz_access, psz_mux, psz_url ); - free( psz_access ); - free( psz_mux ); - return VLC_EGENERIC; + goto end; } - msg_Dbg( p_stream, "access opened" ); - /* *** find and open appropriate mux module *** */ - p_mux = sout_MuxNew( p_sout, psz_mux, p_access ); - if( p_mux == NULL ) + p_sys->p_mux = sout_MuxNew( p_stream->p_sout, psz_mux, p_access ); + if( !p_sys->p_mux ) { - msg_Err( p_stream, "no suitable sout mux module for `%s/%s://%s'", - psz_access, psz_mux, psz_url ); - - sout_AccessOutDelete( p_access ); - free( psz_access ); - free( psz_mux ); - return VLC_EGENERIC; - } - msg_Dbg( p_stream, "mux opened" ); - - /* *** Create the SAP Session structure *** */ - if( var_GetBool( p_stream, SOUT_CFG_PREFIX"sap" ) ) - { - /* 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); - } - - if (vlc_getaddrinfo (VLC_OBJECT (p_stream), shost, sport, NULL, &res) == 0) + const char *psz_mux_guess = getMuxFromAlias( psz_mux ); + if( psz_mux_guess && strcmp( psz_mux_guess, psz_mux ) ) { - memcpy (&src, res->ai_addr, srclen = res->ai_addrlen); - vlc_freeaddrinfo (res); + 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 ); } - char *head = vlc_sdp_Start (VLC_OBJECT (p_stream), SOUT_CFG_PREFIX, - (struct sockaddr *)&src, srclen, - (struct sockaddr *)&dst, dstlen); - free (shost); - - char *psz_sdp = NULL; - if (head != 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 != NULL) + if( !p_sys->p_mux ) { - announce_method_t *p_method = sout_SAPMethod (); - msg_Dbg (p_stream, "Generated SDP:\n%s", psz_sdp); + msg_Err( p_stream, "no suitable sout mux module for `%s/%s://%s'", + psz_access, psz_mux, psz_url ); - p_sys->p_session = - sout_AnnounceRegisterSDP (p_sout, psz_sdp, dhost, p_method); - sout_MethodRelease (p_method); - free( psz_sdp ); + sout_AccessOutDelete( p_access ); + goto end; } - free (dhost); } + 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; + + ret = VLC_SUCCESS; - p_sys->p_mux = p_mux; + 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; } /***************************************************************************** @@ -457,53 +432,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_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; -}