#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
-#ifdef HAVE_FCNTL_H
-# include <fcntl.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
+#include <sys/types.h>
#ifdef HAVE_POLL
# include <poll.h>
#endif
#include <vlc_network.h>
-#include "vlc_url.h"
+#include <vlc_url.h>
#include "asf.h"
#include "buffer.h"
static block_t *Block( access_t * );
-static int Seek( access_t *, int64_t );
+static int Seek( access_t *, uint64_t );
static int Control( access_t *, int, va_list );
static int MMSOpen ( access_t *, vlc_url_t *, int );
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 )
{
(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 ) );
- 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 );
}
bool b_bool;
int64_t *pi_64;
int i_int;
- vlc_value_t val;
switch( i_query )
{
/* */
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" ) * INT64_C(1000);
break;
case ACCESS_SET_PAUSE_STATE:
b_bool = (bool)va_arg( args, int );
if( b_bool )
+ {
MMSStop( p_access );
+ KeepAliveStart( p_access );
+ }
else
+ {
+ KeepAliveStop( p_access );
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:
/*****************************************************************************
* Seek: try to go at the right place
*****************************************************************************/
-static int Seek( access_t * p_access, int64_t i_pos )
+static int Seek( access_t * p_access, uint64_t i_pos )
{
access_sys_t *p_sys = p_access->p_sys;
uint32_t i_packet;
uint32_t i_offset;
var_buffer_t buffer;
- if( i_pos < 0 )
- return VLC_EGENERIC;
-
if( i_pos < p_sys->i_header)
{
-
if( p_access->info.i_pos < p_sys->i_header )
{
/* no need to restart stream, it was already one
i_packet = ( i_pos - p_sys->i_header ) / p_sys->i_packet_length;
i_offset = ( i_pos - p_sys->i_header ) % p_sys->i_packet_length;
}
- msg_Dbg( p_access, "seeking to %"PRId64 " (packet:%d)", i_pos, i_packet );
+ if( p_sys->b_seekable && i_packet >= p_sys->i_packet_count )
+ return VLC_EGENERIC;
+
+ msg_Dbg( p_access, "seeking to %"PRIu64 " (packet:%u)", i_pos, i_packet );
MMSStop( p_access );
msg_Dbg( p_access, "stream stopped (seek)" );
#define GETUTF16( psz, size ) \
{ \
int i; \
- psz = malloc( size + 1); \
+ psz = xmalloc( size + 1); \
for( i = 0; i < size; i++ ) \
{ \
psz[i] = p[i]; \
msg_Dbg( p_access,
"answer 0x06 flags:0x%8.8"PRIx32" media_length:%"PRIu32"s "
- "packet_length:%u packet_count:%"PRId32" max_bit_rate:%d "
+ "packet_length:%zu packet_count:%"PRIu32" max_bit_rate:%d "
"header_size:%zu",
p_sys->i_flags_broadcast,
p_sys->i_media_length,
- (unsigned)p_sys->i_packet_length,
+ p_sys->i_packet_length,
p_sys->i_packet_count,
p_sys->i_max_bit_rate,
p_sys->i_header_size );
asf_HeaderParse ( &p_sys->asfh,
p_sys->p_header, p_sys->i_header );
asf_StreamSelect( &p_sys->asfh,
- var_CreateGetInteger( p_access, "mms-maxbitrate" ),
- var_CreateGetInteger( p_access, "mms-all" ),
- var_CreateGetInteger( p_access, "audio" ),
- var_CreateGetInteger( p_access, "video" ) );
+ var_InheritInteger( p_access, "mms-maxbitrate" ),
+ var_InheritBool( p_access, "mms-all" ),
+ var_InheritBool( p_access, "audio" ),
+ var_InheritBool( p_access, "video" ) );
/* *** now select stream we want to receive *** */
/* TODO take care of stream bitrate TODO */
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 );
msg_Err( p_access, "failed to send command" );
return VLC_EGENERIC;
}
return -1;
}
- if( !vlc_object_alive (p_access) || p_access->b_error )
+ if( !vlc_object_alive (p_access) )
return -1;
//msg_Dbg( p_access, "NetFillBuffer: trying again (select)" );
free( p_sys->p_cmd );
p_sys->i_cmd = i_data;
- p_sys->p_cmd = malloc( i_data );
+ p_sys->p_cmd = xmalloc( i_data );
memcpy( p_sys->p_cmd, p_data, i_data );
*pi_used = i_data; /* by default */
{
if( p_sys->p_header )
{
- p_sys->p_header = realloc( p_sys->p_header,
- p_sys->i_header + i_packet_length - 8 );
+ p_sys->p_header = xrealloc( p_sys->p_header,
+ p_sys->i_header + i_packet_length - 8 );
memcpy( &p_sys->p_header[p_sys->i_header],
p_data + 8, i_packet_length - 8 );
p_sys->i_header += i_packet_length - 8;
}
else
{
- uint8_t* p_packet = malloc( i_packet_length - 8 ); // don't bother with preheader
+ uint8_t* p_packet = xmalloc( i_packet_length - 8 ); // don't bother with preheader
memcpy( p_packet, p_data + 8, i_packet_length - 8 );
p_sys->p_header = p_packet;
p_sys->i_header = i_packet_length - 8;
}
else
{
- uint8_t* p_packet = malloc( i_packet_length - 8 ); // don't bother with preheader
+ uint8_t* p_packet = xmalloc( i_packet_length - 8 ); // don't bother with preheader
memcpy( p_packet, p_data + 8, i_packet_length - 8 );
FREENULL( p_sys->p_media );
p_sys->p_media = p_packet;
return -1;
}
-static void* KeepAliveThread( void *p_data )
+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