X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fmms%2Fmmstu.c;h=69beb8f45b6eb25e21413cac537c5d6138c47944;hb=f2b2e37c04b2921e29daa3260dc696646ad4f10c;hp=1a220378d3aac5bb71cccb5f7164bf55ada54e69;hpb=d18bfd92bb33df6e590efa02a55121ee75529b4f;p=vlc diff --git a/modules/access/mms/mmstu.c b/modules/access/mms/mmstu.c index 1a220378d3..69beb8f45b 100644 --- a/modules/access/mms/mmstu.c +++ b/modules/access/mms/mmstu.c @@ -25,10 +25,13 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include + #include #ifdef HAVE_UNISTD_H @@ -40,14 +43,17 @@ #ifdef HAVE_SYS_TIME_H # include #endif -#ifdef HAVE_SYS_TYPES_H +#ifdef HAVE_SYS_TYPES_H # include #endif #ifdef HAVE_SYS_STAT_H # include #endif +#ifdef HAVE_POLL +# include +#endif -#include "network.h" +#include #include "vlc_url.h" #include "asf.h" #include "buffer.h" @@ -65,11 +71,11 @@ /***************************************************************************** * Local prototypes *****************************************************************************/ -int E_( MMSTUOpen ) ( access_t * ); -void E_( MMSTUClose ) ( access_t * ); +int MMSTUOpen ( access_t * ); +void MMSTUClose ( access_t * ); -static int Read( access_t *, uint8_t *, int ); +static ssize_t Read( access_t *, uint8_t *, size_t ); static int Seek( access_t *, int64_t ); static int Control( access_t *, int, va_list ); @@ -86,28 +92,9 @@ static int mms_HeaderMediaRead( access_t *, int ); static int mms_ReceivePacket( access_t * ); +static void KeepAliveThread( vlc_object_t *p_this ); -/* - * XXX DON'T FREE MY MEMORY !!! XXX - * non mais :P - */ -/* - * Ok, ok, j'le ferai plus... - */ -/* - * Merci :)) - */ -/* - * Vous pourriez signer vos commentaires (m�e si on voit bien qui peut - * �rire ce genre de trucs :p), et �rire en anglais, bordel de - * merde :p. - */ -/* - * Alors la ouai �est fou les gens qui �rivent des commentaires sans les - * signer. Ca m�iterait un coup de pied dans le cul � :) - */ - -int E_(MMSTUOpen)( access_t *p_access ) +int MMSTUOpen( access_t *p_access ) { access_sys_t *p_sys; int i_proto; @@ -121,18 +108,25 @@ int E_(MMSTUOpen)( access_t *p_access ) p_access->info.i_update = 0; p_access->info.i_size = 0; p_access->info.i_pos = 0; - p_access->info.b_eof = VLC_FALSE; + p_access->info.b_eof = false; p_access->info.i_title = 0; p_access->info.i_seekpoint = 0; p_access->p_sys = p_sys = malloc( sizeof( access_sys_t ) ); + if( !p_sys ) return VLC_ENOMEM; memset( p_sys, 0, sizeof( access_sys_t ) ); + 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; } if( p_sys->url.i_port <= 0 ) @@ -172,6 +166,8 @@ int E_(MMSTUOpen)( access_t *p_access ) { 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; } @@ -188,11 +184,11 @@ int E_(MMSTUOpen)( access_t *p_access ) } if( p_sys->i_packet_count <= 0 || ( p_sys->i_flags_broadcast >> 24 ) == 0x02 ) { - p_sys->b_seekable = VLC_FALSE; + p_sys->b_seekable = false; } else { - p_sys->b_seekable = VLC_TRUE; + p_sys->b_seekable = true; p_access->info.i_size = (uint64_t)p_sys->i_header + (uint64_t)p_sys->i_packet_count * (uint64_t)p_sys->i_packet_length; @@ -202,25 +198,40 @@ int E_(MMSTUOpen)( access_t *p_access ) if( MMSStart( p_access, 0xffffffff ) < 0 ) { msg_Err( p_access, "cannot start stream" ); - MMSClose( p_access ); - vlc_UrlClean( &p_sys->url ); + MMSTUClose ( p_access ); return VLC_EGENERIC; } + + /* Keep the connection alive when paused */ + p_sys->p_keepalive_thread = vlc_object_create( p_access, sizeof( mmstu_keepalive_thread_t ) ); + p_sys->p_keepalive_thread->p_access = p_access; + p_sys->p_keepalive_thread->b_paused = false; + p_sys->p_keepalive_thread->b_thread_error = false; + if( vlc_thread_create( p_sys->p_keepalive_thread, "mmstu keepalive thread", KeepAliveThread, + VLC_THREAD_PRIORITY_LOW, false) ) + p_sys->p_keepalive_thread->b_thread_error = true; + 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; + vlc_object_kill( p_sys->p_keepalive_thread ); + if( !p_sys->p_keepalive_thread->b_thread_error ) + vlc_thread_join( p_sys->p_keepalive_thread ); + vlc_object_release( p_sys->p_keepalive_thread ); + /* close connection with server */ MMSClose( p_access ); /* free memory */ vlc_UrlClean( &p_sys->url ); + vlc_mutex_destroy( &p_sys->lock_netwrite ); free( p_sys ); } @@ -231,7 +242,8 @@ void E_(MMSTUClose)( access_t *p_access ) static int Control( access_t *p_access, int i_query, va_list args ) { access_sys_t *p_sys = p_access->p_sys; - vlc_bool_t *pb_bool; + bool *pb_bool; + bool b_bool; int *pi_int; int64_t *pi_64; int i_int; @@ -241,24 +253,28 @@ static int Control( access_t *p_access, int i_query, va_list args ) { /* */ case ACCESS_CAN_SEEK: - pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* ); + pb_bool = (bool*)va_arg( args, bool* ); *pb_bool = p_sys->b_seekable; break; case ACCESS_CAN_FASTSEEK: + pb_bool = (bool*)va_arg( args, bool* ); + *pb_bool = false; + break; + case ACCESS_CAN_PAUSE: - pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* ); - *pb_bool = VLC_FALSE; + pb_bool = (bool*)va_arg( args, bool* ); + *pb_bool = true; break; case ACCESS_CAN_CONTROL_PACE: - pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* ); + pb_bool = (bool*)va_arg( args, bool* ); #if 0 /* Disable for now until we have a clock synchro algo * which works with something else than MPEG over UDP */ - *pb_bool = VLC_FALSE; + *pb_bool = false; #endif - *pb_bool = VLC_TRUE; + *pb_bool = true; break; /* */ @@ -270,24 +286,42 @@ static int Control( access_t *p_access, int i_query, va_list args ) 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: i_int = (int)va_arg( args, int ); - pb_bool = (vlc_bool_t *)va_arg( args, vlc_bool_t * ); + pb_bool = (bool *)va_arg( args, bool * ); if( i_int < 0 || i_int > 127 ) return VLC_EGENERIC; - *pb_bool = p_sys->asfh.stream[i_int].i_selected ? VLC_TRUE : VLC_FALSE; + *pb_bool = p_sys->asfh.stream[i_int].i_selected ? true : false; break; /* */ case ACCESS_SET_PAUSE_STATE: + b_bool = (bool)va_arg( args, int ); + if( b_bool ) + { + MMSStop( p_access ); + vlc_object_lock( p_sys->p_keepalive_thread ); + p_sys->p_keepalive_thread->b_paused = true; + vlc_object_unlock( p_sys->p_keepalive_thread ); + } + else + { + Seek( p_access, p_access->info.i_pos ); + vlc_object_lock( p_sys->p_keepalive_thread ); + p_sys->p_keepalive_thread->b_paused = false; + vlc_object_unlock( p_sys->p_keepalive_thread ); + } + break; + case ACCESS_GET_TITLE_INFO: case ACCESS_SET_TITLE: case ACCESS_SET_SEEKPOINT: case ACCESS_SET_PRIVATE_ID_STATE: + case ACCESS_GET_CONTENT_TYPE: return VLC_EGENERIC; @@ -333,7 +367,7 @@ static int Seek( access_t * p_access, int64_t i_pos ) 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 "I64Fd " (packet:%d)", i_pos, i_packet ); + msg_Dbg( p_access, "seeking to %"PRId64 " (packet:%d)", i_pos, i_packet ); MMSStop( p_access ); msg_Dbg( p_access, "stream stopped (seek)" ); @@ -355,9 +389,14 @@ static int Seek( access_t * p_access, int64_t i_pos ) var_buffer_free( &buffer ); - while( !p_access->b_die ) + while( vlc_object_alive (p_access) ) { - mms_HeaderMediaRead( p_access, MMS_PACKET_CMD ); + if( mms_HeaderMediaRead( p_access, MMS_PACKET_CMD ) < 0 ) + { + p_access->info.b_eof = true; + return VLC_EGENERIC; + } + if( p_sys->i_command == 0x1e ) { msg_Dbg( p_access, "received 0x1e (seek)" ); @@ -365,9 +404,13 @@ static int Seek( access_t * p_access, int64_t i_pos ) } } - while( !p_access->b_die ) + while( vlc_object_alive (p_access) ) { - mms_HeaderMediaRead( p_access, MMS_PACKET_CMD ); + if( mms_HeaderMediaRead( p_access, MMS_PACKET_CMD ) < 0 ) + { + p_access->info.b_eof = true; + return VLC_EGENERIC; + } if( p_sys->i_command == 0x05 ) { msg_Dbg( p_access, "received 0x05 (seek)" ); @@ -376,12 +419,17 @@ static int Seek( access_t * p_access, int64_t i_pos ) } /* get a packet */ - mms_HeaderMediaRead( p_access, MMS_PACKET_MEDIA ); + if( mms_HeaderMediaRead( p_access, MMS_PACKET_MEDIA ) < 0 ) + { + p_access->info.b_eof = true; + return VLC_EGENERIC; + } + msg_Dbg( p_access, "Streaming restarted" ); p_sys->i_media_used += i_offset; p_access->info.i_pos = i_pos; - p_access->info.b_eof = VLC_FALSE; + p_access->info.b_eof = false; return VLC_SUCCESS; } @@ -389,16 +437,21 @@ static int Seek( access_t * p_access, int64_t i_pos ) /***************************************************************************** * Read: *****************************************************************************/ -static int Read( access_t *p_access, uint8_t *p_buffer, int i_len ) +static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len ) { access_sys_t *p_sys = p_access->p_sys; size_t i_data; size_t i_copy; + if( p_access->info.b_eof ) + { + return 0; + } + i_data = 0; /* *** now send data if needed *** */ - while( i_data < (size_t)i_len ) + while( i_data < i_len ) { if( p_access->info.i_pos < p_sys->i_header ) { @@ -455,6 +508,7 @@ static int MMSOpen( access_t *p_access, vlc_url_t *p_url, int i_proto ) int i; int i_streams; int i_first; + char *mediapath; /* *** Open a TCP connection with server *** */ @@ -480,8 +534,8 @@ static int MMSOpen( access_t *p_access, vlc_url_t *p_url, int i_proto ) return VLC_EGENERIC; } - p_sys->i_handle_udp = net_OpenUDP( p_access, p_sys->sz_bind_addr, - 7000, "", 0 ); + p_sys->i_handle_udp = net_ListenUDP1( (vlc_object_t *)p_access, p_sys->sz_bind_addr, + 7000 ); if( p_sys->i_handle_udp < 0 ) { msg_Err( p_access, "failed to open a connection (udp)" ); @@ -494,7 +548,7 @@ static int MMSOpen( access_t *p_access, vlc_url_t *p_url, int i_proto ) } /* *** 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 ) ); @@ -515,7 +569,7 @@ static int MMSOpen( access_t *p_access, vlc_url_t *p_url, int i_proto ) p_sys->i_buffer_udp = 0; p_sys->p_cmd = NULL; p_sys->i_cmd = 0; - p_access->info.b_eof = 0; + p_access->info.b_eof = false; /* *** send command 1 : connection request *** */ var_buffer_initwrite( &buffer, 0 ); @@ -615,7 +669,14 @@ static int MMSOpen( access_t *p_access, vlc_url_t *p_url, int i_proto ) /* *** 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, @@ -650,10 +711,10 @@ static int MMSOpen( access_t *p_access, vlc_url_t *p_url, int i_proto ) switch( GetDWLE( p_sys->p_cmd + MMS_CMD_HEADERSIZE ) ) { case 0x0001: - msg_Dbg( p_access, "Media file name/path accepted" ); + msg_Dbg( p_access, "media file name/path accepted" ); break; case 0x0002: - msg_Dbg( p_access, "Authentication accepted" ); + msg_Dbg( p_access, "authentication accepted" ); break; case -1: default: @@ -678,10 +739,12 @@ static int MMSOpen( access_t *p_access, vlc_url_t *p_url, int i_proto ) GetDWLE( p_sys->p_cmd + MMS_CMD_HEADERSIZE + 60 ); msg_Dbg( p_access, - "answer 0x06 flags:0x%8.8x media_length:%us packet_length:%u packet_count:%u max_bit_rate:%d header_size:%d", + "answer 0x06 flags:0x%8.8x media_length:%us " + "packet_length:%ul packet_count:%d max_bit_rate:%d " + "header_size:%d", p_sys->i_flags_broadcast, p_sys->i_media_length, - p_sys->i_packet_length, + (unsigned)p_sys->i_packet_length, p_sys->i_packet_count, p_sys->i_max_bit_rate, p_sys->i_header_size ); @@ -747,9 +810,9 @@ static int MMSOpen( access_t *p_access, vlc_url_t *p_url, int i_proto ) * * 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" ), @@ -862,14 +925,15 @@ static int MMSStart( access_t *p_access, uint32_t i_packet ) msg_Err( p_access, "unknown answer (0x%x instead of 0x05)", p_sys->i_command ); - return( -1 ); + return -1; } else { /* get a packet */ - mms_HeaderMediaRead( p_access, MMS_PACKET_MEDIA ); - msg_Dbg( p_access, "Streaming started" ); - return( 0 ); + if( mms_HeaderMediaRead( p_access, MMS_PACKET_MEDIA ) < 0 ) + return -1; + msg_Dbg( p_access, "streaming started" ); + return 0; } } @@ -912,14 +976,14 @@ static void MMSClose( access_t *p_access ) net_Close( p_sys->i_handle_udp ); } - FREE( p_sys->p_cmd ); - FREE( p_sys->p_media ); - FREE( p_sys->p_header ); + FREENULL( p_sys->p_cmd ); + FREENULL( p_sys->p_media ); + FREENULL( p_sys->p_header ); - FREE( p_sys->psz_server_version ); - FREE( p_sys->psz_tool_version ); - FREE( p_sys->psz_update_player_url ); - FREE( p_sys->psz_encryption_type ); + FREENULL( p_sys->psz_server_version ); + FREENULL( p_sys->psz_tool_version ); + FREENULL( p_sys->psz_update_player_url ); + FREENULL( p_sys->psz_encryption_type ); } /**************************************************************************** @@ -965,8 +1029,10 @@ static int mms_CommandSend( access_t *p_access, int i_command, 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" ); @@ -984,14 +1050,13 @@ static int NetFillBuffer( access_t *p_access ) #else access_sys_t *p_sys = p_access->p_sys; - struct timeval timeout; - fd_set fds_r, fds_e; int i_ret; + struct pollfd ufd[2]; + unsigned timeout, nfd; /* FIXME when using udp */ ssize_t i_tcp, i_udp; ssize_t i_tcp_read, i_udp_read; - int i_handle_max; int i_try = 0; i_tcp = MMS_BUFFER_SIZE/2 - p_sys->i_buffer_tcp; @@ -1005,14 +1070,7 @@ static int NetFillBuffer( access_t *p_access ) i_udp = 0; /* there isn't udp socket */ } - i_handle_max = 0; - - if( i_tcp > 0 ) - i_handle_max = __MAX( i_handle_max, p_sys->i_handle_tcp ); - if( i_udp > 0 ) - i_handle_max = __MAX( i_handle_max, p_sys->i_handle_udp ); - - if( i_handle_max == 0 ) + if( ( i_udp <= 0 ) && ( i_tcp <= 0 ) ) { msg_Warn( p_access, "nothing to read %d:%d", (int)i_tcp, (int)i_udp ); return 0; @@ -1028,45 +1086,52 @@ static int NetFillBuffer( access_t *p_access ) i_try++; /* Initialize file descriptor set */ - FD_ZERO( &fds_r ); - FD_ZERO( &fds_e ); + memset (ufd, 0, sizeof (ufd)); + nfd = 0; if( i_tcp > 0 ) { - FD_SET( p_sys->i_handle_tcp, &fds_r ); - FD_SET( p_sys->i_handle_tcp, &fds_e ); + ufd[nfd].fd = p_sys->i_handle_tcp; + ufd[nfd].events = POLLIN; + nfd++; } if( i_udp > 0 ) { - FD_SET( p_sys->i_handle_udp, &fds_r ); - FD_SET( p_sys->i_handle_udp, &fds_e ); + ufd[nfd].fd = p_sys->i_handle_tcp; + ufd[nfd].events = POLLIN; + nfd++; } /* We'll wait 0.5 second if nothing happens */ - timeout.tv_sec = 0; - timeout.tv_usec = 500000; + timeout = 500; + + if( i_try * timeout > p_sys->i_timeout ) + { + msg_Err(p_access, "no data received"); + return -1; + } if( i_try > 3 && (p_sys->i_buffer_tcp > 0 || p_sys->i_buffer_udp > 0) ) { 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)" ); - } while( !(i_ret = select(i_handle_max +1, &fds_r, 0, &fds_e, &timeout)) || + } while( !(i_ret = poll( ufd, nfd, timeout)) || (i_ret < 0 && errno == EINTR) ); if( i_ret < 0 ) { - msg_Err( p_access, "network select error (%s)", strerror(errno) ); + msg_Err( p_access, "network poll error (%m)" ); return -1; } i_tcp_read = i_udp_read = 0; - if( i_tcp > 0 && FD_ISSET( p_sys->i_handle_tcp, &fds_r ) ) + if( ( i_tcp > 0 ) && ufd[0].revents ) { i_tcp_read = recv( p_sys->i_handle_tcp, @@ -1074,14 +1139,14 @@ static int NetFillBuffer( access_t *p_access ) i_tcp + MMS_BUFFER_SIZE/2, 0 ); } - if( i_udp > 0 && FD_ISSET( p_sys->i_handle_udp, &fds_r ) ) + if( i_udp > 0 && ufd[i_tcp > 0].revents ) { i_udp_read = recv( p_sys->i_handle_udp, p_sys->buffer_udp + p_sys->i_buffer_udp, i_udp + MMS_BUFFER_SIZE/2, 0 ); } -#if MMS_DEBUG +#ifdef MMS_DEBUG if( p_sys->i_proto == MMS_PROTO_UDP ) { msg_Dbg( p_access, "filling buffer TCP:%d+%d UDP:%d+%d", @@ -1116,10 +1181,7 @@ static int mms_ParseCommand( access_t *p_access, int i_length; uint32_t i_id; - if( p_sys->p_cmd ) - { - free( p_sys->p_cmd ); - } + free( p_sys->p_cmd ); p_sys->i_cmd = i_data; p_sys->p_cmd = malloc( i_data ); memcpy( p_sys->p_cmd, p_data, i_data ); @@ -1236,14 +1298,15 @@ static int mms_ParsePacket( access_t *p_access, if( i_packet_seq_num != p_sys->i_packet_seq_num ) { +#if 0 /* FIXME for udp could be just wrong order ? */ msg_Warn( p_access, "detected packet lost (%d != %d)", i_packet_seq_num, p_sys->i_packet_seq_num ); - p_sys->i_packet_seq_num = i_packet_seq_num; +#endif } - p_sys->i_packet_seq_num++; + p_sys->i_packet_seq_num = i_packet_seq_num + 1; if( i_packet_id == p_sys->i_header_packet_id_type ) { @@ -1271,7 +1334,7 @@ static int mms_ParsePacket( access_t *p_access, } else { - FREE( p_sys->p_media ); + FREENULL( p_sys->p_media ); p_sys->p_media = p_packet; p_sys->i_media = i_packet_length - 8; p_sys->i_media_used = 0; @@ -1291,7 +1354,7 @@ static int mms_ReceivePacket( access_t *p_access ) for( ;; ) { - vlc_bool_t b_refill = VLC_TRUE; + bool b_refill = true; /* first if we need to refill buffer */ if( p_sys->i_buffer_tcp >= MMS_CMD_HEADERSIZE ) @@ -1301,18 +1364,18 @@ static int mms_ReceivePacket( access_t *p_access ) if( GetDWLE( p_sys->buffer_tcp + 8 ) + 16 <= (uint32_t)p_sys->i_buffer_tcp ) { - b_refill = VLC_FALSE; + b_refill = false; } } else if( GetWLE( p_sys->buffer_tcp + 6 ) <= p_sys->i_buffer_tcp ) { - b_refill = VLC_FALSE; + b_refill = false; } } if( p_sys->i_proto == MMS_PROTO_UDP && p_sys->i_buffer_udp >= 8 && GetWLE( p_sys->buffer_udp + 6 ) <= p_sys->i_buffer_udp ) { - b_refill = VLC_FALSE; + b_refill = false; } if( b_refill && NetFillBuffer( p_access ) < 0 ) @@ -1462,17 +1525,18 @@ static int mms_CommandRead( access_t *p_access, int i_command1, { case 0x03: msg_Warn( p_access, "socket closed by server" ); - p_access->info.b_eof = 1; + p_access->info.b_eof = true; return VLC_EGENERIC; case 0x1e: msg_Warn( p_access, "end of media stream" ); - p_access->info.b_eof = 1; + p_access->info.b_eof = true; return VLC_EGENERIC; default: break; } } } + p_access->info.b_eof = true; msg_Warn( p_access, "failed to receive command (aborting)" ); return VLC_EGENERIC; @@ -1488,7 +1552,7 @@ static int mms_HeaderMediaRead( access_t *p_access, int i_type ) { int i_status; - if( p_access->b_die ) + if( !vlc_object_alive (p_access) ) return -1; i_status = mms_ReceivePacket( p_access ); @@ -1509,11 +1573,11 @@ static int mms_HeaderMediaRead( access_t *p_access, int i_type ) { case 0x03: msg_Warn( p_access, "socket closed by server" ); - p_access->info.b_eof = 1; + p_access->info.b_eof = true; return -1; case 0x1e: msg_Warn( p_access, "end of media stream" ); - p_access->info.b_eof = 1; + p_access->info.b_eof = true; return -1; case 0x20: /* XXX not too dificult to be done EXCEPT that we @@ -1521,7 +1585,7 @@ static int mms_HeaderMediaRead( access_t *p_access, int i_type ) * could do that :p */ msg_Err( p_access, "reinitialization needed --> unsupported" ); - p_access->info.b_eof = VLC_TRUE; + p_access->info.b_eof = true; return -1; default: break; @@ -1531,6 +1595,27 @@ static int mms_HeaderMediaRead( access_t *p_access, int i_type ) msg_Err( p_access, "cannot receive %s (aborting)", ( i_type == MMS_PACKET_HEADER ) ? "header" : "media data" ); + p_access->info.b_eof = true; return -1; } +static void KeepAliveThread( vlc_object_t *p_this ) +{ + mmstu_keepalive_thread_t *p_thread = (mmstu_keepalive_thread_t *) p_this; + access_t *p_access = p_thread->p_access; + bool b_paused; + bool b_was_paused = false; + + vlc_object_lock( p_thread ); + while( vlc_object_alive( p_thread) ) + { + b_paused = p_thread->b_paused; + + if( b_paused && b_was_paused ) + mms_CommandSend( p_access, 0x1b, 0, 0, NULL, 0 ); + + b_was_paused = b_paused; + vlc_object_timedwait( p_thread, mdate() + 10000000 ); + } + vlc_object_unlock( p_thread ); +}