X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fstream_out%2Fstandard.c;h=f052ccba2127910e9175d366ad240d73529af307;hb=dadb0622e6244456f7b5576ab2f9aa0c6582c683;hp=6b97d20af2ce44b739b38b2c01d5965075cc599b;hpb=3ead0c71de880ae8e114d678d5ea9f892feda29c;p=vlc diff --git a/modules/stream_out/standard.c b/modules/stream_out/standard.c index 6b97d20af2..f052ccba21 100644 --- a/modules/stream_out/standard.c +++ b/modules/stream_out/standard.c @@ -28,16 +28,16 @@ # include "config.h" #endif -#ifdef WIN32 -# define _WIN32_WINNT 0x0501 +#ifndef _WIN32_WINNT +# define _WIN32_WINNT 0x0500 #endif -#include +#include #include #include #include -#include "vlc_url.h" +#include /***************************************************************************** * Module descriptor @@ -96,45 +96,43 @@ 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 ); +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", "", NULL, ACCESS_TEXT, - ACCESS_LONGTEXT, false ); + ACCESS_LONGTEXT, false ) add_string( SOUT_CFG_PREFIX "mux", "", NULL, MUX_TEXT, - MUX_LONGTEXT, false ); + MUX_LONGTEXT, false ) add_string( SOUT_CFG_PREFIX "dst", "", NULL, DEST_TEXT, - DEST_LONGTEXT, false ); + DEST_LONGTEXT, false ) add_string( SOUT_CFG_PREFIX "bind", "", NULL, BIND_TEXT, - BIND_LONGTEXT, false ); + BIND_LONGTEXT, false ) add_string( SOUT_CFG_PREFIX "path", "", NULL, PATH_TEXT, - PATH_LONGTEXT, false ); - change_unsafe(); + PATH_LONGTEXT, false ) add_bool( SOUT_CFG_PREFIX "sap", false, NULL, SAP_TEXT, SAP_LONGTEXT, - true ); + true ) add_string( SOUT_CFG_PREFIX "name", "", NULL, NAME_TEXT, NAME_LONGTEXT, - true ); + true ) add_string( SOUT_CFG_PREFIX "group", "", NULL, GROUP_TEXT, GROUP_LONGTEXT, - true ); + true ) add_string( SOUT_CFG_PREFIX "description", "", NULL, DESC_TEXT, DESC_LONGTEXT, - true ); + true ) add_string( SOUT_CFG_PREFIX "url", "", NULL, URL_TEXT, URL_LONGTEXT, - true ); + true ) add_string( SOUT_CFG_PREFIX "email", "", NULL, EMAIL_TEXT, EMAIL_LONGTEXT, - true ); + true ) add_string( SOUT_CFG_PREFIX "phone", "", NULL, PHONE_TEXT, PHONE_LONGTEXT, - true ); - add_obsolete_bool( SOUT_CFG_PREFIX "sap-ipv6" ); + true ) + add_obsolete_bool( SOUT_CFG_PREFIX "sap-ipv6" ) - set_callbacks( Open, Close ); -vlc_module_end(); + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** @@ -183,32 +181,41 @@ static int Open( vlc_object_t *p_this ) 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); + psz_access = var_GetString( p_stream, SOUT_CFG_PREFIX "access" ); + if( EMPTY_STR(psz_access) ) + { + if( !strcmp( p_stream->psz_name, "http" ) ) + { + psz_access = strdup("http"); + } + else if (!strcmp (p_stream->psz_name, "udp")) + { + psz_access = strdup("udp"); + } + else if (!strcmp (p_stream->psz_name, "file")) + { + psz_access = strdup("file"); + } + } - 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); + psz_mux = var_GetNonEmptyString( p_stream, SOUT_CFG_PREFIX "mux" ); + psz_bind = var_GetNonEmptyString( p_stream, SOUT_CFG_PREFIX "bind" ); + psz_path = var_GetNonEmptyString( p_stream, SOUT_CFG_PREFIX "path" ); - if( psz_bind ) psz_url = psz_bind; - if( psz_url && psz_path ) + if( psz_bind && psz_path ) { - if( asprintf( &psz_url,"%s/%s",psz_url,psz_path ) == -1 ) + if( asprintf( &psz_url, "%s/%s", psz_bind, psz_path ) == -1 ) psz_url = NULL; - free( psz_path ); } + else if( psz_bind ) + { + psz_url = psz_bind; + psz_bind = NULL; + } + free( psz_path ); var_Get( p_stream, SOUT_CFG_PREFIX "dst", &val ); - if( *val.psz_string ) + if( *val.psz_string ) { free( psz_url); psz_url = val.psz_string; @@ -217,7 +224,14 @@ static int Open( vlc_object_t *p_this ) 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_access ); + free( psz_mux ); + free( psz_bind ); + 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 ); @@ -231,6 +245,9 @@ static int Open( vlc_object_t *p_this ) { "avi", "avi" }, { "ogg", "ogg" }, { "ogm", "ogg" }, + { "ogv", "ogg" }, + { "flac","raw" }, + { "mp3", "raw" }, { "mp4", "mp4" }, { "mov", "mov" }, { "moov","mov" }, @@ -246,13 +263,13 @@ static int Open( vlc_object_t *p_this ) { "wav", "wav" }, { "flv", "ffmpeg{mux=flv}" }, { "mkv", "ffmpeg{mux=matroska}"}, + { "webm", "ffmpeg{mux=webm}"}, { "", "" } }; 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++ ) + for( int i = 0; exttomux[i].ext[0]; i++ ) { if( !strcasecmp( psz_ext, exttomux[i].ext ) ) { @@ -278,6 +295,9 @@ static int Open( vlc_object_t *p_this ) else { msg_Err( p_stream, "no access _and_ no muxer (fatal error)" ); + free( psz_bind ); + free( psz_url ); + free( p_sys ); return VLC_EGENERIC; } } @@ -300,6 +320,10 @@ static int Open( vlc_object_t *p_this ) else { msg_Err( p_stream, "no mux specified or found by extension" ); + free( psz_access ); + free( psz_bind ); + free( psz_url ); + free( p_sys ); return VLC_EGENERIC; } } @@ -368,6 +392,9 @@ static int Open( vlc_object_t *p_this ) psz_access, psz_mux, psz_url ); free( psz_access ); free( psz_mux ); + free( psz_bind ); + free( psz_url ); + free( p_sys ); return VLC_EGENERIC; } msg_Dbg( p_stream, "access opened" ); @@ -382,6 +409,9 @@ static int Open( vlc_object_t *p_this ) sout_AccessOutDelete( p_access ); free( psz_access ); free( psz_mux ); + free( psz_bind ); + free( psz_url ); + free( p_sys ); return VLC_EGENERIC; } msg_Dbg( p_stream, "mux opened" ); @@ -400,20 +430,17 @@ static int Open( vlc_object_t *p_this ) 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; - snprintf (port, sizeof (port), "%d", dport); - if (getaddrinfo (dhost, port, &hints, &res) == 0) + if ( vlc_getaddrinfo ( VLC_OBJECT(p_stream), dhost, dport, &hints, &res) == 0) { memcpy (&dst, res->ai_addr, dstlen = res->ai_addrlen); freeaddrinfo (res); } - snprintf (port, sizeof (port), "%d", sport); - if (getaddrinfo (shost, port, &hints, &res) == 0) + if (vlc_getaddrinfo ( VLC_OBJECT(p_stream), shost, sport, &hints, &res) == 0) { memcpy (&src, res->ai_addr, srclen = res->ai_addrlen); freeaddrinfo (res); @@ -455,8 +482,12 @@ static int Open( vlc_object_t *p_this ) free( psz_access ); free( psz_mux ); + free( psz_bind ); free( psz_url ); + if( !sout_AccessOutCanControlPace( p_access ) ) + p_sout->i_out_pace_nocontrol++; + return VLC_SUCCESS; } @@ -473,6 +504,8 @@ static void Close( vlc_object_t * p_this ) sout_AnnounceUnRegister( p_stream->p_sout, p_sys->p_session ); sout_MuxDelete( p_sys->p_mux ); + if( !sout_AccessOutCanControlPace( p_access ) ) + p_stream->p_sout->i_out_pace_nocontrol--; sout_AccessOutDelete( p_access ); free( p_sys ); @@ -490,10 +523,12 @@ static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt ) sout_stream_id_t *id; id = malloc( sizeof( sout_stream_id_t ) ); + if( !id ) + return NULL; + if( ( id->p_input = sout_MuxAddStream( p_sys->p_mux, p_fmt ) ) == NULL ) { free( id ); - return NULL; }