# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_input.h>
#include <vlc_sout.h>
#include <vlc_block.h>
-#include "vlc_httpd.h"
-#include "vlc_vod.h"
-#include "vlc_url.h"
+#include <vlc_httpd.h>
+#include <vlc_vod.h>
+#include <vlc_url.h>
#include <vlc_network.h>
#include <vlc_charset.h>
#include <vlc_strings.h>
+#include <vlc_rand.h>
-#include <errno.h>
+#ifndef WIN32
+# include <locale.h>
+#endif
+
+#ifdef HAVE_XLOCALE_H
+# include <xlocale.h>
+#endif
/*****************************************************************************
* Module descriptor
"interfaces (address 0.0.0.0), on port 554, with no path.\nTo listen " \
"only on the local interface, use \"localhost\" as address." )
-#define THROTLE_TEXT N_( "Maximum number of connections" )
-#define THROTLE_LONGTEXT N_( "This limits the maximum number of clients " \
+#define THROTTLE_TEXT N_( "Maximum number of connections" )
+#define THROTTLE_LONGTEXT N_( "This limits the maximum number of clients " \
"that can connect to the RTSP VOD. 0 means no limit." )
#define RAWMUX_TEXT N_( "MUX for RAW RTSP transport" )
"the timeout option entirely. This is needed by some IPTV STBs (such as " \
"those made by HansunTech) which get confused by it. The default is 5." )
-vlc_module_begin();
- set_shortname( _("RTSP VoD" ) );
- set_description( _("RTSP VoD server") );
- set_category( CAT_SOUT );
- set_subcategory( SUBCAT_SOUT_VOD );
- set_capability( "vod server", 1 );
- set_callbacks( Open, Close );
- add_shortcut( "rtsp" );
- add_string ( "rtsp-host", NULL, NULL, HOST_TEXT, HOST_LONGTEXT, true );
+vlc_module_begin ()
+ set_shortname( N_("RTSP VoD" ) )
+ set_description( N_("RTSP VoD server") )
+ set_category( CAT_SOUT )
+ set_subcategory( SUBCAT_SOUT_VOD )
+ set_capability( "vod server", 1 )
+ set_callbacks( Open, Close )
+ add_shortcut( "rtsp" )
+ add_string ( "rtsp-host", NULL, NULL, HOST_TEXT, HOST_LONGTEXT, true )
add_string( "rtsp-raw-mux", "ts", NULL, RAWMUX_TEXT,
- RAWMUX_TEXT, true );
- add_integer( "rtsp-throttle-users", 0, NULL, THROTLE_TEXT,
- THROTLE_LONGTEXT, true );
+ RAWMUX_TEXT, true )
+ add_integer( "rtsp-throttle-users", 0, NULL, THROTTLE_TEXT,
+ THROTTLE_LONGTEXT, true )
add_integer( "rtsp-session-timeout", 5, NULL, SESSION_TIMEOUT_TEXT,
- SESSION_TIMEOUT_LONGTEXT, true );
-vlc_module_end();
+ SESSION_TIMEOUT_LONGTEXT, true )
+vlc_module_end ()
/*****************************************************************************
* Exported prototypes
typedef struct
{
media_es_t *p_media_es;
- char *psz_ip;
int i_port;
} rtsp_client_es_t;
typedef struct
{
char *psz_session;
- int64_t i_last; /* for timeout */
bool b_playing; /* is it in "play" state */
bool b_paused; /* is it in "pause" state */
vod_media_t *p_media;
es_format_t fmt;
- int i_port;
uint8_t i_payload_type;
- char *psz_rtpmap;
+ const char *psz_ptname;
+ unsigned i_clock_rate;
+ unsigned i_channels;
char *psz_fmtp;
};
char *psz_rtsp_control_v6;
char *psz_rtsp_path;
- int i_port;
- int i_port_audio;
- int i_port_video;
- int i_ttl;
int i_payload_type;
- int64_t i_sdp_id;
- int i_sdp_version;
-
- bool b_multicast;
-
vlc_mutex_t lock;
/* ES list */
int i_es;
media_es_t **es;
- char *psz_mux;
+ const char *psz_mux;
bool b_raw;
/* RTSP client */
rtsp_client_t **rtsp;
/* Infos */
- char *psz_session_name;
- char *psz_session_description;
- char *psz_session_url;
- char *psz_session_email;
mtime_t i_length;
};
int i_session_timeout;
/* List of media */
- vlc_mutex_t lock_media;
int i_media_id;
int i_media;
vod_media_t **media;
RTSP_CMD_TYPE_SEEK,
RTSP_CMD_TYPE_REWIND,
RTSP_CMD_TYPE_FORWARD,
+
+ RTSP_CMD_TYPE_ADD,
+ RTSP_CMD_TYPE_DEL,
} rtsp_cmd_type_t;
+/* */
+typedef struct
+{
+ int i_type;
+ int i_media_id;
+ vod_media_t *p_media;
+ char *psz_session;
+ char *psz_arg;
+ double f_arg;
+} rtsp_cmd_t;
+
static vod_media_t *MediaNew( vod_t *, const char *, input_item_t * );
static void MediaDel( vod_t *, vod_media_t * );
+static void MediaAskDel ( vod_t *, vod_media_t * );
static int MediaAddES( vod_t *, vod_media_t *, es_format_t * );
static void MediaDelES( vod_t *, vod_media_t *, es_format_t * );
-static void CommandThread( vlc_object_t *p_this );
-static void CommandPush( vod_t *, rtsp_cmd_type_t, vod_media_t *, const char *psz_session,
- double f_arg, const char *psz_arg );
+static void* CommandThread( vlc_object_t *p_this );
+static void CommandPush( vod_t *, rtsp_cmd_type_t, vod_media_t *, const char *psz_session,
+ double f_arg, const char *psz_arg );
static rtsp_client_t *RtspClientNew( vod_media_t *, char * );
static rtsp_client_t *RtspClientGet( vod_media_t *, const char * );
static int Open( vlc_object_t *p_this )
{
vod_t *p_vod = (vod_t *)p_this;
- vod_sys_t *p_sys = 0;
- char *psz_url = 0;
+ vod_sys_t *p_sys = NULL;
+ char *psz_url = NULL;
vlc_url_t url;
- psz_url = config_GetPsz( p_vod, "rtsp-host" );
+ psz_url = var_InheritString( p_vod, "rtsp-host" );
vlc_UrlParse( &url, psz_url, 0 );
free( psz_url );
vlc_UrlClean( &url );
- vlc_mutex_init( &p_sys->lock_media );
-
TAB_INIT( p_sys->i_media, p_sys->media );
p_sys->i_media_id = 0;
p_vod->pf_media_new = MediaNew;
- p_vod->pf_media_del = MediaDel;
+ p_vod->pf_media_del = MediaAskDel;
p_vod->pf_media_add_es = MediaAddES;
p_vod->pf_media_del_es = MediaDelES;
p_sys->p_fifo_cmd = block_FifoNew();
if( vlc_thread_create( p_vod, "rtsp vod thread", CommandThread,
- VLC_THREAD_PRIORITY_LOW, false ) )
+ VLC_THREAD_PRIORITY_LOW ) )
{
msg_Err( p_vod, "cannot spawn rtsp vod thread" );
block_FifoRelease( p_sys->p_fifo_cmd );
{
vod_t *p_vod = (vod_t *)p_this;
vod_sys_t *p_sys = p_vod->p_sys;
+ block_t *p_block_cmd;
+ rtsp_cmd_t cmd;
/* Stop command thread */
vlc_object_kill( p_vod );
CommandPush( p_vod, RTSP_CMD_TYPE_NONE, NULL, NULL, 0.0, NULL );
vlc_thread_join( p_vod );
+ while( block_FifoCount( p_sys->p_fifo_cmd ) > 0 )
+ {
+ p_block_cmd = block_FifoGet( p_sys->p_fifo_cmd );
+ memcpy( &cmd, p_block_cmd->p_buffer, sizeof(cmd) );
+ block_Release( p_block_cmd );
+ if ( cmd.i_type == RTSP_CMD_TYPE_DEL )
+ MediaDel(p_vod, cmd.p_media);
+ free( cmd.psz_session );
+ free( cmd.psz_arg );
+ }
block_FifoRelease( p_sys->p_fifo_cmd );
httpd_HostDelete( p_sys->p_rtsp_host );
msg_Err( p_vod, "rtsp vod leaking %d medias", p_sys->i_media );
TAB_CLEAN( p_sys->i_media, p_sys->media );
- vlc_mutex_destroy( &p_sys->lock_media );
-
free( p_sys->psz_path );
free( p_sys->psz_raw_mux );
free( p_sys );
static vod_media_t *MediaNew( vod_t *p_vod, const char *psz_name,
input_item_t *p_item )
{
- vod_sys_t *p_sys = p_vod->p_sys;
- vod_media_t *p_media = malloc( sizeof(vod_media_t) );
int i;
+ vod_sys_t *p_sys = p_vod->p_sys;
+ vod_media_t *p_media = calloc( 1, sizeof(vod_media_t) );
if( !p_media )
- {
- msg_Err( p_vod, "not enough memory" );
return NULL;
- }
- memset( p_media, 0, sizeof(vod_media_t) );
p_media->id = p_sys->i_media_id++;
TAB_INIT( p_media->i_es, p_media->es );
- p_media->psz_mux = 0;
+ p_media->psz_mux = NULL;
TAB_INIT( p_media->i_rtsp, p_media->rtsp );
p_media->b_raw = false;
msg_Dbg( p_vod, "created RTSP url: %s", p_media->psz_rtsp_path );
if( asprintf( &p_media->psz_rtsp_control_v4,
- "a=control:rtsp://%%s:%d%s/trackID=%%d\r\n",
+ "rtsp://%%s:%d%s/trackID=%%d",
p_sys->i_port, p_media->psz_rtsp_path ) < 0 )
+ {
+ httpd_UrlDelete( p_media->p_rtsp_url );
+ free( p_media->psz_rtsp_path );
+ free( p_media );
return NULL;
+ }
if( asprintf( &p_media->psz_rtsp_control_v6,
- "a=control:rtsp://[%%s]:%d%s/trackID=%%d\r\n",
+ "rtsp://[%%s]:%d%s/trackID=%%d",
p_sys->i_port, p_media->psz_rtsp_path ) < 0 )
+ {
+ httpd_UrlDelete( p_media->p_rtsp_url );
+ free( p_media->psz_rtsp_path );
+ free( p_media );
return NULL;
+ }
httpd_UrlCatch( p_media->p_rtsp_url, HTTPD_MSG_SETUP,
RtspCallback, (void*)p_media );
p_media->p_vod = p_vod;
- vlc_mutex_lock( &p_sys->lock_media );
- TAB_APPEND( p_sys->i_media, p_sys->media, p_media );
- vlc_mutex_unlock( &p_sys->lock_media );
-
vlc_mutex_init( &p_media->lock );
- p_media->psz_session_name = strdup("");
- p_media->psz_session_description = strdup("");
- p_media->psz_session_url = strdup("");
- p_media->psz_session_email = strdup("");
-
- p_media->i_port_audio = 1234;
- p_media->i_port_video = 1236;
- p_media->i_port = 1238;
+
p_media->i_payload_type = 96;
- p_media->i_sdp_id = mdate();
- p_media->i_sdp_version = 1;
p_media->i_length = input_item_GetDuration( p_item );
vlc_mutex_lock( &p_item->lock );
}
vlc_mutex_unlock( &p_item->lock );
+ CommandPush( p_vod, RTSP_CMD_TYPE_ADD, p_media, NULL, 0.0, NULL );
return p_media;
}
+static void MediaAskDel ( vod_t *p_vod, vod_media_t *p_media )
+{
+ CommandPush( p_vod, RTSP_CMD_TYPE_DEL, p_media, NULL, 0.0, NULL );
+}
+
static void MediaDel( vod_t *p_vod, vod_media_t *p_media )
{
vod_sys_t *p_sys = p_vod->p_sys;
msg_Dbg( p_vod, "deleting media: %s", p_media->psz_rtsp_path );
- vlc_mutex_lock( &p_sys->lock_media );
TAB_REMOVE( p_sys->i_media, p_sys->media, p_media );
- vlc_mutex_unlock( &p_sys->lock_media );
+
+ httpd_UrlDelete( p_media->p_rtsp_url );
while( p_media->i_rtsp > 0 )
RtspClientDel( p_media, p_media->rtsp[0] );
TAB_CLEAN( p_media->i_rtsp, p_media->rtsp );
- httpd_UrlDelete( p_media->p_rtsp_url );
free( p_media->psz_rtsp_path );
free( p_media->psz_rtsp_control_v6 );
free( p_media->psz_rtsp_control_v4 );
vlc_mutex_destroy( &p_media->lock );
- free( p_media->psz_session_name );
- free( p_media->psz_session_description );
- free( p_media->psz_session_url );
- free( p_media->psz_session_email );
- free( p_media->psz_mux );
free( p_media );
}
static int MediaAddES( vod_t *p_vod, vod_media_t *p_media, es_format_t *p_fmt )
{
- media_es_t *p_es = malloc( sizeof(media_es_t) );
char *psz_urlc;
- if( !p_es ) return VLC_ENOMEM;
- memset( p_es, 0, sizeof(media_es_t) );
+ if( p_media->i_payload_type >= 128 )
+ {
+ msg_Err( p_vod, "too many elementary streams");
+ return VLC_EGENERIC;
+ }
+
+ media_es_t *p_es = calloc( 1, sizeof(media_es_t) );
+ if( !p_es )
+ return VLC_ENOMEM;
- free( p_media->psz_mux );
p_media->psz_mux = NULL;
/* TODO: update SDP, etc... */
if( asprintf( &psz_urlc, "%s/trackID=%d",
p_media->psz_rtsp_path, p_media->i_es ) < 0 )
+ {
+ free( p_es );
return VLC_ENOMEM;
+ }
msg_Dbg( p_vod, " - ES %4.4s (%s)", (char *)&p_fmt->i_codec, psz_urlc );
+ p_es->i_clock_rate = 90000;
+ p_es->i_channels = 1;
+
switch( p_fmt->i_codec )
{
- case VLC_FOURCC( 's', '1', '6', 'b' ):
+ case VLC_CODEC_S16B:
if( p_fmt->audio.i_channels == 1 && p_fmt->audio.i_rate == 44100 )
{
p_es->i_payload_type = 11;
{
p_es->i_payload_type = p_media->i_payload_type++;
}
- p_es->psz_rtpmap = malloc( strlen( "L16/*/*" ) + 20+1 );
- sprintf( p_es->psz_rtpmap, "L16/%d/%d", p_fmt->audio.i_rate,
- p_fmt->audio.i_channels );
+ p_es->psz_ptname = "L16";
+ p_es->i_clock_rate = p_fmt->audio.i_rate;
+ p_es->i_channels = p_fmt->audio.i_channels;
break;
- case VLC_FOURCC( 'u', '8', ' ', ' ' ):
+ case VLC_CODEC_U8:
p_es->i_payload_type = p_media->i_payload_type++;
- p_es->psz_rtpmap = malloc( strlen( "L8/*/*" ) + 20+1 );
- sprintf( p_es->psz_rtpmap, "L8/%d/%d", p_fmt->audio.i_rate,
- p_fmt->audio.i_channels );
+ p_es->psz_ptname = "L8";
+ p_es->i_clock_rate = p_fmt->audio.i_rate;
+ p_es->i_channels = p_fmt->audio.i_channels;
break;
- case VLC_FOURCC( 'm', 'p', 'g', 'a' ):
+ case VLC_CODEC_MPGA:
p_es->i_payload_type = 14;
- p_es->psz_rtpmap = strdup( "MPA/90000" );
+ p_es->psz_ptname = "MPA";
break;
- case VLC_FOURCC( 'm', 'p', 'g', 'v' ):
+ case VLC_CODEC_MPGV:
p_es->i_payload_type = 32;
- p_es->psz_rtpmap = strdup( "MPV/90000" );
+ p_es->psz_ptname = "MPV";
break;
- case VLC_FOURCC( 'a', '5', '2', ' ' ):
+ case VLC_CODEC_A52:
p_es->i_payload_type = p_media->i_payload_type++;
- p_es->psz_rtpmap = strdup( "ac3/90000" );
+ p_es->psz_ptname = "ac3";
+ p_es->i_clock_rate = p_fmt->audio.i_rate;
break;
- case VLC_FOURCC( 'H', '2', '6', '3' ):
+ case VLC_CODEC_H263:
p_es->i_payload_type = p_media->i_payload_type++;
- p_es->psz_rtpmap = strdup( "H263-1998/90000" );
+ p_es->psz_ptname = "H263-1998";
break;
- case VLC_FOURCC( 'h', '2', '6', '4' ):
+ case VLC_CODEC_H264:
p_es->i_payload_type = p_media->i_payload_type++;
- p_es->psz_rtpmap = strdup( "H264/90000" );
+ p_es->psz_ptname = "H264";
p_es->psz_fmtp = NULL;
/* FIXME AAAAAAAAAAAARRRRRRRRGGGG copied from stream_out/rtp.c */
if( p_fmt->i_extra > 0 )
}
if( i_nal_type == 7 )
{
+ free( p_64_sps );
p_64_sps = vlc_b64_encode_binary( &p_buffer[4], i_size - 4 );
sprintf_hexa( hexa, &p_buffer[5], 3 );
}
else if( i_nal_type == 8 )
{
+ free( p_64_pps );
p_64_pps = vlc_b64_encode_binary( &p_buffer[4], i_size - 4 );
}
i_buffer -= i_size;
}
/* */
if( p_64_sps && p_64_pps )
+ {
if( asprintf( &p_es->psz_fmtp,
"packetization-mode=1;profile-level-id=%s;"
"sprop-parameter-sets=%s,%s;", hexa, p_64_sps,
p_64_pps ) < 0 )
+ {
+ free( p_64_sps );
+ free( p_64_pps );
+ free( psz_urlc );
+ free( p_es );
return VLC_ENOMEM;
+ }
+ }
free( p_64_sps );
free( p_64_pps );
}
if( !p_es->psz_fmtp )
p_es->psz_fmtp = strdup( "packetization-mode=1" );
break;
- case VLC_FOURCC( 'm', 'p', '4', 'v' ):
+ case VLC_CODEC_MP4V:
p_es->i_payload_type = p_media->i_payload_type++;
- p_es->psz_rtpmap = strdup( "MP4V-ES/90000" );
+ p_es->psz_ptname = "MP4V-ES";
if( p_fmt->i_extra > 0 )
{
char *p_hexa = malloc( 2 * p_fmt->i_extra + 1 );
- p_es->psz_fmtp = malloc( 100 + 2 * p_fmt->i_extra );
sprintf_hexa( p_hexa, p_fmt->p_extra, p_fmt->i_extra );
- sprintf( p_es->psz_fmtp,
- "profile-level-id=3; config=%s;", p_hexa );
+ if( asprintf( &p_es->psz_fmtp,
+ "profile-level-id=3; config=%s;", p_hexa ) == -1 )
+ p_es->psz_fmtp = NULL;
free( p_hexa );
}
break;
- case VLC_FOURCC( 'm', 'p', '4', 'a' ):
+ case VLC_CODEC_MP4A:
p_es->i_payload_type = p_media->i_payload_type++;
- p_es->psz_rtpmap = malloc( strlen( "mpeg4-generic/" ) + 12 );
- sprintf( p_es->psz_rtpmap, "mpeg4-generic/%d", p_fmt->audio.i_rate );
+ p_es->psz_ptname = "mpeg4-generic";
+ p_es->i_clock_rate = p_fmt->audio.i_rate;
if( p_fmt->i_extra > 0 )
{
char *p_hexa = malloc( 2 * p_fmt->i_extra + 1 );
- p_es->psz_fmtp = malloc( 200 + 2 * p_fmt->i_extra );
sprintf_hexa( p_hexa, p_fmt->p_extra, p_fmt->i_extra );
- sprintf( p_es->psz_fmtp,
- "streamtype=5; profile-level-id=15; mode=AAC-hbr; "
- "config=%s; SizeLength=13;IndexLength=3; "
- "IndexDeltaLength=3; Profile=1;", p_hexa );
+ if( asprintf( &p_es->psz_fmtp,
+ "streamtype=5; profile-level-id=15; mode=AAC-hbr; "
+ "config=%s; SizeLength=13;IndexLength=3; "
+ "IndexDeltaLength=3; Profile=1;", p_hexa ) == -1 )
+ p_es->psz_fmtp = NULL;
free( p_hexa );
}
break;
case VLC_FOURCC( 'm', 'p', '2', 't' ):
- p_media->psz_mux = strdup("ts");
+ p_media->psz_mux = "ts";
p_es->i_payload_type = 33;
- p_es->psz_rtpmap = strdup( "MP2T/90000" );
+ p_es->psz_ptname = "MP2T";
break;
case VLC_FOURCC( 'm', 'p', '2', 'p' ):
- p_media->psz_mux = strdup("ps");
+ p_media->psz_mux = "ps";
p_es->i_payload_type = p_media->i_payload_type++;
- p_es->psz_rtpmap = strdup( "MP2P/90000" );
+ p_es->psz_ptname = "MP2P";
break;
- case VLC_FOURCC( 's', 'a', 'm', 'r' ):
+ case VLC_CODEC_AMR_NB:
p_es->i_payload_type = p_media->i_payload_type++;
- p_es->psz_rtpmap = strdup( p_fmt->audio.i_channels == 2 ?
- "AMR/8000/2" : "AMR/8000" );
+ p_es->psz_ptname = "AMR";
+ p_es->i_clock_rate = 8000;
+ if(p_fmt->audio.i_channels == 2 )
+ p_es->i_channels = 2;
p_es->psz_fmtp = strdup( "octet-align=1" );
break;
- case VLC_FOURCC( 's', 'a', 'w', 'b' ):
+ case VLC_CODEC_AMR_WB:
p_es->i_payload_type = p_media->i_payload_type++;
- p_es->psz_rtpmap = strdup( p_fmt->audio.i_channels == 2 ?
- "AMR-WB/16000/2" : "AMR-WB/16000" );
+ p_es->psz_ptname = "AMR-WB";
+ p_es->i_clock_rate = 16000;
+ if(p_fmt->audio.i_channels == 2 )
+ p_es->i_channels = 2;
p_es->psz_fmtp = strdup( "octet-align=1" );
break;
default:
msg_Err( p_vod, "cannot add this stream (unsupported "
"codec: %4.4s)", (char*)&p_fmt->i_codec );
+ free( psz_urlc );
free( p_es );
return VLC_EGENERIC;
}
p_es->p_vod = p_vod;
p_es->p_media = p_media;
-#if 0
- /* Choose the port */
- if( p_fmt->i_cat == AUDIO_ES && p_media->i_port_audio > 0 )
- {
- p_es->i_port = p_media->i_port_audio;
- p_media->i_port_audio = 0;
- }
- else if( p_fmt->i_cat == VIDEO_ES && p_media->i_port_video > 0 )
- {
- p_es->i_port = p_media->i_port_video;
- p_media->i_port_video = 0;
- }
- while( !p_es->i_port )
- {
- if( p_media->i_port != p_media->i_port_audio &&
- p_media->i_port != p_media->i_port_video )
- {
- p_es->i_port = p_media->i_port;
- p_media->i_port += 2;
- break;
- }
- p_media->i_port += 2;
- }
-#else
-
- p_es->i_port = 0;
-#endif
-
vlc_mutex_lock( &p_media->lock );
TAB_APPEND( p_media->i_es, p_media->es, p_es );
vlc_mutex_unlock( &p_media->lock );
- p_media->i_sdp_version++;
-
return VLC_SUCCESS;
}
TAB_REMOVE( p_media->i_es, p_media->es, p_es );
vlc_mutex_unlock( &p_media->lock );
- free( p_es->psz_rtpmap );
free( p_es->psz_fmtp );
- p_media->i_sdp_version++;
if( p_es->p_rtsp_url ) httpd_UrlDelete( p_es->p_rtsp_url );
es_format_Clean( &p_es->fmt );
free( p_es );
}
-/* */
-typedef struct
-{
- int i_type;
- int i_media_id;
- //vod_media_t *p_media;
- char *psz_session;
- char *psz_arg;
- double f_arg;
-} rtsp_cmd_t;
-
static void CommandPush( vod_t *p_vod, rtsp_cmd_type_t i_type, vod_media_t *p_media, const char *psz_session,
double f_arg, const char *psz_arg )
{
memset( &cmd, 0, sizeof(cmd) );
cmd.i_type = i_type;
+ cmd.p_media = p_media;
if( p_media )
cmd.i_media_id = p_media->id;
if( psz_session )
block_FifoPut( p_vod->p_sys->p_fifo_cmd, p_cmd );
}
-static void CommandThread( vlc_object_t *p_this )
+static void* CommandThread( vlc_object_t *p_this )
{
vod_t *p_vod = (vod_t*)p_this;
vod_sys_t *p_sys = p_vod->p_sys;
+ int canc = vlc_savecancel ();
- while( !p_vod->b_die )
+ while( vlc_object_alive (p_vod) )
{
block_t *p_block_cmd = block_FifoGet( p_sys->p_fifo_cmd );
rtsp_cmd_t cmd;
if( cmd.i_type == RTSP_CMD_TYPE_NONE )
break;
+ if ( cmd.i_type == RTSP_CMD_TYPE_ADD )
+ {
+ TAB_APPEND( p_sys->i_media, p_sys->media, cmd.p_media );
+ goto next;
+ }
+
+ if ( cmd.i_type == RTSP_CMD_TYPE_DEL )
+ {
+ MediaDel(p_vod, cmd.p_media);
+ goto next;
+ }
+
/* */
- vlc_mutex_lock( &p_sys->lock_media );
for( i = 0; i < p_sys->i_media; i++ )
{
if( p_sys->media[i]->id == cmd.i_media_id )
break;
}
if( i >= p_sys->i_media )
+ {
goto next;
+ }
p_media = p_sys->media[i];
switch( cmd.i_type )
}
next:
- vlc_mutex_unlock( &p_sys->lock_media );
free( cmd.psz_session );
free( cmd.psz_arg );
}
+
+ vlc_restorecancel (canc);
+ return NULL;
}
/****************************************************************************
****************************************************************************/
static rtsp_client_t *RtspClientNew( vod_media_t *p_media, char *psz_session )
{
- rtsp_client_t *p_rtsp = malloc( sizeof(rtsp_client_t) );
+ rtsp_client_t *p_rtsp = calloc( 1, sizeof(rtsp_client_t) );
- if( !p_rtsp ) return NULL;
- memset( p_rtsp, 0, sizeof(rtsp_client_t) );
+ if( !p_rtsp )
+ return NULL;
p_rtsp->es = 0;
p_rtsp->psz_session = psz_session;
msg_Dbg( p_media->p_vod, "closing session: %s, connections: %d",
p_rtsp->psz_session, p_media->p_vod->p_sys->i_throttle_users );
- while( p_rtsp->i_es-- )
+ while( p_rtsp->i_es )
{
- free( p_rtsp->es[p_rtsp->i_es]->psz_ip );
+ p_rtsp->i_es--;
free( p_rtsp->es[p_rtsp->i_es] );
- if( !p_rtsp->i_es ) free( p_rtsp->es );
}
+ free( p_rtsp->es );
TAB_REMOVE( p_media->i_rtsp, p_media->rtsp, p_rtsp );
free( p_rtsp );
}
+
+static float ParseNPT (const char *str)
+{
+ locale_t loc = newlocale (LC_NUMERIC_MASK, "C", NULL);
+ locale_t oldloc = uselocale (loc);
+ unsigned hour, min;
+ float sec;
+
+ if (sscanf (str, "%u:%u:%f", &hour, &min, &sec) == 3)
+ sec += ((hour * 60) + min) * 60;
+ else
+ if (sscanf (str, "%f", &sec) != 1)
+ sec = 0.;
+
+ if (loc != (locale_t)0)
+ {
+ uselocale (oldloc);
+ freelocale (loc);
+ }
+ return sec;
+}
+
+
static int RtspCallback( httpd_callback_sys_t *p_args, httpd_client_t *cl,
httpd_message_t *answer, const httpd_message_t *query )
{
if( strstr( psz_transport, "MP2T/H2221/UDP" ) ||
strstr( psz_transport, "RAW/RAW/UDP" ) )
{
- free( p_media->psz_mux );
- p_media->psz_mux = NULL;
- p_media->psz_mux = strdup( p_vod->p_sys->psz_raw_mux );
+ p_media->psz_mux = p_vod->p_sys->psz_raw_mux;
p_media->b_raw = true;
}
answer->p_body = NULL;
break;
}
- if( asprintf( &psz_new, "%d", rand() ) < 0 )
+#warning Should use secure randomness here! (spoofing risk)
+ if( asprintf( &psz_new, "%lu", vlc_mrand48() ) < 0 )
return VLC_ENOMEM;
psz_session = psz_new;
if( strstr( psz_transport, "MP2T/H2221/UDP" ) )
{
httpd_MsgAdd( answer, "Transport",
- "MP2T/H2221/UDP;client_port=%d-%d",
+ "MP2T/H2221/UDP;unicast;client_port=%d-%d",
i_port, i_port + 1 );
}
else if( strstr( psz_transport, "RAW/RAW/UDP" ) )
{
httpd_MsgAdd( answer, "Transport",
- "RAW/RAW/UDP;client_port=%d-%d",
+ "RAW/RAW/UDP;unicast;client_port=%d-%d",
i_port, i_port + 1 );
}
}
else
httpd_MsgAdd( answer, "Transport",
- "RTP/AVP/UDP;client_port=%d-%d",
+ "RTP/AVP/UDP;unicast;client_port=%d-%d",
i_port, i_port + 1 );
}
else /* TODO strstr( psz_transport, "interleaved" ) ) */
psz_position = strstr( psz_position, "npt=" );
if( psz_position && !psz_scale )
{
- double f_pos;
- char *end;
-
+ double f_pos = ParseNPT (psz_position + 4);
msg_Dbg( p_vod, "seeking request: %s", psz_position );
- psz_position += 4;
- /* FIXME: npt= is not necessarily formatted as a float */
- f_pos = us_strtod( psz_position, &end );
- if( end > psz_position )
- {
- f_pos /= ((double)(p_media->i_length))/1000 /1000 / 100;
- CommandPush( p_vod, RTSP_CMD_TYPE_SEEK, p_media,
- psz_session, f_pos, NULL );
- }
- break;
+ f_pos /= ((double)(p_media->i_length))/1000 /1000 / 100;
+ CommandPush( p_vod, RTSP_CMD_TYPE_SEEK, p_media,
+ psz_session, f_pos, NULL );
}
- if( psz_scale )
+ else if( psz_scale )
{
double f_scale = 0.0;
char *end;
psz_session, f_scale, NULL );
}
- if( p_rtsp->b_paused == true )
+ if( p_rtsp->b_paused )
{
p_rtsp->b_paused = false;
CommandPush( p_vod, RTSP_CMD_TYPE_PAUSE, p_media,
p_rtsp = RtspClientGet( p_media, psz_session );
if( !p_rtsp ) break;
- CommandPush( p_vod, RTSP_CMD_TYPE_PAUSE, p_media, psz_session,
- 0, NULL );
- p_rtsp->b_paused = true;
+ if( !p_rtsp->b_paused )
+ {
+ CommandPush( p_vod, RTSP_CMD_TYPE_PAUSE, p_media, psz_session,
+ 0, NULL );
+ p_rtsp->b_paused = true;
+ }
answer->i_status = 200;
answer->i_body = 0;
answer->p_body = NULL;
break;
}
- if( asprintf( &psz_new, "%d", rand() ) < 0 )
+#warning Session ID should be securely random (spoofing risk)
+ if( asprintf( &psz_new, "%lu", vlc_mrand48() ) < 0 )
return VLC_ENOMEM;
psz_session = psz_new;
p_rtsp = RtspClientNew( p_media, psz_new );
+ if( !p_rtsp )
+ {
+ answer->i_status = 454;
+ answer->i_body = 0;
+ answer->p_body = NULL;
+ break;
+ }
}
else
{
break;
}
p_rtsp_es->i_port = i_port;
- p_rtsp_es->psz_ip = strdup( ip );
p_rtsp_es->p_media_es = p_es;
TAB_APPEND( p_rtsp->i_es, p_rtsp->es, p_rtsp_es );
if( psz_position ) psz_position = strstr( psz_position, "npt=" );
if( psz_position )
{
- double f_pos;
- char *end;
-
+ double f_pos = ParseNPT (psz_position + 4);
msg_Dbg( p_vod, "seeking request: %s", psz_position );
-
- psz_position += 4;
- /* FIXME: npt= is not necessarily formatted as a float */
- f_pos = us_strtod( psz_position, &end );
- if( end > psz_position )
- {
- f_pos /= ((double)(p_media->i_length))/1000 /1000 / 100;
- CommandPush( p_vod, RTSP_CMD_TYPE_SEEK, p_media,
- psz_session, f_pos, NULL );
- }
+ f_pos /= ((double)(p_media->i_length))/1000 /1000 / 100;
+ CommandPush( p_vod, RTSP_CMD_TYPE_SEEK, p_media,
+ psz_session, f_pos, NULL );
}
if( !psz_playnow )
{
if( p_rtsp->es[i]->p_media_es == p_es )
{
- free( p_rtsp->es[i]->psz_ip );
TAB_REMOVE( p_rtsp->i_es, p_rtsp->es, p_rtsp->es[i] );
break;
}
p_rtsp = RtspClientGet( p_media, psz_session );
if( !p_rtsp ) break;
- CommandPush( p_vod, RTSP_CMD_TYPE_PAUSE, p_media, psz_session,
- 0, NULL );
- p_rtsp->b_paused = true;
+ if( !p_rtsp->b_paused )
+ {
+ CommandPush( p_vod, RTSP_CMD_TYPE_PAUSE, p_media, psz_session,
+ 0, NULL );
+ p_rtsp->b_paused = true;
+ }
answer->i_status = 200;
answer->i_body = 0;
*****************************************************************************/
static char *SDPGenerate( const vod_media_t *p_media, httpd_client_t *cl )
{
- int i, i_size;
- char *p, *psz_sdp, ip[NI_MAXNUMERICHOST], ipv;
+ char *psz_sdp, ip[NI_MAXNUMERICHOST];
const char *psz_control;
if( httpd_ServerIP( cl, ip ) == NULL )
return NULL;
- p = strchr( ip, '%' );
- if( p != NULL )
- *p = '\0'; /* remove scope if present */
-
- ipv = ( strchr( ip, ':' ) != NULL ) ? '6' : '4';
-
- /* Calculate size */
- i_size = sizeof( "v=0\r\n" ) +
- sizeof( "o=- * * IN IP4 \r\n" ) + 10 + NI_MAXNUMERICHOST +
- sizeof( "s=*\r\n" ) + strlen( p_media->psz_session_name ) +
- sizeof( "i=*\r\n" ) + strlen( p_media->psz_session_description ) +
- sizeof( "u=*\r\n" ) + strlen( p_media->psz_session_url ) +
- sizeof( "e=*\r\n" ) + strlen( p_media->psz_session_email ) +
- sizeof( "c=IN IP4 0.0.0.0\r\n" ) + 20 + 10 +
- sizeof( "t=0 0\r\n" ) + /* FIXME */
- sizeof( "a=tool:"PACKAGE_STRING"\r\n" ) +
- sizeof( "a=range:npt=0-1000000000.000\r\n" );
-
- psz_control = (ipv == '6') ? p_media->psz_rtsp_control_v6
- : p_media->psz_rtsp_control_v4;
- for( i = 0; i < p_media->i_es; i++ )
- {
- media_es_t *p_es = p_media->es[i];
+ bool ipv6 = ( strchr( ip, ':' ) != NULL );
- i_size += sizeof( "m=**d*o * RTP/AVP *\r\n" ) + 19;
- if( p_es->psz_rtpmap )
- {
- i_size += sizeof( "a=rtpmap:* *\r\n" ) +
- strlen( p_es->psz_rtpmap ) + 9;
- }
- if( p_es->psz_fmtp )
- {
- i_size += sizeof( "a=fmtp:* *\r\n" ) +
- strlen( p_es->psz_fmtp ) + 9;
- }
- }
- i_size += (strlen( psz_control ) + strlen( ip ) + 9) * p_media->i_es;
-
- p = psz_sdp = malloc( i_size );
- p += sprintf( p, "v=0\r\n" );
- p += sprintf( p, "o=- %"PRId64" %d IN IP%c %s\r\n",
- p_media->i_sdp_id, p_media->i_sdp_version, ipv, ip );
- if( *p_media->psz_session_name )
- p += sprintf( p, "s=%s\r\n", p_media->psz_session_name );
- if( *p_media->psz_session_description )
- p += sprintf( p, "i=%s\r\n", p_media->psz_session_description );
- if( *p_media->psz_session_url )
- p += sprintf( p, "u=%s\r\n", p_media->psz_session_url );
- if( *p_media->psz_session_email )
- p += sprintf( p, "e=%s\r\n", p_media->psz_session_email );
-
- p += sprintf( p, "c=IN IP%c %s\r\n", ipv, ipv == '6' ? "::" : "0.0.0.0" );
- p += sprintf( p, "t=0 0\r\n" ); /* FIXME */
- p += sprintf( p, "a=tool:"PACKAGE_STRING"\r\n" );
+ psz_control = ipv6 ? p_media->psz_rtsp_control_v6
+ : p_media->psz_rtsp_control_v4;
+
+ /* Dummy destination address for RTSP */
+ struct sockaddr_storage dst;
+ socklen_t dstlen = ipv6 ? sizeof( struct sockaddr_in6 )
+ : sizeof( struct sockaddr_in );
+ memset (&dst, 0, dstlen);
+ dst.ss_family = ipv6 ? AF_INET6 : AF_INET;
+#ifdef HAVE_SA_LEN
+ dst.ss_len = dstlen;
+#endif
+
+ psz_sdp = vlc_sdp_Start( VLC_OBJECT( p_media->p_vod ), "sout-rtp-",
+ NULL, 0, (struct sockaddr *)&dst, dstlen );
+ if( psz_sdp == NULL )
+ return NULL;
if( p_media->i_length > 0 )
{
lldiv_t d = lldiv( p_media->i_length / 1000, 1000 );
- p += sprintf( p, "a=range:npt=0-%lld.%03u\r\n", d.quot,
- (unsigned)d.rem );
+ sdp_AddAttribute( &psz_sdp, "range"," npt=0-%lld.%03u", d.quot,
+ (unsigned)d.rem );
}
- for( i = 0; i < p_media->i_es; i++ )
+ for( int i = 0; i < p_media->i_es; i++ )
{
media_es_t *p_es = p_media->es[i];
+ const char *mime_major; /* major MIME type */
- if( p_es->fmt.i_cat == AUDIO_ES )
- {
- p += sprintf( p, "m=audio %d RTP/AVP %d\r\n",
- p_es->i_port, p_es->i_payload_type );
- }
- else if( p_es->fmt.i_cat == VIDEO_ES )
+ switch( p_es->fmt.i_cat )
{
- p += sprintf( p, "m=video %d RTP/AVP %d\r\n",
- p_es->i_port, p_es->i_payload_type );
- }
- else
- {
- continue;
+ case VIDEO_ES:
+ mime_major = "video";
+ break;
+ case AUDIO_ES:
+ mime_major = "audio";
+ break;
+ case SPU_ES:
+ mime_major = "text";
+ break;
+ default:
+ continue;
}
- if( p_es->psz_rtpmap )
- {
- p += sprintf( p, "a=rtpmap:%d %s\r\n", p_es->i_payload_type,
- p_es->psz_rtpmap );
- }
- if( p_es->psz_fmtp )
- {
- p += sprintf( p, "a=fmtp:%d %s\r\n", p_es->i_payload_type,
- p_es->psz_fmtp );
- }
+ sdp_AddMedia( &psz_sdp, mime_major, "RTP/AVP", 0 /* p_es->i_port */,
+ p_es->i_payload_type, false, 0,
+ p_es->psz_ptname, p_es->i_clock_rate, p_es->i_channels,
+ p_es->psz_fmtp );
- p += sprintf( p, psz_control, ip, i );
+ sdp_AddAttribute( &psz_sdp, "control", psz_control, ip, i );
}
return psz_sdp;
projects / vlc / blobdiff