# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
#include <vlc_access.h>
#include <errno.h>
+#include <assert.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
/*****************************************************************************
* Local prototypes
*****************************************************************************/
-int E_( MMSTUOpen ) ( access_t * );
-void E_( MMSTUClose ) ( access_t * );
+int MMSTUOpen ( access_t * );
+void MMSTUClose ( access_t * );
static ssize_t Read( access_t *, uint8_t *, size_t );
static int mms_ReceivePacket( access_t * );
+static void* KeepAliveThread( void * );
-int E_(MMSTUOpen)( access_t *p_access )
+int MMSTUOpen( access_t *p_access )
{
access_sys_t *p_sys;
int i_proto;
p_sys->i_timeout = var_CreateGetInteger( p_access, "mms-timeout" );
+ 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 );
if( p_sys->url.psz_host == NULL || *p_sys->url.psz_host == '\0' )
{
msg_Err( p_access, "invalid server name" );
vlc_UrlClean( &p_sys->url );
+ vlc_mutex_destroy( &p_sys->lock_netwrite );
free( p_sys );
return VLC_EGENERIC;
}
{ /* first try with TCP and then UDP*/
if( ( i_status = MMSOpen( p_access, &p_sys->url, MMS_PROTO_TCP ) ) )
{
- i_status = MMSOpen( p_access, &p_sys->url, MMS_PROTO_UDP );
+ if( !p_access->b_die )
+ i_status = MMSOpen( p_access, &p_sys->url, MMS_PROTO_UDP );
}
}
else
{
msg_Err( p_access, "cannot connect to server" );
vlc_UrlClean( &p_sys->url );
+ vlc_mutex_destroy( &p_sys->lock_netwrite );
free( p_sys );
return VLC_EGENERIC;
}
if( MMSStart( p_access, 0xffffffff ) < 0 )
{
msg_Err( p_access, "cannot start stream" );
- E_(MMSTUClose) ( p_access );
+ MMSTUClose ( p_access );
return VLC_EGENERIC;
}
+
+ /* Keep the connection alive when paused */
+ p_sys->p_keepalive = malloc( sizeof( mmstu_keepalive_t ) );
+ 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;
}
/*****************************************************************************
* Close: free unused data structures
*****************************************************************************/
-void E_(MMSTUClose)( access_t *p_access )
+void MMSTUClose( access_t *p_access )
{
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 );
+ }
+
/* close connection with server */
MMSClose( p_access );
/* free memory */
vlc_UrlClean( &p_sys->url );
+ vlc_mutex_destroy( &p_sys->lock_netwrite );
free( p_sys );
}
{
access_sys_t *p_sys = p_access->p_sys;
bool *pb_bool;
+ bool b_bool;
int *pi_int;
int64_t *pi_64;
int i_int;
break;
case ACCESS_CAN_FASTSEEK:
- case ACCESS_CAN_PAUSE:
pb_bool = (bool*)va_arg( args, bool* );
*pb_bool = false;
break;
+ case ACCESS_CAN_PAUSE:
+ pb_bool = (bool*)va_arg( args, bool* );
+ *pb_bool = true;
+ break;
+
case ACCESS_CAN_CONTROL_PACE:
pb_bool = (bool*)va_arg( args, bool* );
case ACCESS_GET_PTS_DELAY:
pi_64 = (int64_t*)va_arg( args, int64_t * );
var_Get( p_access, "mms-caching", &val );
- *pi_64 = (int64_t)var_GetInteger( p_access, "mms-caching" ) * I64C(1000);
+ *pi_64 = (int64_t)var_GetInteger( p_access, "mms-caching" ) * INT64_C(1000);
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 );
+ else
+ Seek( p_access, p_access->info.i_pos );
+
+ 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 );
+ break;
+
case ACCESS_GET_TITLE_INFO:
case ACCESS_SET_TITLE:
case ACCESS_SET_SEEKPOINT:
var_buffer_free( &buffer );
- while( !p_access->b_die )
+ while( vlc_object_alive (p_access) )
{
if( mms_HeaderMediaRead( p_access, MMS_PACKET_CMD ) < 0 )
{
}
}
- while( !p_access->b_die )
+ while( vlc_object_alive (p_access) )
{
if( mms_HeaderMediaRead( p_access, MMS_PACKET_CMD ) < 0 )
{
size_t i_data;
size_t i_copy;
+ if( p_access->info.b_eof )
+ {
+ return 0;
+ }
+
i_data = 0;
/* *** now send data if needed *** */
int i;
int i_streams;
int i_first;
+ char *mediapath;
/* *** Open a TCP connection with server *** */
}
/* *** Init context for mms prototcol *** */
- E_( GenerateGuid )( &p_sys->guid ); /* used to identify client by server */
+ GenerateGuid ( &p_sys->guid ); /* used to identify client by server */
msg_Dbg( p_access,
"generated guid: "GUID_FMT,
GUID_PRINT( p_sys->guid ) );
/* *** send command 5 : media file name/path requested *** */
var_buffer_reinitwrite( &buffer, 0 );
var_buffer_add64( &buffer, 0 );
- var_buffer_addUTF16( &buffer, p_url->psz_path );
+
+ /* media file path shouldn't start with / character */
+ mediapath = p_url->psz_path;
+ if ( *mediapath == '/' )
+ {
+ mediapath++;
+ }
+ var_buffer_addUTF16( &buffer, mediapath );
mms_CommandSend( p_access,
0x05,
GetDWLE( p_sys->p_cmd + MMS_CMD_HEADERSIZE + 60 );
msg_Dbg( p_access,
- "answer 0x06 flags:0x%8.8x media_length:%us "
- "packet_length:%ul packet_count:%d max_bit_rate:%d "
- "header_size:%d",
+ "answer 0x06 flags:0x%8.8"PRIx32" media_length:%"PRIu32"s "
+ "packet_length:%zul packet_count:%"PRId32" max_bit_rate:%d "
+ "header_size:%zu",
p_sys->i_flags_broadcast,
p_sys->i_media_length,
(unsigned)p_sys->i_packet_length,
if( p_sys->i_header >= p_sys->i_header_size )
{
msg_Dbg( p_access,
- "header complete(%d)",
+ "header complete(%zu)",
p_sys->i_header );
break;
}
msg_Dbg( p_access,
- "header incomplete (%d/%d), reading more",
+ "header incomplete (%zu/%zu), reading more",
p_sys->i_header,
p_sys->i_header_size );
}
*
* TODO : stream bitrates properties(optional)
* and bitrate mutual exclusion(optional) */
- E_( asf_HeaderParse )( &p_sys->asfh,
+ asf_HeaderParse ( &p_sys->asfh,
p_sys->p_header, p_sys->i_header );
- E_( asf_StreamSelect)( &p_sys->asfh,
+ asf_StreamSelect( &p_sys->asfh,
var_CreateGetInteger( p_access, "mms-maxbitrate" ),
var_CreateGetInteger( p_access, "mms-all" ),
var_CreateGetInteger( p_access, "audio" ),
var_buffer_add64( &buffer, 0 );
/* send it */
+ vlc_mutex_lock( &p_sys->lock_netwrite );
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 ) ) )
{
msg_Err( p_access, "failed to send command" );
return -1;
}
- if( p_access->b_die || p_access->b_error ) return -1;
+ if( !vlc_object_alive (p_access) || p_access->b_error ) return -1;
//msg_Dbg( p_access, "NetFillBuffer: trying again (select)" );
static int mms_ParseCommand( access_t *p_access,
uint8_t *p_data,
- int i_data,
+ size_t i_data,
int *pi_used )
{
#define GET32( i_pos ) \
( p_sys->p_cmd[i_pos + 3] << 24 ) )
access_sys_t *p_sys = p_access->p_sys;
- int i_length;
+ uint32_t i_length;
uint32_t i_id;
free( p_sys->p_cmd );
i_id = GetDWLE( p_data + 4 );
i_length = GetDWLE( p_data + 8 ) + 16;
- if( i_id != 0xb00bface )
+ if( i_id != 0xb00bface || i_length < 16 )
{
msg_Err( p_access,
- "incorrect command header (0x%x)", i_id );
+ "incorrect command header (0x%"PRIx32")", i_id );
p_sys->i_command = 0;
return -1;
}
if( i_length > p_sys->i_cmd )
{
msg_Warn( p_access,
- "truncated command (missing %d bytes)",
- i_length - i_data );
+ "truncated command (missing %zu bytes)",
+ (size_t)i_length - i_data );
p_sys->i_command = 0;
return -1;
}
{
int i_status;
- if( p_access->b_die )
+ if( !vlc_object_alive (p_access) )
return -1;
i_status = mms_ReceivePacket( p_access );
return -1;
}
+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 );
+
+ for( ;; )
+ {
+ /* Do nothing until paused (if ever) */
+ while( !p_thread->b_paused )
+ vlc_cond_wait( &p_thread->wait, &p_thread->lock );
+
+ do
+ {
+ int canc;
+
+ /* Send keep-alive every ten seconds */
+ vlc_mutex_unlock( &p_thread->lock );
+ canc = vlc_savecancel();
+
+ mms_CommandSend( p_access, 0x1b, 0, 0, NULL, 0 );
+
+ vlc_restorecancel( canc );
+ vlc_mutex_lock( &p_thread->lock );
+
+ msleep( 10 * CLOCK_FREQ );
+ }
+ while( p_thread->b_paused );
+ }
+
+ vlc_cleanup_pop();
+ assert(0);
+}
projects / vlc / blobdiff