* Preamble
*****************************************************************************/
-#include <errno.h>
+#ifdef HAVE_CONFIG_H
+# 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_charset.h>
#include <vlc_strings.h>
+#include <errno.h>
+
/*****************************************************************************
* Module descriptor
*****************************************************************************/
"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_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, VLC_TRUE );
- add_string( "rtsp-raw-mux", "ts", NULL, RAWMUX_TEXT, RAWMUX_TEXT, VLC_TRUE );
+ 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, VLC_TRUE );
+ THROTLE_LONGTEXT, true );
add_integer( "rtsp-session-timeout", 5, NULL, SESSION_TIMEOUT_TEXT,
- SESSION_TIMEOUT_LONGTEXT, VLC_TRUE );
+ SESSION_TIMEOUT_LONGTEXT, true );
vlc_module_end();
/*****************************************************************************
char *psz_session;
int64_t i_last; /* for timeout */
- vlc_bool_t b_playing; /* is it in "play" state */
- vlc_bool_t b_paused; /* is it in "pause" state */
+ bool b_playing; /* is it in "play" state */
+ bool b_paused; /* is it in "pause" state */
int i_es;
rtsp_client_es_t **es;
int64_t i_sdp_id;
int i_sdp_version;
- vlc_bool_t b_multicast;
+ bool b_multicast;
vlc_mutex_t lock;
int i_es;
media_es_t **es;
char *psz_mux;
- vlc_bool_t b_raw;
+ bool b_raw;
/* RTSP client */
int i_rtsp;
psz_url = config_GetPsz( p_vod, "rtsp-host" );
vlc_UrlParse( &url, psz_url, 0 );
- if( psz_url ) free( psz_url );
+ free( psz_url );
if( url.i_port <= 0 ) url.i_port = 554;
vlc_UrlClean( &url );
- vlc_mutex_init( p_vod, &p_sys->lock_media );
+ 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_add_es = MediaAddES;
p_vod->pf_media_del_es = MediaDelES;
- p_sys->p_fifo_cmd = block_FifoNew( p_vod );
+ p_sys->p_fifo_cmd = block_FifoNew();
if( vlc_thread_create( p_vod, "rtsp vod thread", CommandThread,
- VLC_THREAD_PRIORITY_LOW, VLC_FALSE ) )
+ VLC_THREAD_PRIORITY_LOW, false ) )
{
msg_Err( p_vod, "cannot spawn rtsp vod thread" );
block_FifoRelease( p_sys->p_fifo_cmd );
return VLC_SUCCESS;
error:
- if( p_sys && p_sys->p_rtsp_host ) httpd_HostDelete( p_sys->p_rtsp_host );
- if( p_sys && p_sys->psz_raw_mux ) free( p_sys->psz_raw_mux );
- if( p_sys ) free( p_sys );
+ if( p_sys )
+ {
+ if( p_sys->p_rtsp_host ) httpd_HostDelete( p_sys->p_rtsp_host );
+ free( p_sys->psz_raw_mux );
+ free( p_sys );
+ }
vlc_UrlClean( &url );
return VLC_EGENERIC;
int i;
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;
TAB_INIT( p_media->i_rtsp, p_media->rtsp );
- p_media->b_raw = VLC_FALSE;
+ p_media->b_raw = false;
- asprintf( &p_media->psz_rtsp_path, "%s%s", p_sys->psz_path, psz_name );
+ if( asprintf( &p_media->psz_rtsp_path, "%s%s",
+ p_sys->psz_path, psz_name ) <0 )
+ return NULL;
p_media->p_rtsp_url =
httpd_UrlNewUnique( p_sys->p_rtsp_host, p_media->psz_rtsp_path, NULL,
NULL, NULL );
msg_Dbg( p_vod, "created RTSP url: %s", p_media->psz_rtsp_path );
- asprintf( &p_media->psz_rtsp_control_v4,
+ if( asprintf( &p_media->psz_rtsp_control_v4,
"a=control:rtsp://%%s:%d%s/trackID=%%d\r\n",
- p_sys->i_port, p_media->psz_rtsp_path );
- asprintf( &p_media->psz_rtsp_control_v6,
+ p_sys->i_port, p_media->psz_rtsp_path ) < 0 )
+ return NULL;
+ if( asprintf( &p_media->psz_rtsp_control_v6,
"a=control:rtsp://[%%s]:%d%s/trackID=%%d\r\n",
- p_sys->i_port, p_media->psz_rtsp_path );
+ p_sys->i_port, p_media->psz_rtsp_path ) < 0 )
+ return NULL;
httpd_UrlCatch( p_media->p_rtsp_url, HTTPD_MSG_SETUP,
RtspCallback, (void*)p_media );
TAB_APPEND( p_sys->i_media, p_sys->media, p_media );
vlc_mutex_unlock( &p_sys->lock_media );
- vlc_mutex_init( p_vod, &p_media->lock );
+ vlc_mutex_init( &p_media->lock );
p_media->psz_session_name = strdup("");
p_media->psz_session_description = strdup("");
p_media->psz_session_url = strdup("");
TAB_CLEAN( p_media->i_rtsp, p_media->rtsp );
httpd_UrlDelete( p_media->p_rtsp_url );
- if( p_media->psz_rtsp_path ) free( p_media->psz_rtsp_path );
- if( p_media->psz_rtsp_control_v6 ) free( p_media->psz_rtsp_control_v6 );
- if( p_media->psz_rtsp_control_v4 ) free( p_media->psz_rtsp_control_v4 );
+ free( p_media->psz_rtsp_path );
+ free( p_media->psz_rtsp_control_v6 );
+ free( p_media->psz_rtsp_control_v4 );
while( p_media->i_es )
MediaDelES( p_vod, p_media, &p_media->es[0]->fmt );
vlc_mutex_destroy( &p_media->lock );
- if( p_media->psz_session_name ) free( p_media->psz_session_name );
- if( p_media->psz_session_description ) free( p_media->psz_session_description );
- if( p_media->psz_session_url ) free( p_media->psz_session_url );
- if( p_media->psz_session_email ) free( p_media->psz_session_email );
- if( p_media->psz_mux ) free( p_media->psz_mux );
+ 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 );
}
if( !p_es ) return VLC_ENOMEM;
memset( p_es, 0, sizeof(media_es_t) );
- if( p_media->psz_mux ) free( p_media->psz_mux );
+ free( p_media->psz_mux );
p_media->psz_mux = NULL;
/* TODO: update SDP, etc... */
- asprintf( &psz_urlc, "%s/trackID=%d",
- p_media->psz_rtsp_path, p_media->i_es );
+ 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 );
switch( p_fmt->i_codec )
{
p_es->i_payload_type = 11;
}
- else if( p_fmt->audio.i_channels == 2 && p_fmt->audio.i_rate == 44100 )
+ else if( p_fmt->audio.i_channels == 2 &&
+ p_fmt->audio.i_rate == 44100 )
{
p_es->i_payload_type = 10;
}
p_fmt->audio.i_channels );
break;
case VLC_FOURCC( 'm', 'p', 'g', 'a' ):
+ case VLC_FOURCC( 'm', 'p', '3', ' ' ):
p_es->i_payload_type = 14;
p_es->psz_rtpmap = strdup( "MPA/90000" );
break;
break;
case VLC_FOURCC( 'a', '5', '2', ' ' ):
p_es->i_payload_type = p_media->i_payload_type++;
- p_es->psz_rtpmap = strdup( "ac3/90000" );
+ asprintf( &p_es->psz_rtpmap, "ac3/%d", p_fmt->audio.i_rate );
break;
case VLC_FOURCC( 'H', '2', '6', '3' ):
p_es->i_payload_type = p_media->i_payload_type++;
}
/* */
if( p_64_sps && p_64_pps )
- asprintf( &p_es->psz_fmtp, "packetization-mode=1;profile-level-id=%s;sprop-parameter-sets=%s,%s;", hexa, p_64_sps, p_64_pps );
- if( p_64_sps )
- free( p_64_sps );
- if( p_64_pps )
- free( 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" );
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;
}
TAB_REMOVE( p_media->i_es, p_media->es, p_es );
vlc_mutex_unlock( &p_media->lock );
- if( p_es->psz_rtpmap ) free( p_es->psz_rtpmap );
- if( p_es->psz_fmtp ) free( p_es->psz_fmtp );
+ 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 );
next:
vlc_mutex_unlock( &p_sys->lock_media );
- if( cmd.psz_session )
- free( cmd.psz_session );
- if( cmd.psz_arg )
- free( cmd.psz_arg );
+ free( cmd.psz_session );
+ free( cmd.psz_arg );
}
}
while( p_rtsp->i_es-- )
{
- if( p_rtsp->es[p_rtsp->i_es]->psz_ip )
- free( p_rtsp->es[p_rtsp->i_es]->psz_ip );
+ free( p_rtsp->es[p_rtsp->i_es]->psz_ip );
free( p_rtsp->es[p_rtsp->i_es] );
if( !p_rtsp->i_es ) free( p_rtsp->es );
}
{
psz_playnow = httpd_MsgGet( query, "x-playNow" );
psz_transport = httpd_MsgGet( query, "Transport" );
+ if( psz_transport == NULL )
+ {
+ answer->i_status = 400;
+ break;
+ }
msg_Dbg( p_vod, "HTTPD_MSG_SETUP: transport=%s", psz_transport );
if( strstr( psz_transport, "unicast" ) &&
if( strstr( psz_transport, "MP2T/H2221/UDP" ) ||
strstr( psz_transport, "RAW/RAW/UDP" ) )
{
- if( p_media->psz_mux ) free( p_media->psz_mux );
+ free( p_media->psz_mux );
p_media->psz_mux = NULL;
p_media->psz_mux = strdup( p_vod->p_sys->psz_raw_mux );
- p_media->b_raw = VLC_TRUE;
+ p_media->b_raw = true;
}
if( httpd_ClientIP( cl, ip ) == NULL )
answer->p_body = NULL;
break;
}
- asprintf( &psz_new, "%d", rand() );
+ if( asprintf( &psz_new, "%d", rand() ) < 0 )
+ return VLC_ENOMEM;
psz_session = psz_new;
p_rtsp = RtspClientNew( p_media, psz_new );
{
if( strstr( psz_transport, "MP2T/H2221/UDP" ) )
{
- httpd_MsgAdd( answer, "Transport", "MP2T/H2221/UDP;client_port=%d-%d",
+ httpd_MsgAdd( answer, "Transport",
+ "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",
+ httpd_MsgAdd( answer, "Transport",
+ "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",
+ httpd_MsgAdd( answer, "Transport",
+ "RTP/AVP/UDP;unicast;client_port=%d-%d",
i_port, i_port + 1 );
}
else /* TODO strstr( psz_transport, "interleaved" ) ) */
{
const char *psz_position = httpd_MsgGet( query, "Range" );
const char *psz_scale = httpd_MsgGet( query, "Scale" );
- if( psz_position ) psz_position = strstr( psz_position, "npt=" );
+ if( psz_position )
+ psz_position = strstr( psz_position, "npt=" );
if( psz_position && !psz_scale )
{
double f_pos;
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 );
+ CommandPush( p_vod, RTSP_CMD_TYPE_SEEK, p_media,
+ psz_session, f_pos, NULL );
}
break;
}
if( psz_scale[0] == '-' ) /* rewind */
{
msg_Dbg( p_vod, "rewind request: %s", psz_scale );
- CommandPush( p_vod, RTSP_CMD_TYPE_REWIND, p_media, psz_session, f_scale, NULL );
+ CommandPush( p_vod, RTSP_CMD_TYPE_REWIND, p_media,
+ psz_session, f_scale, NULL );
}
else if(psz_scale[0] != '1' ) /* fast-forward */
{
- msg_Dbg( p_vod, "fastforward request: %s", psz_scale );
- CommandPush( p_vod, RTSP_CMD_TYPE_FORWARD, p_media, psz_session, f_scale, NULL );
+ msg_Dbg( p_vod, "fastforward request: %s",
+ psz_scale );
+ CommandPush( p_vod, RTSP_CMD_TYPE_FORWARD, p_media,
+ psz_session, f_scale, NULL );
}
- if( p_rtsp->b_paused == VLC_TRUE )
+ if( p_rtsp->b_paused == true )
{
- p_rtsp->b_paused = VLC_FALSE;
- CommandPush( p_vod, RTSP_CMD_TYPE_PAUSE, p_media, psz_session, 0, NULL );
+ p_rtsp->b_paused = false;
+ CommandPush( p_vod, RTSP_CMD_TYPE_PAUSE, p_media,
+ psz_session, 0, NULL );
}
}
break;
if( p_rtsp->b_playing && p_rtsp->b_paused )
{
- CommandPush( p_vod, RTSP_CMD_TYPE_PAUSE, p_media, psz_session, 0, NULL );
- p_rtsp->b_paused = VLC_FALSE;
+ CommandPush( p_vod, RTSP_CMD_TYPE_PAUSE, p_media,
+ psz_session, 0, NULL );
+ p_rtsp->b_paused = false;
break;
}
else if( p_rtsp->b_playing ) break;
if( httpd_ClientIP( cl, ip ) == NULL ) break;
- p_rtsp->b_playing = VLC_TRUE;
+ p_rtsp->b_playing = true;
/* FIXME for != 1 video and 1 audio */
for( i = 0; i < p_rtsp->i_es; i++ )
{
if( p_media->b_raw )
{
- asprintf( &psz_output, "std{access=udp,dst=%s:%i,mux=%s}",
- ip, i_port, p_media->psz_mux );
+ if( asprintf( &psz_output,
+ "std{access=udp,dst=%s:%i,mux=%s}",
+ ip, i_port, p_media->psz_mux ) < 0 )
+ return VLC_ENOMEM;
}
else
{
- asprintf( &psz_output, "rtp{dst=%s,port=%i,mux=%s}",
- ip, i_port_video, p_media->psz_mux );
+ if( asprintf( &psz_output,
+ "rtp{dst=%s,port=%i,mux=%s}",
+ ip, i_port_video, p_media->psz_mux ) < 0 )
+ return VLC_ENOMEM;
}
}
else
{
- asprintf( &psz_output, "rtp{dst=%s,port-video=%i,"
- "port-audio=%i}", ip, i_port_video, i_port_audio );
+ if( asprintf( &psz_output,
+ "rtp{dst=%s,port-video=%i,port-audio=%i}",
+ ip, i_port_video, i_port_audio ) < 0 )
+ return VLC_ENOMEM;
}
- CommandPush( p_vod, RTSP_CMD_TYPE_PLAY, p_media, psz_session, 0, psz_output );
+ CommandPush( p_vod, RTSP_CMD_TYPE_PLAY, p_media, psz_session,
+ 0, psz_output );
free( psz_output );
break;
}
if( psz_sdp != NULL )
{
answer->i_status = 200;
- httpd_MsgAdd( answer, "Content-type", "%s", "application/sdp" );
+ httpd_MsgAdd( answer, "Content-type", "%s",
+ "application/sdp" );
answer->p_body = (uint8_t *)psz_sdp;
answer->i_body = strlen( psz_sdp );
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 = VLC_TRUE;
+ 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;
p_rtsp = RtspClientGet( p_media, psz_session );
if( !p_rtsp ) break;
- CommandPush( p_vod, RTSP_CMD_TYPE_STOP, p_media, psz_session, 0, NULL );
+ CommandPush( p_vod, RTSP_CMD_TYPE_STOP, p_media, psz_session,
+ 0, NULL );
RtspClientDel( p_media, p_rtsp );
break;
p_media->p_vod->p_sys->i_session_timeout );
else
httpd_MsgAdd( answer, "Session", "%s", psz_session );
- }
+ }
return VLC_SUCCESS;
}
static int RtspCallbackES( httpd_callback_sys_t *p_args, httpd_client_t *cl,
- httpd_message_t *answer, const httpd_message_t *query )
+ httpd_message_t *answer,
+ const httpd_message_t *query )
{
media_es_t *p_es = (media_es_t*)p_args;
vod_media_t *p_media = p_es->p_media;
rtsp_client_es_t *p_rtsp_es = NULL;
char ip[NI_MAXNUMERICHOST];
int i_port = atoi( strstr( psz_transport, "client_port=" ) +
- strlen("client_port=") );
+ strlen("client_port=") );
if( httpd_ClientIP( cl, ip ) == NULL )
{
answer->p_body = NULL;
break;
}
- asprintf( &psz_new, "%d", rand() );
+ if( asprintf( &psz_new, "%d", rand() ) < 0 )
+ return VLC_ENOMEM;
psz_session = psz_new;
p_rtsp = RtspClientNew( p_media, psz_new );
{
if( strstr( psz_transport, "MP2T/H2221/UDP" ) )
{
- httpd_MsgAdd( answer, "Transport", "MP2T/H2221/UDP;client_port=%d-%d",
- p_rtsp_es->i_port, p_rtsp_es->i_port + 1 );
+ httpd_MsgAdd( answer, "Transport",
+ "MP2T/H2221/UDP;client_port=%d-%d",
+ p_rtsp_es->i_port, p_rtsp_es->i_port + 1 );
}
else if( strstr( psz_transport, "RAW/RAW/UDP" ) )
{
- httpd_MsgAdd( answer, "Transport", "RAW/RAW/UDP;client_port=%d-%d",
- p_rtsp_es->i_port, p_rtsp_es->i_port + 1 );
+ httpd_MsgAdd( answer, "Transport",
+ "RAW/RAW/UDP;client_port=%d-%d",
+ p_rtsp_es->i_port, p_rtsp_es->i_port + 1 );
}
}
else
{
- httpd_MsgAdd( answer, "Transport", "RTP/AVP/UDP;client_port=%d-%d",
+ httpd_MsgAdd( answer, "Transport",
+ "RTP/AVP/UDP;client_port=%d-%d",
p_rtsp_es->i_port, p_rtsp_es->i_port + 1 );
}
}
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 );
+ CommandPush( p_vod, RTSP_CMD_TYPE_SEEK, p_media,
+ psz_session, f_pos, NULL );
}
}
{
if( p_rtsp->es[i]->p_media_es == p_es )
{
- if( p_rtsp->es[i]->psz_ip ) free( p_rtsp->es[i]->psz_ip );
+ free( p_rtsp->es[i]->psz_ip );
TAB_REMOVE( p_rtsp->i_es, p_rtsp->es, p_rtsp->es[i] );
break;
}
if( !p_rtsp->i_es )
{
- CommandPush( p_vod, RTSP_CMD_TYPE_STOP, p_media, psz_session, 0, NULL );
+ CommandPush( p_vod, RTSP_CMD_TYPE_STOP, p_media, psz_session,
+ 0, NULL );
RtspClientDel( p_media, p_rtsp );
}
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 = VLC_TRUE;
+ 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;
p = psz_sdp = malloc( i_size );
p += sprintf( p, "v=0\r\n" );
- p += sprintf( p, "o=- "I64Fd" %d IN IP%c %s\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 );