/*****************************************************************************
- * mms.c: MMS access plug-in
+ * mmstu.c: MMS access plug-in
*****************************************************************************
* Copyright (C) 2001, 2002 the VideoLAN team
* $Id$
static int mms_ReceivePacket( access_t * );
-static void* KeepAliveThread( void * );
+static void KeepAliveStart( access_t * );
+static void KeepAliveStop( access_t * );
int MMSTUOpen( access_t *p_access )
{
vlc_mutex_init( &p_sys->lock_netwrite );
/* *** Parse URL and get server addr/port and path *** */
- vlc_UrlParse( &p_sys->url, p_access->psz_path, 0 );
+ vlc_UrlParse( &p_sys->url, p_access->psz_location, 0 );
if( p_sys->url.psz_host == NULL || *p_sys->url.psz_host == '\0' )
{
msg_Err( p_access, "invalid server name" );
(uint64_t)p_sys->i_header +
(uint64_t)p_sys->i_packet_count * (uint64_t)p_sys->i_packet_length;
}
+ p_sys->b_keep_alive = false;
/* *** Start stream *** */
if( MMSStart( p_access, 0xffffffff ) < 0 )
return VLC_EGENERIC;
}
- /* Keep the connection alive when paused */
- p_sys->p_keepalive = malloc( sizeof( mmstu_keepalive_t ) );
- if( !p_sys->p_keepalive )
- {
- MMSTUClose ( p_access );
- return VLC_ENOMEM;
- }
- p_sys->p_keepalive->p_access = p_access;
- vlc_mutex_init( &p_sys->p_keepalive->lock );
- vlc_cond_init( &p_sys->p_keepalive->wait );
- p_sys->p_keepalive->b_paused = false;
- if( vlc_clone( &p_sys->p_keepalive->handle, KeepAliveThread,
- p_sys->p_keepalive, VLC_THREAD_PRIORITY_LOW ) )
- {
- vlc_cond_destroy( &p_sys->p_keepalive->wait );
- vlc_mutex_destroy( &p_sys->p_keepalive->lock );
- free( p_sys->p_keepalive );
- p_sys->p_keepalive = NULL;
- }
-
return VLC_SUCCESS;
}
{
access_sys_t *p_sys = p_access->p_sys;
- if( p_sys->p_keepalive )
- {
- vlc_cancel( p_sys->p_keepalive->handle );
- vlc_join( p_sys->p_keepalive->handle, NULL );
- vlc_cond_destroy( &p_sys->p_keepalive->wait );
- vlc_mutex_destroy( &p_sys->p_keepalive->lock );
- free( p_sys->p_keepalive );
- }
+ KeepAliveStop( p_access );
/* close connection with server */
MMSClose( p_access );
/* free memory */
vlc_UrlClean( &p_sys->url );
- vlc_mutex_destroy( &p_sys->lock_netwrite );
free( p_sys );
}
/* */
case ACCESS_GET_PTS_DELAY:
pi_64 = (int64_t*)va_arg( args, int64_t * );
- *pi_64 = (int64_t)var_GetInteger( p_access, "mms-caching" ) * INT64_C(1000);
+ *pi_64 = INT64_C(1000)
+ * var_InheritInteger( p_access, "network-caching" );
break;
case ACCESS_GET_PRIVATE_ID_STATE:
case ACCESS_SET_PAUSE_STATE:
b_bool = (bool)va_arg( args, int );
if( b_bool )
+ {
MMSStop( p_access );
+ KeepAliveStart( p_access );
+ }
else
- Seek( p_access, p_access->info.i_pos );
-
- if( p_sys->p_keepalive )
{
- vlc_mutex_lock( &p_sys->p_keepalive->lock );
- p_sys->p_keepalive->b_paused = b_bool;
- if( b_bool )
- vlc_cond_signal( &p_sys->p_keepalive->wait );
- vlc_mutex_unlock( &p_sys->p_keepalive->lock );
+ KeepAliveStop( p_access );
+ Seek( p_access, p_access->info.i_pos );
}
break;
case ACCESS_SET_SEEKPOINT:
case ACCESS_SET_PRIVATE_ID_STATE:
case ACCESS_GET_CONTENT_TYPE:
+ case ACCESS_GET_META:
return VLC_EGENERIC;
int b_udp = ( i_proto == MMS_PROTO_UDP ) ? 1 : 0;
var_buffer_t buffer;
- char tmp[4096];
+ char *tmp;
uint16_t *p;
int i_server_version;
int i_tool_version;
var_buffer_initwrite( &buffer, 0 );
var_buffer_add16( &buffer, 0x001c );
var_buffer_add16( &buffer, 0x0003 );
- sprintf( tmp,
+ if( asprintf( &tmp,
"NSPlayer/7.0.0.1956; {"GUID_FMT"}; Host: %s",
GUID_PRINT( p_sys->guid ),
- p_url->psz_host );
- var_buffer_addUTF16( &buffer, tmp );
+ p_url->psz_host ) < 0 )
+ {
+ var_buffer_free( &buffer );
+ net_Close( p_sys->i_handle_tcp );
+ return VLC_ENOMEM;
+ }
+
+ var_buffer_addUTF16( p_access, &buffer, tmp );
+ free( tmp );
mms_CommandSend( p_access,
0x01, /* connexion request */
var_buffer_add32( &buffer, 0x00000002 );
if( b_udp )
{
- sprintf( tmp,
- "\\\\%s\\UDP\\%d",
- p_sys->sz_bind_addr,
- 7000 ); // FIXME
+ if( asprintf( &tmp,
+ "\\\\%s\\UDP\\%d",
+ p_sys->sz_bind_addr,
+ 7000 ) < 0) // FIXME
+ {
+ var_buffer_free( &buffer );
+ MMSClose( p_access );
+ return VLC_EGENERIC;
+ }
}
else
{
- sprintf( tmp, "\\\\192.168.0.1\\TCP\\1242" );
+ if( asprintf( &tmp, "\\\\192.168.0.1\\TCP\\1242" ) < 0 )
+ {
+ var_buffer_free( &buffer );
+ MMSClose( p_access );
+ return VLC_EGENERIC;
+ }
}
- var_buffer_addUTF16( &buffer, tmp );
+ var_buffer_addUTF16( p_access, &buffer, tmp );
var_buffer_add16( &buffer, '0' );
+ free( tmp );
mms_CommandSend( p_access,
0x02, /* connexion request */
/* media file path shouldn't start with / character */
mediapath = p_url->psz_path;
- if ( *mediapath == '/' )
+ if ( mediapath && *mediapath == '/' )
{
mediapath++;
}
- var_buffer_addUTF16( &buffer, mediapath );
+ var_buffer_addUTF16( p_access, &buffer, mediapath );
mms_CommandSend( p_access,
0x05,
{
var_buffer_add16( &buffer, 0x0000 );
msg_Info( p_access,
- "selecting stream[0x%x] %s (%d kb/s)",
+ "selecting stream[0x%x] %s (%d Kib/s)",
i,
( p_sys->asfh.stream[i].i_cat == ASF_STREAM_AUDIO ) ?
"audio" : "video" ,
{
var_buffer_add16( &buffer, 0x0002 );
msg_Info( p_access,
- "ignoring stream[0x%x] %s (%d kb/s)",
+ "ignoring stream[0x%x] %s (%d Kib/s)",
i,
( p_sys->asfh.stream[i].i_cat == ASF_STREAM_AUDIO ) ?
"audio" : "video" ,
i_ret = net_Write( p_access, p_sys->i_handle_tcp, NULL, buffer.p_data,
buffer.i_data - ( 8 - ( i_data - i_data_old ) ) );
vlc_mutex_unlock( &p_sys->lock_netwrite );
+
if( i_ret != buffer.i_data - ( 8 - ( i_data - i_data_old ) ) )
{
var_buffer_free( &buffer );
return -1;
}
-static void* KeepAliveThread( void *p_data )
+VLC_NORETURN
+static void *KeepAliveThread( void *p_data )
{
- mmstu_keepalive_t *p_thread = (mmstu_keepalive_t *) p_data;
- access_t *p_access = p_thread->p_access;
-
- vlc_mutex_lock( &p_thread->lock );
- mutex_cleanup_push( &p_thread->lock );
+ access_t *p_access = p_data;
for( ;; )
{
- /* Do nothing until paused (if ever) */
- while( !p_thread->b_paused )
- vlc_cond_wait( &p_thread->wait, &p_thread->lock );
+ /* Send keep-alive every ten seconds */
+ int canc = vlc_savecancel();
- do
- {
- int canc;
+ mms_CommandSend( p_access, 0x1b, 0, 0, NULL, 0 );
- /* Send keep-alive every ten seconds */
- vlc_mutex_unlock( &p_thread->lock );
- canc = vlc_savecancel();
+ vlc_restorecancel( canc );
- mms_CommandSend( p_access, 0x1b, 0, 0, NULL, 0 );
+ msleep( 10 * CLOCK_FREQ );
+ }
+ assert(0);
+}
- vlc_restorecancel( canc );
- vlc_mutex_lock( &p_thread->lock );
+static void KeepAliveStart( access_t *p_access )
+{
+ access_sys_t *p_sys = p_access->p_sys;
+ if( p_sys->b_keep_alive )
+ return;
- msleep( 10 * CLOCK_FREQ );
- }
- while( p_thread->b_paused );
- }
+ p_sys->b_keep_alive = !vlc_clone( &p_sys->keep_alive,
+ KeepAliveThread, p_access,
+ VLC_THREAD_PRIORITY_LOW );
+}
- vlc_cleanup_pop();
- assert(0);
+static void KeepAliveStop( access_t *p_access )
+{
+ access_sys_t *p_sys = p_access->p_sys;
+ if( !p_sys->b_keep_alive )
+ return;
+
+ vlc_cancel( p_sys->keep_alive );
+ vlc_join( p_sys->keep_alive, NULL );
+ p_sys->b_keep_alive = false;
}
projects / vlc / blobdiff