"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( 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 );
+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 );
add_integer( "rtsp-session-timeout", 5, NULL, SESSION_TIMEOUT_TEXT,
SESSION_TIMEOUT_LONGTEXT, true );
-vlc_module_end();
+vlc_module_end ()
/*****************************************************************************
* Exported prototypes
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" );
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 );
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 )
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;
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 ) < 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",
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 );
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) );
+ 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;
{
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 );
+ if( asprintf( &p_es->psz_rtpmap, "L16/%d/%d", p_fmt->audio.i_rate,
+ p_fmt->audio.i_channels ) == -1 )
+ p_es->psz_rtpmap = NULL;
break;
case VLC_FOURCC( 'u', '8', ' ', ' ' ):
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 );
+ if( asprintf( &p_es->psz_rtpmap, "L8/%d/%d", p_fmt->audio.i_rate,
+ p_fmt->audio.i_channels ) == -1 )
+ p_es->psz_rtpmap = NULL;
break;
case VLC_FOURCC( 'm', 'p', 'g', 'a' ):
case VLC_FOURCC( 'm', 'p', '3', ' ' ):
break;
case VLC_FOURCC( 'a', '5', '2', ' ' ):
p_es->i_payload_type = p_media->i_payload_type++;
- asprintf( &p_es->psz_rtpmap, "ac3/%d", p_fmt->audio.i_rate );
+ if( asprintf( &p_es->psz_rtpmap, "ac3/%d", p_fmt->audio.i_rate ) == -1 )
+ p_es->psz_rtpmap = NULL;
break;
case VLC_FOURCC( 'H', '2', '6', '3' ):
p_es->i_payload_type = p_media->i_payload_type++;
}
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_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' ):
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 );
+ if( asprintf( &p_es->psz_rtpmap, "mpeg4-generic/%d", p_fmt->audio.i_rate ) == -1 )
+ p_es->psz_rtpmap = NULL;
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;
{
vod_t *p_vod = (vod_t*)p_this;
vod_sys_t *p_sys = p_vod->p_sys;
+ int canc = vlc_savecancel ();
while( vlc_object_alive (p_vod) )
{
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 )
{
+ p_rtsp->i_es--;
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 );
}
+ free( p_rtsp->es );
TAB_REMOVE( p_media->i_rtsp, p_media->rtsp, p_rtsp );
projects / vlc / blobdiff