X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fmms%2Fmmsh.c;h=fe31cc4f6265a51e4cd2fdb21fb17ec99e797347;hb=6bf374569a1dd0ffcb624d7e35f032e424c07b14;hp=9768ca73c20b4b96735d6058250ca879ceaa9a0f;hpb=dfa1e4834cd99c2477bccb0a01b231eb16528ca2;p=vlc diff --git a/modules/access/mms/mmsh.c b/modules/access/mms/mmsh.c index 9768ca73c2..fe31cc4f62 100644 --- a/modules/access/mms/mmsh.c +++ b/modules/access/mms/mmsh.c @@ -1,8 +1,8 @@ /***************************************************************************** * mmsh.c: ***************************************************************************** - * Copyright (C) 2001, 2002 VideoLAN - * $Id: mmsh.c,v 1.8 2004/01/26 16:30:34 fenrir Exp $ + * Copyright (C) 2001, 2002 the VideoLAN team + * $Id$ * * Authors: Laurent Aimar * @@ -18,279 +18,185 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -/* - * TODO: - * * http_proxy - * - */ - /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include +#include +#include -#include "network.h" +#include +#include #include "asf.h" #include "buffer.h" #include "mms.h" #include "mmsh.h" +/* TODO: + * - authentication + */ + /***************************************************************************** * Local prototypes *****************************************************************************/ -int E_(MMSHOpen) ( input_thread_t * ); -void E_(MMSHClose) ( input_thread_t * ); -static ssize_t Read( input_thread_t *, byte_t *, size_t ); -static void Seek( input_thread_t *, off_t ); +int MMSHOpen ( access_t * ); +void MMSHClose ( access_t * ); + +static block_t *Block( access_t *p_access ); +static ssize_t ReadRedirect( access_t *, uint8_t *, size_t ); +static int Seek( access_t *, uint64_t ); +static int Control( access_t *, int, va_list ); -static ssize_t NetFill( input_thread_t *, access_sys_t *, int ); +static int Describe( access_t *, char **ppsz_location ); +static int Start( access_t *, uint64_t ); +static void Stop( access_t * ); -static int mmsh_start ( input_thread_t *, off_t ); -static void mmsh_stop ( input_thread_t * ); -static int mmsh_get_packet( input_thread_t *, chunk_t * ); +static int GetPacket( access_t *, chunk_t * ); +static void GetHeader( access_t *p_access ); -static http_answer_t *http_answer_parse( uint8_t *, int ); -static void http_answer_free ( http_answer_t * ); -static http_field_t *http_field_find ( http_field_t *, char * ); +static int Restart( access_t * ); +static int Reset( access_t * ); -static int chunk_parse( chunk_t *, uint8_t *, int ); +//#define MMSH_USER_AGENT "NSPlayer/4.1.0.3856" +#define MMSH_USER_AGENT "NSPlayer/7.10.0.3059" /**************************************************************************** * Open: connect to ftp server and ask for file ****************************************************************************/ -int E_( MMSHOpen ) ( input_thread_t *p_input ) +int MMSHOpen( access_t *p_access ) { access_sys_t *p_sys; + char *psz_location = NULL; + char *psz_proxy; - uint8_t *p; - http_answer_t *p_ans; - http_field_t *p_field; - chunk_t ck; + STANDARD_BLOCK_ACCESS_INIT - vlc_value_t val; + p_sys->i_proto= MMS_PROTO_HTTP; + p_sys->fd = -1; - /* init p_sys */ - p_input->p_access_data = p_sys = malloc( sizeof( access_sys_t ) ); - p_sys->i_proto = MMS_PROTO_HTTP; + /* Handle proxy */ + p_sys->b_proxy = false; + memset( &p_sys->proxy, 0, sizeof(p_sys->proxy) ); - p_sys->fd = -1; - p_sys->i_request_context = 1; - p_sys->i_buffer = 0; - p_sys->i_buffer_pos = 0; - p_sys->b_broadcast = VLC_TRUE; - p_sys->p_packet = NULL; - p_sys->i_packet_sequence = 0; - p_sys->i_packet_used = 0; - p_sys->i_packet_length = 0; - p_sys->i_pos = 0; - p_sys->i_request_context = 1; - E_( GenerateGuid )( &p_sys->guid ); - - /* open a tcp connection */ - p_sys->p_url = E_( url_new )( p_input->psz_name ); - - if( *p_sys->p_url->psz_host == '\0' ) + /* Check proxy */ + /* TODO reuse instead http-proxy from http access ? */ + psz_proxy = var_CreateGetNonEmptyString( p_access, "mmsh-proxy" ); + if( !psz_proxy ) { - msg_Err( p_input, "invalid server addresse" ); - goto exit_error; - } - if( p_sys->p_url->i_port <= 0 ) - { - p_sys->p_url->i_port = 80; + char *psz_http_proxy = var_InheritString( p_access, "http-proxy" ); + if( psz_http_proxy ) + { + psz_proxy = psz_http_proxy; + var_SetString( p_access, "mmsh-proxy", psz_proxy ); + } } - if( ( p_sys->fd = net_OpenTCP( p_input, p_sys->p_url->psz_host, - p_sys->p_url->i_port ) ) < 0 ) + if( psz_proxy ) { - msg_Err( p_input, "cannot connect" ); - goto exit_error; + p_sys->b_proxy = true; + vlc_UrlParse( &p_sys->proxy, psz_proxy, 0 ); + free( psz_proxy ); } - - /* *** send first request *** */ - p = &p_sys->buffer[0]; - p += sprintf( p, "GET %s HTTP/1.0\r\n", p_sys->p_url->psz_path ); - p += sprintf( p,"Accept: */*\r\n" ); - p += sprintf( p, "User-Agent: NSPlayer/4.1.0.3856\r\n" ); - p += sprintf( p, "Host: %s:%d\r\n", - p_sys->p_url->psz_host, p_sys->p_url->i_port ); - p += sprintf( p, "Pragma: no-cache,rate=1.000000,stream-time=0,stream-offset=0:0,request-context=%d,max-duration=0\r\n", - p_sys->i_request_context++ ); - p += sprintf( p, "Pragma: xClientGUID={"GUID_FMT"}\r\n", - GUID_PRINT( p_sys->guid ) ); - p += sprintf( p, "Connection: Close\r\n\r\n" ); - - net_Write( p_input, p_sys->fd, p_sys->buffer, p - p_sys->buffer ); - - if( NetFill ( p_input, p_sys, BUFFER_SIZE ) <= 0 ) +#ifdef HAVE_GETENV + else { - msg_Err( p_input, "cannot read answer" ); - goto exit_error; + const char *http_proxy = getenv( "http_proxy" ); + if( http_proxy ) + { + p_sys->b_proxy = true; + vlc_UrlParse( &p_sys->proxy, http_proxy, 0 ); + } } - net_Close( p_sys->fd ); p_sys->fd = -1; +#endif - p_ans = http_answer_parse( p_sys->buffer, p_sys->i_buffer ); - if( !p_ans ) + if( p_sys->b_proxy ) { - msg_Err( p_input, "cannot parse answer" ); - goto exit_error; - } + if( ( p_sys->proxy.psz_host == NULL ) || + ( *p_sys->proxy.psz_host == '\0' ) ) + { + msg_Warn( p_access, "invalid proxy host" ); + vlc_UrlClean( &p_sys->proxy ); + free( p_sys ); + return VLC_EGENERIC; + } - if( p_ans->i_error >= 400 ) - { - msg_Err( p_input, "error %d (server return=`%s')", - p_ans->i_error, p_ans->psz_answer ); - http_answer_free( p_ans ); - goto exit_error; - } - else if( p_ans->i_error >= 300 ) - { - msg_Err( p_input, "FIXME redirect unsuported %d (server return=`%s')", - p_ans->i_error, p_ans->psz_answer ); - http_answer_free( p_ans ); - goto exit_error; - } - else if( p_ans->i_body <= 0 ) - { - msg_Err( p_input, "empty answer" ); - http_answer_free( p_ans ); - goto exit_error; + if( p_sys->proxy.i_port <= 0 ) + p_sys->proxy.i_port = 80; + msg_Dbg( p_access, "Using http proxy %s:%d", + p_sys->proxy.psz_host, p_sys->proxy.i_port ); } - /* now get features */ - /* FIXME FIXME test Content-Type to see if it's a plain stream or an - * asx FIXME */ - for( p_field = p_ans->p_fields; - p_field != NULL; - p_field = http_field_find( p_field->p_next, "Pragma" ) ) + /* open a tcp connection */ + vlc_UrlParse( &p_sys->url, p_access->psz_path, 0 ); + if( ( p_sys->url.psz_host == NULL ) || + ( *p_sys->url.psz_host == '\0' ) ) { - if( !strncasecmp( p_field->psz_value, "features", 8 ) ) - { - if( strstr( p_field->psz_value, "broadcast" ) ) - { - msg_Dbg( p_input, "stream type = broadcast" ); - p_sys->b_broadcast = VLC_TRUE; - } - else if( strstr( p_field->psz_value, "seekable" ) ) - { - msg_Dbg( p_input, "stream type = seekable" ); - p_sys->b_broadcast = VLC_FALSE; - } - else - { - msg_Warn( p_input, "unknow stream types (%s)", - p_field->psz_value ); - p_sys->b_broadcast = VLC_FALSE; - } - } + msg_Err( p_access, "invalid host" ); + goto error; } + if( p_sys->url.i_port <= 0 ) + p_sys->url.i_port = 80; - /* gather header */ - p_sys->i_header = 0; - p_sys->p_header = malloc( p_ans->i_body ); - do + if( Describe( p_access, &psz_location ) ) + goto error; + + /* Handle redirection */ + if( psz_location && *psz_location ) { - if( chunk_parse( &ck, p_ans->p_body, p_ans->i_body ) ) - { - msg_Err( p_input, "invalid chunk answer" ); - goto exit_error; - } - if( ck.i_type != 0x4824 ) - { - msg_Err( p_input, "invalid chunk (0x%x)", ck.i_type ); - break; - } - if( ck.i_data > 0 ) - { - memcpy( &p_sys->p_header[p_sys->i_header], - ck.p_data, - ck.i_data ); + msg_Dbg( p_access, "redirection to %s", psz_location ); - p_sys->i_header += ck.i_data; - } + input_thread_t * p_input = access_GetParentInput( p_access ); + input_item_t * p_new_loc; - /* BEURK */ - p_ans->p_body += 12 + ck.i_data; - p_ans->i_body -= 12 + ck.i_data; + if( !p_input ) + { + free( psz_location ); + goto error; + } + /** \bug we do not autodelete here */ + p_new_loc = input_item_New( p_access, psz_location, psz_location ); + input_item_t *p_item = input_GetItem( p_input ); + input_item_PostSubItem( p_item, p_new_loc ); - } while( p_ans->i_body > 12 ); + vlc_gc_decref( p_new_loc ); + vlc_object_release( p_input ); - http_answer_free( p_ans ); + free( psz_location ); - msg_Dbg( p_input, "complete header size=%d", p_sys->i_header ); - if( p_sys->i_header <= 0 ) - { - msg_Err( p_input, "header size == 0" ); - goto exit_error; + p_access->pf_block = NULL; + p_access->pf_read = ReadRedirect; + return VLC_SUCCESS; } - /* *** parse header and get stream and their id *** */ - /* get all streams properties, - * - * TODO : stream bitrates properties(optional) - * and bitrate mutual exclusion(optional) */ - E_( asf_HeaderParse )( &p_sys->asfh, - p_sys->p_header, p_sys->i_header ); - msg_Dbg( p_input, "packet count=%lld packet size=%d", - p_sys->asfh.i_data_packets_count, - p_sys->asfh.i_min_data_packet_size ); - - E_( asf_StreamSelect)( &p_sys->asfh, - config_GetInt( p_input, "mms-maxbitrate" ), - config_GetInt( p_input, "mms-all" ), - config_GetInt( p_input, "audio" ), - config_GetInt( p_input, "video" ) ); + free( psz_location ); - if( mmsh_start( p_input, 0 ) ) + /* Start playing */ + if( Start( p_access, 0 ) ) { - msg_Err( p_input, "cannot start stream" ); - goto exit_error; + msg_Err( p_access, "cannot start stream" ); + free( p_sys->p_header ); + goto error; } - /* *** set exported functions *** */ - p_input->pf_read = Read; - p_input->pf_seek = Seek; - p_input->pf_set_program = input_SetProgram; - p_input->pf_set_area = NULL; - - p_input->p_private = NULL; - p_input->i_mtu = 3 * p_sys->asfh.i_min_data_packet_size; - - /* *** finished to set some variable *** */ - vlc_mutex_lock( &p_input->stream.stream_lock ); - p_input->stream.b_pace_control = 0; - if( p_sys->b_broadcast ) - { - p_input->stream.p_selected_area->i_size = 0; - p_input->stream.b_seekable = 0; - } - else + if( !p_sys->b_broadcast ) { - p_input->stream.p_selected_area->i_size = p_sys->asfh.i_file_size; - p_input->stream.b_seekable = 1; + p_access->info.i_size = p_sys->asfh.i_file_size; } - p_input->stream.p_selected_area->i_tell = 0; - p_input->stream.i_method = INPUT_METHOD_NETWORK; - vlc_mutex_unlock( &p_input->stream.stream_lock ); - - /* Update default_pts to a suitable value for mms access */ - var_Get( p_input, "mms-caching", &val ); - p_input->i_pts_delay = val.i_int * 1000; return VLC_SUCCESS; -exit_error: - E_( url_free )( p_sys->p_url ); - - if( p_sys->fd > 0 ) - { - net_Close( p_sys->fd ); - } +error: + vlc_UrlClean( &p_sys->proxy ); + vlc_UrlClean( &p_sys->url ); free( p_sys ); return VLC_EGENERIC; } @@ -298,563 +204,770 @@ exit_error: /***************************************************************************** * Close: free unused data structures *****************************************************************************/ -void E_( MMSHClose ) ( input_thread_t *p_input ) +void MMSHClose ( access_t *p_access ) { - access_sys_t *p_sys = p_input->p_access_data; + access_sys_t *p_sys = p_access->p_sys; - msg_Dbg( p_input, "stopping stream" ); + Stop( p_access ); - mmsh_stop( p_input ); + free( p_sys->p_header ); + vlc_UrlClean( &p_sys->proxy ); + vlc_UrlClean( &p_sys->url ); free( p_sys ); } +/***************************************************************************** + * Control: + *****************************************************************************/ +static int Control( access_t *p_access, int i_query, va_list args ) +{ + access_sys_t *p_sys = p_access->p_sys; + bool *pb_bool; + bool b_bool; + int64_t *pi_64; + int i_int; + + switch( i_query ) + { + /* */ + case ACCESS_CAN_SEEK: + pb_bool = (bool*)va_arg( args, bool* ); + *pb_bool = !p_sys->b_broadcast; + break; + + case ACCESS_CAN_FASTSEEK: + pb_bool = (bool*)va_arg( args, bool* ); + *pb_bool = false; + break; + + case ACCESS_CAN_PAUSE: + case ACCESS_CAN_CONTROL_PACE: + pb_bool = (bool*)va_arg( args, bool* ); + *pb_bool = true; + break; + + /* */ + 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); + break; + + case ACCESS_GET_PRIVATE_ID_STATE: + i_int = (int)va_arg( args, int ); + 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 ? true : false; + break; + + /* */ + case ACCESS_SET_PAUSE_STATE: + b_bool = (bool)va_arg( args, int ); + if( b_bool ) + Stop( p_access ); + else + Seek( p_access, p_access->info.i_pos ); + 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; + + default: + msg_Warn( p_access, "unimplemented query in control" ); + return VLC_EGENERIC; + + } + return VLC_SUCCESS; +} + /***************************************************************************** * Seek: try to go at the right place *****************************************************************************/ -static void Seek( input_thread_t * p_input, off_t i_pos ) +static int Seek( access_t *p_access, uint64_t i_pos ) { - access_sys_t *p_sys = p_input->p_access_data; + access_sys_t *p_sys = p_access->p_sys; chunk_t ck; - off_t i_offset; - off_t i_packet; + uint64_t i_offset; + uint64_t i_packet; + + msg_Dbg( p_access, "seeking to %"PRId64, i_pos ); i_packet = ( i_pos - p_sys->i_header ) / p_sys->asfh.i_min_data_packet_size; i_offset = ( i_pos - p_sys->i_header ) % p_sys->asfh.i_min_data_packet_size; - msg_Dbg( p_input, "seeking to "I64Fd, i_pos ); - - vlc_mutex_lock( &p_input->stream.stream_lock ); - - mmsh_stop( p_input ); - mmsh_start( p_input, i_packet * p_sys->asfh.i_min_data_packet_size ); + Stop( p_access ); + Start( p_access, i_packet * p_sys->asfh.i_min_data_packet_size ); - for( ;; ) + while( vlc_object_alive (p_access) ) { - if( mmsh_get_packet( p_input, &ck ) ) - { + if( GetPacket( p_access, &ck ) ) break; - } /* skip headers */ if( ck.i_type != 0x4824 ) - { break; - } - msg_Warn( p_input, "skipping header" ); + + msg_Warn( p_access, "skipping header" ); } - p_sys->i_pos = i_pos; + p_access->info.i_pos = i_pos; + p_access->info.b_eof = false; p_sys->i_packet_used += i_offset; - p_input->stream.p_selected_area->i_tell = i_pos; - vlc_mutex_unlock( &p_input->stream.stream_lock ); + return VLC_SUCCESS; +} + +/***************************************************************************** + * ReadRedirect: + *****************************************************************************/ +static ssize_t ReadRedirect( access_t *p_access, uint8_t *p, size_t i_len ) +{ + VLC_UNUSED(p_access); VLC_UNUSED(p); VLC_UNUSED(i_len); + return 0; } /***************************************************************************** - * Read: + * Block: *****************************************************************************/ -static ssize_t Read ( input_thread_t * p_input, byte_t * p_buffer, - size_t i_len ) +static block_t *Block( access_t *p_access ) { - access_sys_t *p_sys = p_input->p_access_data; - size_t i_copy; - size_t i_data = 0; + access_sys_t *p_sys = p_access->p_sys; + const unsigned i_packet_min = p_sys->asfh.i_min_data_packet_size; - while( i_data < i_len ) + if( p_access->info.i_pos < p_sys->i_start + p_sys->i_header ) { + const size_t i_offset = p_access->info.i_pos - p_sys->i_start; + const size_t i_copy = p_sys->i_header - i_offset; + + block_t *p_block = block_New( p_access, i_copy ); + if( !p_block ) + return NULL; + + memcpy( p_block->p_buffer, &p_sys->p_header[i_offset], i_copy ); + p_access->info.i_pos += i_copy; + return p_block; + } + else if( p_sys->i_packet_length > 0 && + p_sys->i_packet_used < __MAX( p_sys->i_packet_length, i_packet_min ) ) + { + size_t i_copy = 0; + size_t i_padding = 0; + if( p_sys->i_packet_used < p_sys->i_packet_length ) - { - i_copy = __MIN( p_sys->i_packet_length - p_sys->i_packet_used, - i_len - i_data ); + i_copy = p_sys->i_packet_length - p_sys->i_packet_used; + if( __MAX( p_sys->i_packet_used, p_sys->i_packet_length ) < i_packet_min ) + i_padding = i_packet_min - __MAX( p_sys->i_packet_used, p_sys->i_packet_length ); - memcpy( &p_buffer[i_data], - &p_sys->p_packet[p_sys->i_packet_used], - i_copy ); + block_t *p_block = block_New( p_access, i_copy + i_padding ); + if( !p_block ) + return NULL; - i_data += i_copy; - p_sys->i_packet_used += i_copy; - } - else if( p_sys->i_pos + i_data > p_sys->i_header && - (int)p_sys->i_packet_used < p_sys->asfh.i_min_data_packet_size ) - { - i_copy = __MIN( p_sys->asfh.i_min_data_packet_size - p_sys->i_packet_used, - i_len - i_data ); + if( i_copy > 0 ) + memcpy( &p_block->p_buffer[0], &p_sys->p_packet[p_sys->i_packet_used], i_copy ); + if( i_padding > 0 ) + memset( &p_block->p_buffer[i_copy], 0, i_padding ); + + p_sys->i_packet_used += i_copy + i_padding; + p_access->info.i_pos += i_copy + i_padding; + return p_block; - memset( &p_buffer[i_data], 0, i_copy ); + } - i_data += i_copy; - p_sys->i_packet_used += i_copy; + chunk_t ck; + if( GetPacket( p_access, &ck ) ) + { + int i_ret = -1; + if( p_sys->b_broadcast ) + { + if( (ck.i_type == 0x4524) && (ck.i_sequence != 0) ) + i_ret = Restart( p_access ); + else if( ck.i_type == 0x4324 ) + i_ret = Reset( p_access ); } - else + if( i_ret ) { - chunk_t ck; - /* get a new packet */ - /* fill enought data (>12) */ - msg_Dbg( p_input, "waiting data (buffer = %d bytes)", - p_sys->i_buffer ); - - if( mmsh_get_packet( p_input, &ck ) ) - { - return 0; - } + p_access->info.b_eof = true; + return 0; } } + if( ck.i_type != 0x4424 ) + { + p_sys->i_packet_used = 0; + p_sys->i_packet_length = 0; + } - p_sys->i_pos += i_data; - - return( i_data ); + return NULL; } -/***************************************************************************** - * NetFill: - *****************************************************************************/ -static ssize_t NetFill( input_thread_t *p_input, access_sys_t *p_sys, int i_size ) +/* */ +static int Restart( access_t *p_access ) { - int i_try = 0; - int i_total = 0; + access_sys_t *p_sys = p_access->p_sys; + char *psz_location = NULL; + + msg_Dbg( p_access, "Restart the stream" ); + p_sys->i_start = p_access->info.i_pos; + + /* */ + msg_Dbg( p_access, "stoping the stream" ); + Stop( p_access ); - i_size = __MIN( i_size, BUFFER_SIZE - p_sys->i_buffer ); - if( i_size <= 0 ) + /* */ + msg_Dbg( p_access, "describe the stream" ); + if( Describe( p_access, &psz_location ) ) { - return 0; + msg_Err( p_access, "describe failed" ); + return VLC_EGENERIC; } + free( psz_location ); - for( ;; ) + /* */ + if( Start( p_access, 0 ) ) { - int i_read; + msg_Err( p_access, "Start failed" ); + return VLC_EGENERIC; + } + return VLC_SUCCESS; +} +static int Reset( access_t *p_access ) +{ + access_sys_t *p_sys = p_access->p_sys; + asf_header_t old_asfh = p_sys->asfh; + int i; - i_read = net_Read( p_input, p_sys->fd, - &p_sys->buffer[p_sys->i_buffer], i_size, VLC_FALSE ); + msg_Dbg( p_access, "Reset the stream" ); + p_sys->i_start = p_access->info.i_pos; - if( i_read == 0 ) - { - if( i_try++ > 2 ) - { - break; - } - msg_Dbg( p_input, "another try %d/2", i_try ); - continue; - } + /* */ + p_sys->i_packet_sequence = 0; + p_sys->i_packet_used = 0; + p_sys->i_packet_length = 0; + p_sys->p_packet = NULL; - if( i_read < 0 || p_input->b_die || p_input->b_error ) - { - break; - } - i_total += i_read; + /* Get the next header FIXME memory loss ? */ + GetHeader( p_access ); + if( p_sys->i_header <= 0 ) + return VLC_EGENERIC; - p_sys->i_buffer += i_read; - if( i_total >= i_size ) - { + asf_HeaderParse ( &p_sys->asfh, + p_sys->p_header, p_sys->i_header ); + msg_Dbg( p_access, "packet count=%"PRId64" packet size=%d", + p_sys->asfh.i_data_packets_count, + p_sys->asfh.i_min_data_packet_size ); + + asf_StreamSelect( &p_sys->asfh, + var_CreateGetInteger( p_access, "mms-maxbitrate" ), + var_CreateGetBool( p_access, "mms-all" ), + var_CreateGetInteger( p_access, "audio" ), + var_CreateGetInteger( p_access, "video" ) ); + + /* Check we have comptible asfh */ + for( i = 1; i < 128; i++ ) + { + asf_stream_t *p_old = &old_asfh.stream[i]; + asf_stream_t *p_new = &p_sys->asfh.stream[i]; + + if( p_old->i_cat != p_new->i_cat || p_old->i_selected != p_new->i_selected ) break; - } + } + if( i < 128 ) + { + msg_Warn( p_access, "incompatible asf header, restart" ); + return Restart( p_access ); } - p_sys->buffer[p_sys->i_buffer] = '\0'; - - return i_total; + /* */ + p_sys->i_packet_used = 0; + p_sys->i_packet_length = 0; + return VLC_SUCCESS; } - -/***************************************************************************** - * - *****************************************************************************/ -static int mmsh_start( input_thread_t *p_input, off_t i_pos ) +static int OpenConnection( access_t *p_access ) { - access_sys_t *p_sys = p_input->p_access_data; - uint8_t *p; - int i_streams = 0; - int i; - http_answer_t *p_ans; + access_sys_t *p_sys = p_access->p_sys; + vlc_url_t srv = p_sys->b_proxy ? p_sys->proxy : p_sys->url; - msg_Dbg( p_input, "starting stream" ); - - if( ( p_sys->fd = net_OpenTCP( p_input, p_sys->p_url->psz_host, - p_sys->p_url->i_port ) ) < 0 ) + if( ( p_sys->fd = net_ConnectTCP( p_access, + srv.psz_host, srv.i_port ) ) < 0 ) { - /* should not occur */ - msg_Err( p_input, "cannot connect to the server" ); + msg_Err( p_access, "cannot connect to %s:%d", + srv.psz_host, srv.i_port ); return VLC_EGENERIC; } - for( i = 1; i < 128; i++ ) + if( p_sys->b_proxy ) { - if( p_sys->asfh.stream[i].i_selected ) + net_Printf( p_access, p_sys->fd, NULL, + "GET http://%s:%d%s HTTP/1.0\r\n", + p_sys->url.psz_host, p_sys->url.i_port, + ( (p_sys->url.psz_path == NULL) || + (*p_sys->url.psz_path == '\0') ) ? + "/" : p_sys->url.psz_path ); + + /* Proxy Authentication */ + if( p_sys->proxy.psz_username && *p_sys->proxy.psz_username ) { - i_streams++; + char *buf; + char *b64; + + if( asprintf( &buf, "%s:%s", p_sys->proxy.psz_username, + p_sys->proxy.psz_password ? p_sys->proxy.psz_password : "" ) == -1 ) + return VLC_ENOMEM; + + b64 = vlc_b64_encode( buf ); + free( buf ); + + net_Printf( p_access, p_sys->fd, NULL, + "Proxy-Authorization: Basic %s\r\n", b64 ); + free( b64 ); } } - - if( i_streams <= 0 ) + else { - msg_Err( p_input, "no stream selected" ); + net_Printf( p_access, p_sys->fd, NULL, + "GET %s HTTP/1.0\r\n" + "Host: %s:%d\r\n", + ( (p_sys->url.psz_path == NULL) || + (*p_sys->url.psz_path == '\0') ) ? + "/" : p_sys->url.psz_path, + p_sys->url.psz_host, p_sys->url.i_port ); + } + return VLC_SUCCESS; +} + +/***************************************************************************** + * Describe: + *****************************************************************************/ +static int Describe( access_t *p_access, char **ppsz_location ) +{ + access_sys_t *p_sys = p_access->p_sys; + char *psz_location = NULL; + char *psz; + int i_code; + + /* Reinit context */ + p_sys->b_broadcast = true; + p_sys->i_request_context = 1; + p_sys->i_packet_sequence = 0; + p_sys->i_packet_used = 0; + p_sys->i_packet_length = 0; + p_sys->p_packet = NULL; + + GenerateGuid ( &p_sys->guid ); + + if( OpenConnection( p_access ) ) return VLC_EGENERIC; + + net_Printf( p_access, p_sys->fd, NULL, + "Accept: */*\r\n" + "User-Agent: "MMSH_USER_AGENT"\r\n" + "Pragma: no-cache,rate=1.000000,stream-time=0,stream-offset=0:0,request-context=%d,max-duration=0\r\n" + "Pragma: xClientGUID={"GUID_FMT"}\r\n" + "Connection: Close\r\n", + p_sys->i_request_context++, + GUID_PRINT( p_sys->guid ) ); + + if( net_Printf( p_access, p_sys->fd, NULL, "\r\n" ) < 0 ) + { + msg_Err( p_access, "failed to send request" ); + goto error; } - p = &p_sys->buffer[0]; - p += sprintf( p, "GET %s HTTP/1.0\r\n", p_sys->p_url->psz_path ); - p += sprintf( p,"Accept: */*\r\n" ); - p += sprintf( p, "User-Agent: NSPlayer/4.1.0.3856\r\n" ); - p += sprintf( p, "Host: %s:%d\r\n", - p_sys->p_url->psz_host, p_sys->p_url->i_port ); - if( p_sys->b_broadcast ) + /* Receive the http header */ + if( ( psz = net_Gets( p_access, p_sys->fd, NULL ) ) == NULL ) { - p += sprintf( p,"Pragma: no-cache,rate=1.000000,request-context=%d\r\n", - p_sys->i_request_context++ ); + msg_Err( p_access, "failed to read answer" ); + goto error; } - else + + if( strncmp( psz, "HTTP/1.", 7 ) ) { - p += sprintf( p, "Pragma: no-cache,rate=1.000000,stream-time=0,stream-offset=%u:%u,request-context=%d,max-duration=0\r\n", - (uint32_t)((i_pos >> 32)&0xffffffff), - (uint32_t)(i_pos&0xffffffff), - p_sys->i_request_context++ ); + msg_Err( p_access, "invalid HTTP reply '%s'", psz ); + free( psz ); + goto error; } - p += sprintf( p, "Pragma: xPlayStrm=1\r\n" ); - p += sprintf( p, "Pragma: xClientGUID={"GUID_FMT"}\r\n", - GUID_PRINT( p_sys->guid ) ); - p += sprintf( p, "Pragma: stream-switch-count=%d\r\n", i_streams ); - p += sprintf( p, "Pragma: stream-switch-entry=" ); - for( i = 0; i < i_streams; i++ ) + i_code = atoi( &psz[9] ); + if( i_code >= 400 ) { - if( p_sys->asfh.stream[i].i_selected ) - { - p += sprintf( p, "ffff:%d:0 ", p_sys->asfh.stream[i].i_id ); - } - else - { - p += sprintf( p, "ffff:%d:2 ", p_sys->asfh.stream[i].i_id ); - } + msg_Err( p_access, "error: %s", psz ); + free( psz ); + goto error; } - p += sprintf( p, "\r\n" ); - p += sprintf( p, "Connection: Close\r\n\r\n" ); - net_Write( p_input, p_sys->fd, p_sys->buffer, p - p_sys->buffer ); - - msg_Dbg( p_input, "filling buffer" ); - /* we read until we found a \r\n\r\n or \n\n */ - p_sys->i_buffer = 0; - p_sys->i_buffer_pos = 0; + msg_Dbg( p_access, "HTTP reply '%s'", psz ); + free( psz ); for( ;; ) { - int i_try = 0; - int i_read; - uint8_t *p; - - p = &p_sys->buffer[p_sys->i_buffer]; - i_read = net_Read( p_input, p_sys->fd, &p_sys->buffer[p_sys->i_buffer], 1024, VLC_FALSE ); + char *psz = net_Gets( p_access, p_sys->fd, NULL ); + char *p; - if( i_read == 0 ) + if( psz == NULL ) { - if( i_try++ > 12 ) - { - break; - } - msg_Dbg( p_input, "another try (%d/12)", i_try ); - continue; + msg_Err( p_access, "failed to read answer" ); + goto error; } - if( i_read <= 0 || p_input->b_die || p_input->b_error ) + if( *psz == '\0' ) { + free( psz ); break; } - p_sys->i_buffer += i_read; - p_sys->buffer[p_sys->i_buffer] = '\0'; - if( strstr( p, "\r\n\r\n" ) || strstr( p, "\n\n" ) ) + if( ( p = strchr( psz, ':' ) ) == NULL ) { - msg_Dbg( p_input, "body found" ); - break; + msg_Err( p_access, "malformed header line: %s", psz ); + free( psz ); + goto error; } - if( p_sys->i_buffer >= BUFFER_SIZE - 1024 ) + *p++ = '\0'; + while( *p == ' ' ) p++; + + /* FIXME FIXME test Content-Type to see if it's a plain stream or an + * asx FIXME */ + if( !strcasecmp( psz, "Pragma" ) ) { - msg_Dbg( p_input, "buffer size exeded" ); - break; + if( strstr( p, "features" ) ) + { + /* FIXME, it is a bit badly done here ..... */ + if( strstr( p, "broadcast" ) ) + { + msg_Dbg( p_access, "stream type = broadcast" ); + p_sys->b_broadcast = true; + } + else if( strstr( p, "seekable" ) ) + { + msg_Dbg( p_access, "stream type = seekable" ); + p_sys->b_broadcast = false; + } + else + { + msg_Warn( p_access, "unknow stream types (%s)", p ); + p_sys->b_broadcast = false; + } + } + } + else if( !strcasecmp( psz, "Location" ) ) + { + psz_location = strdup( p ); } - } - p_ans = http_answer_parse( p_sys->buffer, p_sys->i_buffer ); - if( !p_ans ) - { - msg_Err( p_input, "cannot parse answer" ); - return VLC_EGENERIC; + free( psz ); } - if( p_ans->i_error < 200 || p_ans->i_error >= 300 ) + /* Handle the redirection */ + if( ( (i_code == 301) || (i_code == 302) || + (i_code == 303) || (i_code == 307) ) && + psz_location && *psz_location ) { - msg_Err( p_input, "error %d (server return=`%s')", - p_ans->i_error, p_ans->psz_answer ); - http_answer_free( p_ans ); - return VLC_EGENERIC; - } + msg_Dbg( p_access, "redirection to %s", psz_location ); + net_Close( p_sys->fd ); p_sys->fd = -1; - if( !p_ans->p_body ) - { - p_sys->i_buffer_pos = 0; - p_sys->i_buffer = 0; + *ppsz_location = psz_location; + return VLC_SUCCESS; } - else + free( psz_location ); + + /* Read the asf header */ + GetHeader( p_access ); + if( p_sys->i_header <= 0 ) { - p_sys->i_buffer_pos = p_ans->p_body - p_sys->buffer; + msg_Err( p_access, "header size == 0" ); + goto error; } - http_answer_free( p_ans ); + /* close this connection */ + net_Close( p_sys->fd ); + p_sys->fd = -1; + + /* *** parse header and get stream and their id *** */ + /* get all streams properties, + * + * TODO : stream bitrates properties(optional) + * and bitrate mutual exclusion(optional) */ + asf_HeaderParse ( &p_sys->asfh, + p_sys->p_header, p_sys->i_header ); + msg_Dbg( p_access, "packet count=%"PRId64" packet size=%d", + p_sys->asfh.i_data_packets_count, + p_sys->asfh.i_min_data_packet_size ); + + if( p_sys->asfh.i_min_data_packet_size <= 0 ) + goto error; + asf_StreamSelect( &p_sys->asfh, + var_CreateGetInteger( p_access, "mms-maxbitrate" ), + var_CreateGetBool( p_access, "mms-all" ), + var_CreateGetInteger( p_access, "audio" ), + var_CreateGetInteger( p_access, "video" ) ); return VLC_SUCCESS; + +error: + if( p_sys->fd > 0 ) + { + net_Close( p_sys->fd ); + p_sys->fd = -1; + } + return VLC_EGENERIC; } -/***************************************************************************** - * - *****************************************************************************/ -static void mmsh_stop( input_thread_t *p_input ) +static void GetHeader( access_t *p_access ) { - access_sys_t *p_sys = p_input->p_access_data; + access_sys_t *p_sys = p_access->p_sys; + + /* Read the asf header */ + p_sys->i_header = 0; + free( p_sys->p_header ); + p_sys->p_header = NULL; + for( ;; ) + { + chunk_t ck; + if( GetPacket( p_access, &ck ) || ck.i_type != 0x4824 ) + break; - msg_Dbg( p_input, "closing stream" ); - net_Close( p_sys->fd ); p_sys->fd = -1; + if( ck.i_data > 0 ) + { + p_sys->i_header += ck.i_data; + p_sys->p_header = xrealloc( p_sys->p_header, p_sys->i_header ); + memcpy( &p_sys->p_header[p_sys->i_header - ck.i_data], + ck.p_data, ck.i_data ); + } + } + msg_Dbg( p_access, "complete header size=%d", p_sys->i_header ); } + /***************************************************************************** - * - *****************************************************************************/ -static int mmsh_get_packet( input_thread_t * p_input, chunk_t *p_ck ) + * Start stream + ****************************************************************************/ +static int Start( access_t *p_access, uint64_t i_pos ) { - access_sys_t *p_sys = p_input->p_access_data; + access_sys_t *p_sys = p_access->p_sys; + int i_streams = 0; + int i_streams_selected = 0; + int i; + char *psz = NULL; + + msg_Dbg( p_access, "starting stream" ); - int i_mov = p_sys->i_buffer - p_sys->i_buffer_pos; + for( i = 1; i < 128; i++ ) + { + if( p_sys->asfh.stream[i].i_cat == ASF_STREAM_UNKNOWN ) + continue; + i_streams++; + if( p_sys->asfh.stream[i].i_selected ) + i_streams_selected++; + } + if( i_streams_selected <= 0 ) + { + msg_Err( p_access, "no stream selected" ); + return VLC_EGENERIC; + } + + if( OpenConnection( p_access ) ) + return VLC_EGENERIC; + + net_Printf( p_access, p_sys->fd, NULL, + "Accept: */*\r\n" + "User-Agent: "MMSH_USER_AGENT"\r\n" ); + if( p_sys->b_broadcast ) + { + net_Printf( p_access, p_sys->fd, NULL, + "Pragma: no-cache,rate=1.000000,request-context=%d\r\n", + p_sys->i_request_context++ ); + } + else + { + net_Printf( p_access, p_sys->fd, NULL, + "Pragma: no-cache,rate=1.000000,stream-time=0,stream-offset=%u:%u,request-context=%d,max-duration=0\r\n", + (uint32_t)((i_pos >> 32)&0xffffffff), + (uint32_t)(i_pos&0xffffffff), + p_sys->i_request_context++ ); + } + net_Printf( p_access, p_sys->fd, NULL, + "Pragma: xPlayStrm=1\r\n" + "Pragma: xClientGUID={"GUID_FMT"}\r\n" + "Pragma: stream-switch-count=%d\r\n" + "Pragma: stream-switch-entry=", + GUID_PRINT( p_sys->guid ), + i_streams); - if( p_sys->i_buffer_pos > BUFFER_SIZE / 2 ) + for( i = 1; i < 128; i++ ) { - if( i_mov > 0 ) + if( p_sys->asfh.stream[i].i_cat != ASF_STREAM_UNKNOWN ) { - memmove( &p_sys->buffer[0], - &p_sys->buffer[p_sys->i_buffer_pos], - i_mov ); + int i_select = 2; + if( p_sys->asfh.stream[i].i_selected ) + { + i_select = 0; + } + net_Printf( p_access, p_sys->fd, NULL, + "ffff:%d:%d ", i, i_select ); } - - p_sys->i_buffer = i_mov; - p_sys->i_buffer_pos = 0; } + net_Printf( p_access, p_sys->fd, NULL, "\r\n" ); + net_Printf( p_access, p_sys->fd, NULL, + "Connection: Close\r\n" ); - if( NetFill( p_input, p_sys, 12 ) < 12 ) + if( net_Printf( p_access, p_sys->fd, NULL, "\r\n" ) < 0 ) { - msg_Warn( p_input, "cannot fill buffer" ); + msg_Err( p_access, "failed to send request" ); return VLC_EGENERIC; } - chunk_parse( p_ck, &p_sys->buffer[p_sys->i_buffer_pos], - p_sys->i_buffer - p_sys->i_buffer_pos ); - - if( p_ck->i_type == 0x4524 ) // Transfer complete + psz = net_Gets( p_access, p_sys->fd, NULL ); + if( psz == NULL ) { - msg_Warn( p_input, "EOF" ); + msg_Err( p_access, "cannot read data 0" ); return VLC_EGENERIC; } - else if( p_ck->i_type != 0x4824 && p_ck->i_type != 0x4424 ) + + if( atoi( &psz[9] ) >= 400 ) { - msg_Err( p_input, "invalid chunk FATAL" ); + msg_Err( p_access, "error: %s", psz ); + free( psz ); return VLC_EGENERIC; } + msg_Dbg( p_access, "HTTP reply '%s'", psz ); + free( psz ); - if( p_ck->i_data < p_ck->i_size2 - 8 ) + /* FIXME check HTTP code */ + for( ;; ) { - if( NetFill( p_input, p_sys, p_ck->i_size2 - 8 - p_ck->i_data ) <= 0 ) + char *psz = net_Gets( p_access, p_sys->fd, NULL ); + if( psz == NULL ) { - msg_Warn( p_input, "cannot fill buffer" ); + msg_Err( p_access, "cannot read data 1" ); return VLC_EGENERIC; } - chunk_parse( p_ck, &p_sys->buffer[p_sys->i_buffer_pos], - p_sys->i_buffer - p_sys->i_buffer_pos ); - } - - if( p_sys->i_packet_sequence != 0 && - p_ck->i_sequence != p_sys->i_packet_sequence ) - { - msg_Warn( p_input, "packet lost ?" ); + if( *psz == '\0' ) + { + free( psz ); + break; + } + msg_Dbg( p_access, "%s", psz ); + free( psz ); } - p_sys->i_packet_sequence = p_ck->i_sequence + 1; p_sys->i_packet_used = 0; - p_sys->i_packet_length = p_ck->i_data; - p_sys->p_packet = p_ck->p_data; - - p_sys->i_buffer_pos += 12 + p_ck->i_data; + p_sys->i_packet_length = 0; return VLC_SUCCESS; } /***************************************************************************** - * + * closing stream *****************************************************************************/ -static int http_next_line( uint8_t **pp_data, int *pi_data ) +static void Stop( access_t *p_access ) { - char *p, *p_end = *pp_data + *pi_data; + access_sys_t *p_sys = p_access->p_sys; - for( p = *pp_data; p < p_end; p++ ) + msg_Dbg( p_access, "closing stream" ); + if( p_sys->fd > 0 ) { - if( p + 1 < p_end && *p == '\n' ) - { - *pi_data = p_end - p - 1; - *pp_data = p + 1; - return VLC_SUCCESS; - } - if( p + 2 < p_end && p[0] == '\r' && p[1] == '\n' ) - { - *pi_data = p_end - p - 2; - *pp_data = p + 2; - return VLC_SUCCESS; - } + net_Close( p_sys->fd ); + p_sys->fd = -1; } - *pi_data = 0; - *pp_data = p_end; - return VLC_EGENERIC; } /***************************************************************************** - * + * get packet *****************************************************************************/ -static http_answer_t *http_answer_parse( uint8_t *p_data, int i_data ) +static int GetPacket( access_t * p_access, chunk_t *p_ck ) { - http_answer_t *ans = malloc( sizeof( http_answer_t ) ); - http_field_t **pp_last; - char *p, *end; + access_sys_t *p_sys = p_access->p_sys; + int restsize; - if( strncmp( p_data, "HTTP/1.", 7 ) ) - { - free( ans ); - return NULL; - } - ans->i_version = atoi( &p_data[7] ); - ans->i_error = strtol( p_data + 8, &p, 0 ); - while( *p == ' ' ) + /* chunk_t */ + memset( p_ck, 0, sizeof( chunk_t ) ); + + /* Read the chunk header */ + /* Some headers are short, like 0x4324. Reading 12 bytes will cause us + * to lose synchronization with the stream. Just read to the length + * (4 bytes), decode and then read up to 8 additional bytes to get the + * entire header. + */ + if( net_Read( p_access, p_sys->fd, NULL, p_sys->buffer, 4, true ) < 4 ) { - p++; + msg_Err( p_access, "cannot read data 2" ); + return VLC_EGENERIC; } - if( ( ( end = strchr( p, '\r' ) ) == NULL )&& - ( ( end = strchr( p, '\n' ) ) == NULL ) ) + + p_ck->i_type = GetWLE( p_sys->buffer); + p_ck->i_size = GetWLE( p_sys->buffer + 2); + + restsize = p_ck->i_size; + if( restsize > 8 ) + restsize = 8; + + if( net_Read( p_access, p_sys->fd, NULL, p_sys->buffer + 4, restsize, true ) < restsize ) { - end = &p_data[i_data]; + msg_Err( p_access, "cannot read data 3" ); + return VLC_EGENERIC; } + p_ck->i_sequence = GetDWLE( p_sys->buffer + 4); + p_ck->i_unknown = GetWLE( p_sys->buffer + 8); - ans->psz_answer = strndup( p, end - p ); - - fprintf( stderr, "version=%d error=%d answer=%s\n", - ans->i_version, ans->i_error, ans->psz_answer ); - ans->p_fields = NULL; - ans->i_body = 0; - ans->p_body = 0; + /* Set i_size2 to 8 if this header was short, since a real value won't be + * present in the buffer. Using 8 avoid reading additional data for the + * packet. + */ + if( restsize < 8 ) + p_ck->i_size2 = 8; + else + p_ck->i_size2 = GetWLE( p_sys->buffer + 10); - pp_last = &ans->p_fields; + p_ck->p_data = p_sys->buffer + 12; + p_ck->i_data = p_ck->i_size2 - 8; - for( ;; ) + if( p_ck->i_type == 0x4524 ) // Transfer complete { - http_field_t *p_field; - uint8_t *colon; - - if( http_next_line( &p_data, &i_data ) ) - { - return ans; - } - if( !strncmp( p_data, "\r\n", 2 ) || !strncmp( p_data, "\n", 1 ) ) + if( p_ck->i_sequence == 0 ) { - break; + msg_Warn( p_access, "EOF" ); + return VLC_EGENERIC; } - - colon = strstr( p_data, ": " ); - if( colon ) + else { - uint8_t *end; - - end = strstr( colon, "\n" ) - 1; - if( *end != '\r' ) - { - end++; - } - - p_field = malloc( sizeof( http_field_t ) ); - p_field->psz_name = strndup( p_data, colon - p_data ); - p_field->psz_value = strndup( colon + 2, end - colon - 2 ); - p_field->p_next = NULL; - - *pp_last = p_field; - pp_last = &p_field->p_next; - - fprintf( stderr, "field name=`%s' value=`%s'\n", - p_field->psz_name, p_field->psz_value ); + msg_Warn( p_access, "next stream following" ); + return VLC_EGENERIC; } } - - if( http_next_line( &p_data, &i_data ) ) + else if( p_ck->i_type == 0x4324 ) { - return ans; + /* 0x4324 is CHUNK_TYPE_RESET: a new stream will follow with a sequence of 0 */ + msg_Warn( p_access, "next stream following (reset) seq=%d", p_ck->i_sequence ); + return VLC_EGENERIC; } - - ans->p_body = p_data; - ans->i_body = i_data; - fprintf( stderr, "body size=%d\n", i_data ); - - return ans; -} - -/***************************************************************************** - * - *****************************************************************************/ -static void http_answer_free( http_answer_t *ans ) -{ - http_field_t *p_field = ans->p_fields; - - while( p_field ) + else if( (p_ck->i_type != 0x4824) && (p_ck->i_type != 0x4424) ) { - http_field_t *p_next; - - p_next = p_field->p_next; - free( p_field->psz_name ); - free( p_field->psz_value ); - free( p_field ); - - p_field = p_next; + msg_Err( p_access, "invalid chunk FATAL (0x%x)", p_ck->i_type ); + return VLC_EGENERIC; } - free( ans->psz_answer ); - free( ans ); -} - -/***************************************************************************** - * - *****************************************************************************/ -static http_field_t *http_field_find( http_field_t *p_field, char *psz_name ) -{ - - while( p_field ) + if( (p_ck->i_data > 0) && + (net_Read( p_access, p_sys->fd, NULL, &p_sys->buffer[12], + p_ck->i_data, true ) < p_ck->i_data) ) { - if( !strcasecmp( p_field->psz_name, psz_name ) ) - { - return p_field; - } - - p_field = p_field->p_next; + msg_Err( p_access, "cannot read data 4" ); + return VLC_EGENERIC; } - return NULL; -} - -/***************************************************************************** - * - *****************************************************************************/ -static int chunk_parse( chunk_t *ck, uint8_t *p_data, int i_data ) -{ - if( i_data < 12 ) +#if 0 + if( (p_sys->i_packet_sequence != 0) && + (p_ck->i_sequence != p_sys->i_packet_sequence) ) { - return VLC_EGENERIC; + msg_Warn( p_access, "packet lost ? (%d != %d)", p_ck->i_sequence, p_sys->i_packet_sequence ); } +#endif - ck->i_type = GetWLE( p_data ); - ck->i_size = GetWLE( p_data + 2); - ck->i_sequence = GetDWLE( p_data + 4); - ck->i_unknown = GetWLE( p_data + 8); - ck->i_size2 = GetWLE( p_data + 10); - - ck->p_data = p_data + 12; - ck->i_data = __MIN( i_data - 12, ck->i_size2 - 8 ); + p_sys->i_packet_sequence = p_ck->i_sequence + 1; + p_sys->i_packet_used = 0; + p_sys->i_packet_length = p_ck->i_data; + p_sys->p_packet = p_ck->p_data; return VLC_SUCCESS; } -