X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finput%2Fstream.c;h=3db6a5a22d909d2c115f34c5250c5757e29a9f01;hb=c525c6f2202623b228c4de3dd9ab4141cd0fa14b;hp=97c567cf9d83e87992530565513e81302b056187;hpb=879d9fc3cf3b45882827caa2daaf8be5afe329d0;p=vlc diff --git a/src/input/stream.c b/src/input/stream.c index 97c567cf9d..3db6a5a22d 100644 --- a/src/input/stream.c +++ b/src/input/stream.c @@ -2,7 +2,7 @@ * stream.c ***************************************************************************** * Copyright (C) 1999-2004 VideoLAN - * $Id: stream.c,v 1.10 2004/01/06 21:42:43 sigmunau Exp $ + * $Id$ * * Authors: Laurent Aimar * @@ -25,415 +25,1506 @@ #include #include -#include "ninput.h" +#include "input_internal.h" -#define MAX_LINE 1024 -/**************************************************************************** - * stream_* : - * XXX for now it's just a wrapper - * - ****************************************************************************/ +/* TODO: + * - tune the 2 methods + * - compute cost for seek + * - improve stream mode seeking with closest segments + * - ... + */ -/** - * Handle to a stream. +/* Two methods: + * - using pf_block + * One linked list of data read + * - using pf_read + * More complex scheme using mutliple track to avoid seeking + */ + +/* How many tracks we have, currently only used for stream mode */ +#ifdef OPTIMIZE_MEMORY +# define STREAM_CACHE_TRACK 1 + /* Max size of our cache 128Ko per track */ +# define STREAM_CACHE_SIZE (STREAM_CACHE_TRACK*1024*128) +#else +# define STREAM_CACHE_TRACK 3 + /* Max size of our cache 4Mo per track */ +# define STREAM_CACHE_SIZE (4*STREAM_CACHE_TRACK*1024*1024) +#endif + +/* How many data we try to prebuffer */ +#define STREAM_CACHE_PREBUFFER_SIZE (32767) +/* Maximum time we take to pre-buffer */ +#define STREAM_CACHE_PREBUFFER_LENGTH (100*1000) + +/* Method1: Simple, for pf_block. + * We get blocks and put them in the linked list. + * We release blocks once the total size is bigger than CACHE_BLOCK_SIZE */ -struct stream_t +#define STREAM_DATA_WAIT 40000 /* Time between before a pf_block retry */ + +/* Method2: A bit more complex, for pf_read + * - We use ring buffers, only one if unseekable, all if seekable + * - Upon seek date current ring, then search if one ring match the pos, + * yes: switch to it, seek the access to match the end of the ring + * no: search the ring with i_end the closer to i_pos, + * if close enough, read data and use this ring + * else use the oldest ring, seek and use it. + * + * TODO: - with access non seekable: use all space available for only one ring, but + * we have to support seekable/non-seekable switch on the fly. + * - compute a good value for i_read_size + * - ? + */ +#define STREAM_READ_ATONCE 32767 +#define STREAM_CACHE_TRACK_SIZE (STREAM_CACHE_SIZE/STREAM_CACHE_TRACK) + +typedef struct +{ + int64_t i_date; + + int64_t i_start; + int64_t i_end; + + uint8_t *p_buffer; + +} stream_track_t; + +typedef struct { - VLC_COMMON_MEMBERS + char *psz_path; + int64_t i_size; - /** pointer to the input thread */ - input_thread_t *p_input; +} access_entry_t; +struct stream_sys_t +{ + access_t *p_access; + + vlc_bool_t b_block; /* Block method (1) or stream */ + + int64_t i_pos; /* Current reading offset */ + + /* Method 1: pf_block */ + struct + { + int64_t i_start; /* Offset of block for p_first */ + int i_offset; /* Offset for data in p_current */ + block_t *p_current; /* Current block */ + + int i_size; /* Total amount of data in the list */ + block_t *p_first; + block_t **pp_last; + + } block; + + /* Method 2: for pf_read */ + struct + { + int i_offset; /* Buffer offset in the current track */ + int i_tk; /* Current track */ + stream_track_t tk[STREAM_CACHE_TRACK]; + + /* Global buffer */ + uint8_t *p_buffer; + + /* */ + int i_used; /* Used since last read */ + int i_read_size; + + } stream; + + /* Peek temporary buffer */ + int i_peek; + uint8_t *p_peek; + + /* Stat for both method */ + struct + { + vlc_bool_t b_fastseek; /* From access */ + + /* Stat about reading data */ + int64_t i_read_count; + int64_t i_bytes; + int64_t i_read_time; + + /* Stat about seek */ + int i_seek_count; + int64_t i_seek_time; + + } stat; + + /* Streams list */ + int i_list; + access_entry_t **list; + int i_list_index; + access_t *p_list_access; + + /* Preparse mode ? */ + vlc_bool_t b_quick; }; -/** - * Create a "stream_t *" from an "input_thread_t *". - */ -stream_t *stream_OpenInput( input_thread_t *p_input ) +/* Method 1: */ +static int AStreamReadBlock( stream_t *s, void *p_read, int i_read ); +static int AStreamPeekBlock( stream_t *s, uint8_t **p_peek, int i_read ); +static int AStreamSeekBlock( stream_t *s, int64_t i_pos ); +static void AStreamPrebufferBlock( stream_t *s ); +static block_t *AReadBlock( stream_t *s, vlc_bool_t *pb_eof ); + +/* Method 2 */ +static int AStreamReadStream( stream_t *s, void *p_read, int i_read ); +static int AStreamPeekStream( stream_t *s, uint8_t **pp_peek, int i_read ); +static int AStreamSeekStream( stream_t *s, int64_t i_pos ); +static void AStreamPrebufferStream( stream_t *s ); +static int AReadStream( stream_t *s, void *p_read, int i_read ); + +/* Common */ +static int AStreamControl( stream_t *s, int i_query, va_list ); +static void AStreamDestroy( stream_t *s ); +static void UStreamDestroy( stream_t *s ); +static int ASeek( stream_t *s, int64_t i_pos ); + + +/**************************************************************************** + * stream_UrlNew: create a stream from a access + ****************************************************************************/ +stream_t *__stream_UrlNew( vlc_object_t *p_parent, const char *psz_url ) { - stream_t *s; + char *psz_access, *psz_demux, *psz_path, *psz_dup; + access_t *p_access; + stream_t *p_res; + + if( !psz_url ) return 0; + + psz_dup = strdup( psz_url ); + MRLSplit( p_parent, psz_dup, &psz_access, &psz_demux, &psz_path ); + + /* Now try a real access */ + p_access = access2_New( p_parent, psz_access, psz_demux, psz_path, 0 ); + free( psz_dup ); + + if( p_access == NULL ) + { + msg_Err( p_parent, "no suitable access module for `%s'", psz_url ); + return NULL; + } + + if( !( p_res = stream_AccessNew( p_access, VLC_TRUE ) ) ) + { + access2_Delete( p_access ); + return NULL; + } + + p_res->pf_destroy = UStreamDestroy; + return p_res; +} + +stream_t *stream_AccessNew( access_t *p_access, vlc_bool_t b_quick ) +{ + stream_t *s = vlc_object_create( p_access, VLC_OBJECT_STREAM ); + stream_sys_t *p_sys; + char *psz_list; + + if( !s ) return NULL; + + /* Attach it now, needed for b_die */ + vlc_object_attach( s, p_access ); - s = vlc_object_create( p_input, sizeof( stream_t ) ); - if( s ) + s->pf_block = NULL; + s->pf_read = NULL; /* Set up later */ + s->pf_peek = NULL; + s->pf_control= AStreamControl; + s->pf_destroy = AStreamDestroy; + + s->p_sys = p_sys = malloc( sizeof( stream_sys_t ) ); + + /* Common field */ + p_sys->p_access = p_access; + p_sys->b_block = p_access->pf_block ? VLC_TRUE : VLC_FALSE; + p_sys->i_pos = p_access->info.i_pos; + + /* Stats */ + access2_Control( p_access, ACCESS_CAN_FASTSEEK, &p_sys->stat.b_fastseek ); + p_sys->stat.i_bytes = 0; + p_sys->stat.i_read_time = 0; + p_sys->stat.i_read_count = 0; + p_sys->stat.i_seek_count = 0; + p_sys->stat.i_seek_time = 0; + + p_sys->i_list = 0; + p_sys->list = 0; + p_sys->i_list_index = 0; + p_sys->p_list_access = 0; + + p_sys->b_quick = b_quick; + + /* Get the additional list of inputs if any (for concatenation) */ + if( (psz_list = var_CreateGetString( s, "input-list" )) && *psz_list ) { - s->p_input = p_input; + access_entry_t *p_entry = malloc( sizeof(access_entry_t) ); + char *psz_name, *psz_parser = psz_name = psz_list; + + p_sys->p_list_access = p_access; + p_entry->i_size = p_access->info.i_size; + p_entry->psz_path = strdup( p_access->psz_path ); + TAB_APPEND( p_sys->i_list, p_sys->list, p_entry ); + msg_Dbg( p_access, "adding file `%s', ("I64Fd" bytes)", + p_entry->psz_path, p_access->info.i_size ); + + while( psz_name && *psz_name ) + { + psz_parser = strchr( psz_name, ',' ); + if( psz_parser ) *psz_parser = 0; + + psz_name = strdup( psz_name ); + if( psz_name ) + { + access_t *p_tmp = access2_New( p_access, p_access->psz_access, + 0, psz_name, 0 ); + + if( !p_tmp ) + { + psz_name = psz_parser; + if( psz_name ) psz_name++; + continue; + } + + msg_Dbg( p_access, "adding file `%s', ("I64Fd" bytes)", + psz_name, p_tmp->info.i_size ); + + p_entry = malloc( sizeof(access_entry_t) ); + p_entry->i_size = p_tmp->info.i_size; + p_entry->psz_path = psz_name; + TAB_APPEND( p_sys->i_list, p_sys->list, p_entry ); + + access2_Delete( p_tmp ); + } + + psz_name = psz_parser; + if( psz_name ) psz_name++; + } + } + if( psz_list ) free( psz_list ); + + /* Peek */ + p_sys->i_peek = 0; + p_sys->p_peek = NULL; + + if( p_sys->b_block ) + { + s->pf_read = AStreamReadBlock; + s->pf_peek = AStreamPeekBlock; + + /* Init all fields of p_sys->block */ + p_sys->block.i_start = p_sys->i_pos; + p_sys->block.i_offset = 0; + p_sys->block.p_current = NULL; + p_sys->block.i_size = 0; + p_sys->block.p_first = NULL; + p_sys->block.pp_last = &p_sys->block.p_first; + + /* Do the prebuffering */ + AStreamPrebufferBlock( s ); + + if( p_sys->block.i_size <= 0 ) + { + msg_Err( s, "cannot pre fill buffer" ); + goto error; + } + } + else + { + int i; + + s->pf_read = AStreamReadStream; + s->pf_peek = AStreamPeekStream; + + /* Allocate/Setup our tracks */ + p_sys->stream.i_offset = 0; + p_sys->stream.i_tk = 0; + p_sys->stream.p_buffer = malloc( STREAM_CACHE_SIZE ); + p_sys->stream.i_used = 0; + access2_Control( p_access, ACCESS_GET_MTU, + &p_sys->stream.i_read_size ); + if( p_sys->stream.i_read_size <= 0 ) + p_sys->stream.i_read_size = STREAM_READ_ATONCE; + else if( p_sys->stream.i_read_size <= 256 ) + p_sys->stream.i_read_size = 256; + + for( i = 0; i < STREAM_CACHE_TRACK; i++ ) + { + p_sys->stream.tk[i].i_date = 0; + p_sys->stream.tk[i].i_start = p_sys->i_pos; + p_sys->stream.tk[i].i_end = p_sys->i_pos; + p_sys->stream.tk[i].p_buffer= + &p_sys->stream.p_buffer[i * STREAM_CACHE_TRACK_SIZE]; + } + + /* Do the prebuffering */ + AStreamPrebufferStream( s ); + + if( p_sys->stream.tk[p_sys->stream.i_tk].i_end <= 0 ) + { + msg_Err( s, "cannot pre fill buffer" ); + goto error; + } } return s; + +error: + if( p_sys->b_block ) + { + /* Nothing yet */ + } + else + { + free( p_sys->stream.p_buffer ); + } + free( s->p_sys ); + vlc_object_detach( s ); + vlc_object_destroy( s ); + return NULL; } -/** - * Destroy a previously created "stream_t *" instance. - */ -void stream_Release( stream_t *s ) +/**************************************************************************** + * AStreamDestroy: + ****************************************************************************/ +static void AStreamDestroy( stream_t *s ) { + stream_sys_t *p_sys = s->p_sys; + + vlc_object_detach( s ); + + if( p_sys->b_block ) block_ChainRelease( p_sys->block.p_first ); + else free( p_sys->stream.p_buffer ); + + if( p_sys->p_peek ) free( p_sys->p_peek ); + + if( p_sys->p_list_access && p_sys->p_list_access != p_sys->p_access ) + access2_Delete( p_sys->p_list_access ); + + while( p_sys->i_list-- ) + { + free( p_sys->list[p_sys->i_list]->psz_path ); + free( p_sys->list[p_sys->i_list] ); + if( !p_sys->i_list ) free( p_sys->list ); + } + + free( s->p_sys ); vlc_object_destroy( s ); } -/** - * Similar to #stream_Control(), but takes a va_list and not variable - * arguments. - */ -int stream_vaControl( stream_t *s, int i_query, va_list args ) +static void UStreamDestroy( stream_t *s ) { - vlc_bool_t *p_b; - int64_t *p_i64, i64; + access_t *p_access = (access_t*)vlc_object_find( s, VLC_OBJECT_ACCESS, FIND_PARENT ); + AStreamDestroy( s ); + vlc_object_release( p_access ); + access2_Delete( p_access ); +} - switch( i_query ) +/**************************************************************************** + * stream_AccessReset: + ****************************************************************************/ +void stream_AccessReset( stream_t *s ) +{ + stream_sys_t *p_sys = s->p_sys; + + p_sys->i_pos = p_sys->p_access->info.i_pos; + + if( p_sys->b_block ) { - case STREAM_GET_SIZE: - p_i64 = (int64_t*) va_arg( args, int64_t * ); + block_ChainRelease( p_sys->block.p_first ); + + /* Init all fields of p_sys->block */ + p_sys->block.i_start = p_sys->i_pos; + p_sys->block.i_offset = 0; + p_sys->block.p_current = NULL; + p_sys->block.i_size = 0; + p_sys->block.p_first = NULL; + p_sys->block.pp_last = &p_sys->block.p_first; + + /* Do the prebuffering */ + AStreamPrebufferBlock( s ); + } + else + { + int i; - vlc_mutex_lock( &s->p_input->stream.stream_lock ); - *p_i64 = s->p_input->stream.p_selected_area->i_size; - vlc_mutex_unlock( &s->p_input->stream.stream_lock ); - return VLC_SUCCESS; + /* Setup our tracks */ + p_sys->stream.i_offset = 0; + p_sys->stream.i_tk = 0; + p_sys->stream.i_used = 0; - case STREAM_CAN_SEEK: - p_b = (vlc_bool_t*) va_arg( args, vlc_bool_t * ); + for( i = 0; i < STREAM_CACHE_TRACK; i++ ) + { + p_sys->stream.tk[i].i_date = 0; + p_sys->stream.tk[i].i_start = p_sys->i_pos; + p_sys->stream.tk[i].i_end = p_sys->i_pos; + } - vlc_mutex_lock( &s->p_input->stream.stream_lock ); - *p_b = s->p_input->stream.b_seekable; - vlc_mutex_unlock( &s->p_input->stream.stream_lock ); - return VLC_SUCCESS; + /* Do the prebuffering */ + AStreamPrebufferStream( s ); + } +} - case STREAM_CAN_FASTSEEK: - p_b = (vlc_bool_t*) va_arg( args, vlc_bool_t * ); +/**************************************************************************** + * stream_AccessUpdate: + ****************************************************************************/ +void stream_AccessUpdate( stream_t *s ) +{ + stream_sys_t *p_sys = s->p_sys; - vlc_mutex_lock( &s->p_input->stream.stream_lock ); - *p_b = s->p_input->stream.b_seekable && - s->p_input->stream.i_method == INPUT_METHOD_FILE; - vlc_mutex_unlock( &s->p_input->stream.stream_lock ); - return VLC_SUCCESS; + p_sys->i_pos = p_sys->p_access->info.i_pos; - case STREAM_GET_POSITION: - p_i64 = (int64_t*) va_arg( args, int64_t * ); + if( p_sys->i_list ) + { + int i; + for( i = 0; i < p_sys->i_list_index; i++ ) + { + p_sys->i_pos += p_sys->list[i]->i_size; + } + } +} - vlc_mutex_lock( &s->p_input->stream.stream_lock ); - *p_i64 = s->p_input->stream.p_selected_area->i_tell; - vlc_mutex_unlock( &s->p_input->stream.stream_lock ); - return VLC_SUCCESS; +/**************************************************************************** + * AStreamControl: + ****************************************************************************/ +static int AStreamControl( stream_t *s, int i_query, va_list args ) +{ + stream_sys_t *p_sys = s->p_sys; + access_t *p_access = p_sys->p_access; - case STREAM_SET_POSITION: - i64 = (int64_t) va_arg( args, int64_t ); + vlc_bool_t *p_bool; + int64_t *pi_64, i_64; + int i_int; - vlc_mutex_lock( &s->p_input->stream.stream_lock ); - if( i64 < 0 || - ( s->p_input->stream.p_selected_area->i_size > 0 && - s->p_input->stream.p_selected_area->i_size < i64 ) ) + switch( i_query ) + { + case STREAM_GET_SIZE: + pi_64 = (int64_t*)va_arg( args, int64_t * ); + if( s->p_sys->i_list ) { - vlc_mutex_unlock( &s->p_input->stream.stream_lock ); - msg_Warn( s, "seek out of bound" ); - return VLC_EGENERIC; + int i; + *pi_64 = 0; + for( i = 0; i < s->p_sys->i_list; i++ ) + *pi_64 += s->p_sys->list[i]->i_size; + break; } - vlc_mutex_unlock( &s->p_input->stream.stream_lock ); + *pi_64 = p_access->info.i_size; + break; - if( i64 == s->p_input->stream.p_selected_area->i_tell ) - { - return VLC_SUCCESS; - } + case STREAM_CAN_SEEK: + p_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t * ); + access2_Control( p_access, ACCESS_CAN_SEEK, p_bool ); + break; - if( s->p_input->stream.b_seekable && - ( s->p_input->stream.i_method == INPUT_METHOD_FILE || - i64 - s->p_input->stream.p_selected_area->i_tell < 0 || - i64 - s->p_input->stream.p_selected_area->i_tell > 4096 ) ) - { - input_AccessReinit( s->p_input ); - s->p_input->pf_seek( s->p_input, i64 ); - return VLC_SUCCESS; - } + case STREAM_CAN_FASTSEEK: + p_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t * ); + access2_Control( p_access, ACCESS_CAN_FASTSEEK, p_bool ); + break; - if( i64 - s->p_input->stream.p_selected_area->i_tell > 0 ) - { - data_packet_t *p_data; - int i_skip = i64 - s->p_input->stream.p_selected_area->i_tell; + case STREAM_GET_POSITION: + pi_64 = (int64_t*)va_arg( args, int64_t * ); + *pi_64 = p_sys->i_pos; + break; - if( i_skip > 1000 ) - { - msg_Warn( s, "will skip %d bytes, slow", i_skip ); - } + case STREAM_SET_POSITION: + i_64 = (int64_t)va_arg( args, int64_t ); + if( p_sys->b_block ) + return AStreamSeekBlock( s, i_64 ); + else + return AStreamSeekStream( s, i_64 ); - while (i_skip > 0 ) - { - int i_read; - - i_read = input_SplitBuffer( s->p_input, &p_data, - __MIN( (int)s->p_input->i_bufsize, i_skip ) ); - if( i_read < 0 ) - { - return VLC_EGENERIC; - } - i_skip -= i_read; - - input_DeletePacket( s->p_input->p_method_data, p_data ); - if( i_read == 0 && i_skip > 0 ) - { - return VLC_EGENERIC; - } - } - } + case STREAM_GET_MTU: + return VLC_EGENERIC; - return VLC_SUCCESS; + case STREAM_CONTROL_ACCESS: + i_int = (int) va_arg( args, int ); + if( i_int != ACCESS_SET_PRIVATE_ID_STATE && + i_int != ACCESS_SET_PRIVATE_ID_CA && + i_int != ACCESS_GET_PRIVATE_ID_STATE ) + { + msg_Err( s, "Hey, what are you thinking ?" + "DON'T USE STREAM_CONTROL_ACCESS !!!" ); + return VLC_EGENERIC; + } + return access2_vaControl( p_access, i_int, args ); default: msg_Err( s, "invalid stream_vaControl query=0x%x", i_query ); return VLC_EGENERIC; } + return VLC_SUCCESS; } -/** - * Use to control the "stream_t *". Look at #stream_query_e for - * possible "i_query" value and format arguments. Return VLC_SUCCESS - * if ... succeed ;) and VLC_EGENERIC if failed or unimplemented - */ -int stream_Control( stream_t *s, int i_query, ... ) + + +/**************************************************************************** + * Method 1: + ****************************************************************************/ +static void AStreamPrebufferBlock( stream_t *s ) { - va_list args; - int i_result; + stream_sys_t *p_sys = s->p_sys; + + int64_t i_first = 0; + int64_t i_start; + + msg_Dbg( s, "pre buffering" ); + i_start = mdate(); + for( ;; ) + { + int64_t i_date = mdate(); + vlc_bool_t b_eof; + block_t *b; + + if( s->b_die || p_sys->block.i_size > STREAM_CACHE_PREBUFFER_SIZE || + ( i_first > 0 && i_first + STREAM_CACHE_PREBUFFER_LENGTH < i_date ) ) + { + int64_t i_byterate; + + /* Update stat */ + p_sys->stat.i_bytes = p_sys->block.i_size; + p_sys->stat.i_read_time = i_date - i_start; + i_byterate = ( I64C(1000000) * p_sys->stat.i_bytes ) / + (p_sys->stat.i_read_time + 1); + + msg_Dbg( s, "prebuffering done "I64Fd" bytes in "I64Fd"s - " + I64Fd" kbytes/s", + p_sys->stat.i_bytes, + p_sys->stat.i_read_time / I64C(1000000), + i_byterate / 1024 ); + break; + } + + /* Fetch a block */ + if( ( b = AReadBlock( s, &b_eof ) ) == NULL ) + { + if( b_eof ) break; + + msleep( STREAM_DATA_WAIT ); + continue; + } + + if( i_first == 0 ) + { + i_first = mdate(); + msg_Dbg( s, "received first data for our buffer"); + } - va_start( args, i_query ); - i_result = stream_vaControl( s, i_query, args ); - va_end( args ); + /* Append the block */ + p_sys->block.i_size += b->i_buffer; + *p_sys->block.pp_last = b; + p_sys->block.pp_last = &b->p_next; + + p_sys->stat.i_read_count++; + } - return i_result; + p_sys->block.p_current = p_sys->block.p_first; } -/** - * Try to read "i_read" bytes into a buffer pointed by "p_read". If - * "p_read" is NULL then data are skipped instead of read. The return - * value is the real numbers of bytes read/skip. If this value is less - * than i_read that means that it's the end of the stream. - */ -int stream_Read( stream_t *s, void *p_data, int i_data ) +static int AStreamRefillBlock( stream_t *s ); + +static int AStreamReadBlock( stream_t *s, void *p_read, int i_read ) { - uint8_t *p = (uint8_t*)p_data; - data_packet_t *p_packet; + stream_sys_t *p_sys = s->p_sys; + + uint8_t *p_data= (uint8_t*)p_read; + int i_data = 0; - int i_read = 0; + /* It means EOF */ + if( p_sys->block.p_current == NULL ) + return 0; - if( p_data == NULL && i_data > 0 ) + if( p_read == NULL ) { - int64_t i_pos; + /* seek within this stream if possible, else use plain old read and discard */ + stream_sys_t *p_sys = s->p_sys; + access_t *p_access = p_sys->p_access; + vlc_bool_t b_aseek; + access2_Control( p_access, ACCESS_CAN_SEEK, &b_aseek ); + if( b_aseek ) + return AStreamSeekBlock( s, p_sys->i_pos + i_read ) ? 0 : i_read; + } - stream_Control( s, STREAM_GET_POSITION, &i_pos ); + while( i_data < i_read ) + { + int i_current = + p_sys->block.p_current->i_buffer - p_sys->block.i_offset; + int i_copy = __MIN( i_current, i_read - i_data); - i_pos += i_data; - if( stream_Control( s, STREAM_SET_POSITION, i_pos ) ) + /* Copy data */ + if( p_data ) { + memcpy( p_data, + &p_sys->block.p_current->p_buffer[p_sys->block.i_offset], + i_copy ); + p_data += i_copy; + } + i_data += i_copy; + + p_sys->block.i_offset += i_copy; + if( p_sys->block.i_offset >= p_sys->block.p_current->i_buffer ) + { + /* Current block is now empty, switch to next */ + if( p_sys->block.p_current ) + { + p_sys->block.i_offset = 0; + p_sys->block.p_current = p_sys->block.p_current->p_next; + } + /*Get a new block */ + if( AStreamRefillBlock( s ) ) + { + break; + } + } + } + + p_sys->i_pos += i_data; + return i_data; +} + +static int AStreamPeekBlock( stream_t *s, uint8_t **pp_peek, int i_read ) +{ + stream_sys_t *p_sys = s->p_sys; + uint8_t *p_data; + int i_data = 0; + block_t *b; + int i_offset; + + if( p_sys->block.p_current == NULL ) return 0; /* EOF */ + + /* We can directly give a pointer over our buffer */ + if( i_read <= p_sys->block.p_current->i_buffer - p_sys->block.i_offset ) + { + *pp_peek = &p_sys->block.p_current->p_buffer[p_sys->block.i_offset]; + return i_read; + } + + /* We need to create a local copy */ + if( p_sys->i_peek < i_read ) + { + p_sys->p_peek = realloc( p_sys->p_peek, i_read ); + if( !p_sys->p_peek ) + { + p_sys->i_peek = 0; return 0; } - return i_data; + p_sys->i_peek = i_read; } - while( i_data > 0 && !s->p_input->b_die ) + /* Fill enough data */ + while( p_sys->block.i_size - (p_sys->i_pos - p_sys->block.i_start) + < i_read ) + { + block_t **pp_last = p_sys->block.pp_last; + + if( AStreamRefillBlock( s ) ) break; + + /* Our buffer are probably filled enough, don't try anymore */ + if( pp_last == p_sys->block.pp_last ) break; + } + + /* Copy what we have */ + b = p_sys->block.p_current; + i_offset = p_sys->block.i_offset; + p_data = p_sys->p_peek; + + while( b && i_data < i_read ) { - int i_count; + int i_current = b->i_buffer - i_offset; + int i_copy = __MIN( i_current, i_read - i_data ); - i_count = input_SplitBuffer( s->p_input, &p_packet, - __MIN( i_data, (int)s->p_input->i_bufsize ) ); + memcpy( p_data, &b->p_buffer[i_offset], i_copy ); + i_data += i_copy; + p_data += i_copy; + i_offset += i_copy; - if( i_count <= 0 ) + if( i_offset >= b->i_buffer ) { - if( i_count == 0 ) - input_DeletePacket( s->p_input->p_method_data, p_packet ); + i_offset = 0; + b = b->p_next; + } + } + + *pp_peek = p_sys->p_peek; + return i_data; +} - return i_read; +static int AStreamSeekBlock( stream_t *s, int64_t i_pos ) +{ + stream_sys_t *p_sys = s->p_sys; + access_t *p_access = p_sys->p_access; + int64_t i_offset = i_pos - p_sys->block.i_start; + vlc_bool_t b_seek; + + /* We already have thoses data, just update p_current/i_offset */ + if( i_offset >= 0 && i_offset < p_sys->block.i_size ) + { + block_t *b = p_sys->block.p_first; + int i_current = 0; + + while( i_current + b->i_buffer < i_offset ) + { + i_current += b->i_buffer; + b = b->p_next; } - if( p ) + p_sys->block.p_current = b; + p_sys->block.i_offset = i_offset - i_current; + + p_sys->i_pos = i_pos; + + return VLC_SUCCESS; + } + + /* We may need to seek or to read data */ + if( i_offset < 0 ) + { + vlc_bool_t b_aseek; + access2_Control( p_access, ACCESS_CAN_SEEK, &b_aseek ); + + if( !b_aseek ) + { + msg_Err( s, "backward seek impossible (access non seekable)" ); + return VLC_EGENERIC; + } + + b_seek = VLC_TRUE; + } + else + { + vlc_bool_t b_aseek, b_aseekfast; + + access2_Control( p_access, ACCESS_CAN_SEEK, &b_aseek ); + access2_Control( p_access, ACCESS_CAN_FASTSEEK, &b_aseekfast ); + + if( !b_aseek ) { - memcpy( p, p_packet->p_payload_start, i_count ); - p += i_count; + b_seek = VLC_FALSE; + msg_Warn( s, I64Fd" bytes need to be skipped " + "(access non seekable)", + i_offset - p_sys->block.i_size ); } + else + { + int64_t i_skip = i_offset - p_sys->block.i_size; - input_DeletePacket( s->p_input->p_method_data, p_packet ); + /* Avg bytes per packets */ + int i_avg = p_sys->stat.i_bytes / p_sys->stat.i_read_count; + /* TODO compute a seek cost instead of fixed threshold */ + int i_th = b_aseekfast ? 1 : 5; - i_data -= i_count; - i_read += i_count; + if( i_skip <= i_th * i_avg && + i_skip < STREAM_CACHE_SIZE ) + b_seek = VLC_FALSE; + else + b_seek = VLC_TRUE; + + msg_Dbg( s, "b_seek=%d th*avg=%d skip="I64Fd, + b_seek, i_th*i_avg, i_skip ); + } } - return i_read; + if( b_seek ) + { + int64_t i_start, i_end; + /* Do the access seek */ + i_start = mdate(); + if( ASeek( s, i_pos ) ) return VLC_EGENERIC; + i_end = mdate(); + + /* Release data */ + block_ChainRelease( p_sys->block.p_first ); + + /* Reinit */ + p_sys->block.i_start = p_sys->i_pos = i_pos; + p_sys->block.i_offset = 0; + p_sys->block.p_current = NULL; + p_sys->block.i_size = 0; + p_sys->block.p_first = NULL; + p_sys->block.pp_last = &p_sys->block.p_first; + + /* Refill a block */ + if( AStreamRefillBlock( s ) ) + { + msg_Err( s, "cannot re fill buffer" ); + return VLC_EGENERIC; + } + /* Update stat */ + p_sys->stat.i_seek_time += i_end - i_start; + p_sys->stat.i_seek_count++; + return VLC_SUCCESS; + } + else + { + /* Read enought data */ + while( p_sys->block.i_start + p_sys->block.i_size < i_pos ) + { + if( AStreamRefillBlock( s ) ) + { + msg_Err( s, "can't read enough data in seek" ); + return VLC_EGENERIC; + } + while( p_sys->block.p_current && + p_sys->i_pos + p_sys->block.p_current->i_buffer < i_pos ) + { + p_sys->i_pos += p_sys->block.p_current->i_buffer; + p_sys->block.p_current = p_sys->block.p_current->p_next; + } + } + + p_sys->block.i_offset = i_pos - p_sys->i_pos; + p_sys->i_pos = i_pos; + + /* TODO read data */ + return VLC_SUCCESS; + } + + return VLC_EGENERIC; } -/** - * Store in pp_peek a pointer to the next "i_peek" bytes in the stream - * \return The real numbers of valid bytes, if it's less - * or equal to 0, *pp_peek is invalid. - * \note pp_peek is a pointer to internal buffer and it will be invalid as - * soons as other stream_* functions are called. - * \note Due to input limitation, it could be less than i_peek without meaning - * the end of the stream (but only when you have i_peek >= - * p_input->i_bufsize) - */ -int stream_Peek( stream_t *s, uint8_t **pp_peek, int i_peek ) +static int AStreamRefillBlock( stream_t *s ) { - return input_Peek( s->p_input, pp_peek, i_peek ); + stream_sys_t *p_sys = s->p_sys; + int64_t i_start, i_stop; + block_t *b; + + /* Release data */ + while( p_sys->block.i_size >= STREAM_CACHE_SIZE && + p_sys->block.p_first != p_sys->block.p_current ) + { + block_t *b = p_sys->block.p_first; + + p_sys->block.i_start += b->i_buffer; + p_sys->block.i_size -= b->i_buffer; + p_sys->block.p_first = b->p_next; + + block_Release( b ); + } + if( p_sys->block.i_size >= STREAM_CACHE_SIZE && + p_sys->block.p_current == p_sys->block.p_first && + p_sys->block.p_current->p_next ) /* At least 2 packets */ + { + /* Enough data, don't read more */ + return VLC_SUCCESS; + } + + /* Now read a new block */ + i_start = mdate(); + for( ;; ) + { + vlc_bool_t b_eof; + + if( s->b_die ) return VLC_EGENERIC; + + + /* Fetch a block */ + if( ( b = AReadBlock( s, &b_eof ) ) ) break; + + if( b_eof ) return VLC_EGENERIC; + + msleep( STREAM_DATA_WAIT ); + } + i_stop = mdate(); + + /* Append the block */ + p_sys->block.i_size += b->i_buffer; + *p_sys->block.pp_last = b; + p_sys->block.pp_last = &b->p_next; + + /* Fix p_current */ + if( p_sys->block.p_current == NULL ) + p_sys->block.p_current = b; + + /* Update stat */ + p_sys->stat.i_bytes += b->i_buffer; + p_sys->stat.i_read_time += i_stop - i_start; + p_sys->stat.i_read_count++; + + return VLC_SUCCESS; } -/** - * Read "i_size" bytes and store them in a block_t. If less than "i_size" - * bytes are available then return what is left and if nothing is availble, - * return NULL. - */ -block_t *stream_Block( stream_t *s, int i_size ) + +/**************************************************************************** + * Method 2: + ****************************************************************************/ +static int AStreamRefillStream( stream_t *s ); + +static int AStreamReadStream( stream_t *s, void *p_read, int i_read ) { - block_t *p_block; + stream_sys_t *p_sys = s->p_sys; + stream_track_t *tk = &p_sys->stream.tk[p_sys->stream.i_tk]; + + uint8_t *p_data = (uint8_t *)p_read; + int i_data = 0; - if( i_size <= 0 ) return NULL; - if( !(p_block = block_New( s->p_input, i_size ) ) ) return NULL; + if( tk->i_start >= tk->i_end ) return 0; /* EOF */ - p_block->i_buffer = stream_Read( s, p_block->p_buffer, i_size ); - if( !p_block->i_buffer ) + if( p_read == NULL ) { - block_Release( p_block ); - p_block = NULL; + /* seek within this stream if possible, else use plain old read and discard */ + stream_sys_t *p_sys = s->p_sys; + access_t *p_access = p_sys->p_access; + vlc_bool_t b_aseek; + access2_Control( p_access, ACCESS_CAN_SEEK, &b_aseek ); + if( b_aseek ) + return AStreamSeekStream( s, p_sys->i_pos + i_read ) ? 0 : i_read; } - return p_block; +#if 0 + msg_Dbg( s, "AStreamReadStream: %d pos="I64Fd" tk=%d start="I64Fd + " offset=%d end="I64Fd, + i_read, p_sys->i_pos, p_sys->stream.i_tk, + tk->i_start, p_sys->stream.i_offset, tk->i_end ); +#endif + + while( i_data < i_read ) + { + int i_off = (tk->i_start + p_sys->stream.i_offset) % + STREAM_CACHE_TRACK_SIZE; + int i_current = + __MIN( tk->i_end - tk->i_start - p_sys->stream.i_offset, + STREAM_CACHE_TRACK_SIZE - i_off ); + int i_copy = __MIN( i_current, i_read - i_data ); + + if( i_copy <= 0 ) break; /* EOF */ + + /* Copy data */ + /* msg_Dbg( s, "AStreamReadStream: copy %d", i_copy ); */ + if( p_data ) + { + memcpy( p_data, &tk->p_buffer[i_off], i_copy ); + p_data += i_copy; + } + i_data += i_copy; + p_sys->stream.i_offset += i_copy; + + /* Update pos now */ + p_sys->i_pos += i_copy; + + /* */ + p_sys->stream.i_used += i_copy; + if( tk->i_start + p_sys->stream.i_offset >= tk->i_end || + p_sys->stream.i_used >= p_sys->stream.i_read_size ) + { + if( AStreamRefillStream( s ) ) + { + /* EOF */ + if( tk->i_start >= tk->i_end ) break; + } + } + } + + return i_data; } -/** - * Read from the stream untill first newline. - * \param s Stream handle to read from - * \return A null-terminated string. This must be freed, - */ -char *stream_ReadLine( stream_t *s ) +static int AStreamPeekStream( stream_t *s, uint8_t **pp_peek, int i_read ) { - uint8_t *p_data; - char *p_line; - int i_data; - int i = 0; - i_data = stream_Peek( s, &p_data, MAX_LINE ); - msg_Dbg( s->p_input, "i_data %d", i_data ); - while( i < i_data && p_data[i] != '\n' ) + stream_sys_t *p_sys = s->p_sys; + stream_track_t *tk = &p_sys->stream.tk[p_sys->stream.i_tk]; + int64_t i_off; + + if( tk->i_start >= tk->i_end ) return 0; /* EOF */ + +#if 0 + msg_Dbg( s, "AStreamPeekStream: %d pos="I64Fd" tk=%d " + "start="I64Fd" offset=%d end="I64Fd, + i_read, p_sys->i_pos, p_sys->stream.i_tk, + tk->i_start, p_sys->stream.i_offset, tk->i_end ); +#endif + + /* Avoid problem, but that should *never* happen */ + if( i_read > STREAM_CACHE_TRACK_SIZE / 2 ) + i_read = STREAM_CACHE_TRACK_SIZE / 2; + + while( tk->i_end - tk->i_start - p_sys->stream.i_offset < i_read ) { - i++; + if( p_sys->stream.i_used <= 1 ) + { + /* Be sure we will read something */ + p_sys->stream.i_used += i_read - + (tk->i_end - tk->i_start - p_sys->stream.i_offset); + } + if( AStreamRefillStream( s ) ) break; } - if( i_data <= 0 ) + + if( tk->i_end - tk->i_start - p_sys->stream.i_offset < i_read ) + i_read = tk->i_end - tk->i_start - p_sys->stream.i_offset; + + /* Now, direct pointer or a copy ? */ + i_off = (tk->i_start + p_sys->stream.i_offset) % STREAM_CACHE_TRACK_SIZE; + if( i_off + i_read <= STREAM_CACHE_TRACK_SIZE ) { - return NULL; + *pp_peek = &tk->p_buffer[i_off]; + return i_read; } - else + + if( p_sys->i_peek < i_read ) { - p_line = malloc( i + 1 ); - if( p_line == NULL ) + p_sys->p_peek = realloc( p_sys->p_peek, i_read ); + if( !p_sys->p_peek ) { - msg_Err( s->p_input, "Out of memory" ); - return NULL; + p_sys->i_peek = 0; + return 0; } - i = stream_Read( s, p_line, i + 1 ); - p_line[ i - 1 ] = '\0'; - msg_Dbg( s->p_input, "found %d chars long line", i ); - return p_line; + p_sys->i_peek = i_read; } + + memcpy( p_sys->p_peek, &tk->p_buffer[i_off], + STREAM_CACHE_TRACK_SIZE - i_off ); + memcpy( &p_sys->p_peek[STREAM_CACHE_TRACK_SIZE - i_off], + &tk->p_buffer[0], i_read - (STREAM_CACHE_TRACK_SIZE - i_off) ); + + *pp_peek = p_sys->p_peek; + return i_read; } -/** - * Read "i_size" bytes and store them in a pes_packet_t. Only fields - * p_first, p_last, i_nb_data, and i_pes_size are set. (Of course, - * you need to fill i_dts, i_pts, ... ) If only less than "i_size" - * bytes are available NULL is returned. - */ -pes_packet_t *stream_PesPacket( stream_t *s, int i_data ) +static int AStreamSeekStream( stream_t *s, int64_t i_pos ) { - pes_packet_t *p_pes; - data_packet_t *p_packet; + stream_sys_t *p_sys = s->p_sys; + access_t *p_access = p_sys->p_access; + vlc_bool_t b_aseek; + vlc_bool_t b_afastseek; + int i_maxth; + int i_new; + int i; + +#if 0 + msg_Dbg( s, "AStreamSeekStream: to "I64Fd" pos="I64Fd + "tk=%d start="I64Fd" offset=%d end="I64Fd, + i_pos, p_sys->i_pos, p_sys->stream.i_tk, + p_sys->stream.tk[p_sys->stream.i_tk].i_start, + p_sys->stream.i_offset, + p_sys->stream.tk[p_sys->stream.i_tk].i_end ); +#endif + + + /* Seek in our current track ? */ + if( i_pos >= p_sys->stream.tk[p_sys->stream.i_tk].i_start && + i_pos < p_sys->stream.tk[p_sys->stream.i_tk].i_end ) + { + //msg_Dbg( s, "AStreamSeekStream: current track" ); + p_sys->i_pos = i_pos; + p_sys->stream.i_offset = i_pos - p_sys->stream.tk[p_sys->stream.i_tk].i_start; + return VLC_SUCCESS; + } + + access2_Control( p_access, ACCESS_CAN_SEEK, &b_aseek ); + if( !b_aseek ) + { + /* We can't do nothing */ + msg_Dbg( s, "AStreamSeekStream: can't seek" ); + return VLC_EGENERIC; + } + /* Date the current track */ + p_sys->stream.tk[p_sys->stream.i_tk].i_date = mdate(); - if( !(p_pes = input_NewPES( s->p_input->p_method_data ) ) ) + /* Try to reuse already read data */ + for( i = 0; i < STREAM_CACHE_TRACK; i++ ) { - return NULL; + stream_track_t *tk = &p_sys->stream.tk[i]; + + if( i_pos >= tk->i_start && i_pos <= tk->i_end ) + { +#if 0 + msg_Dbg( s, "AStreamSeekStream: reusing %d start="I64Fd + " end="I64Fd, i, tk->i_start, tk->i_end ); +#endif + /* Seek at the end of the buffer */ + if( ASeek( s, tk->i_end ) ) return VLC_EGENERIC; + + /* That's it */ + p_sys->i_pos = i_pos; + p_sys->stream.i_tk = i; + p_sys->stream.i_offset = i_pos - tk->i_start; + + if( p_sys->stream.i_used < 1024 ) + p_sys->stream.i_used = 1024; + + if( AStreamRefillStream( s ) && i_pos == tk->i_end ) + return VLC_EGENERIC; + + return VLC_SUCCESS; + } } - if( i_data <= 0 ) + access2_Control( p_access, ACCESS_CAN_SEEK, &b_afastseek ); + /* FIXME compute seek cost (instead of static 'stupid' value) */ + i_maxth = __MIN( p_sys->stream.i_read_size, STREAM_READ_ATONCE / 2 ); + if( !b_afastseek ) + i_maxth *= 3; + + /* FIXME TODO */ +#if 0 + /* Search closest segment TODO */ + for( i = 0; i < STREAM_CACHE_TRACK; i++ ) { - p_pes->p_first = - p_pes->p_last = input_NewPacket( s->p_input->p_method_data, 0 ); - p_pes->i_nb_data = 1; - return p_pes; + stream_track_t *tk = &p_sys->stream.tk[i]; + + if( i_pos + i_maxth >= tk->i_start ) + { + msg_Dbg( s, "good segment before current pos, TODO" ); + } + if( i_pos - i_maxth <= tk->i_end ) + { + msg_Dbg( s, "good segment after current pos, TODO" ); + } } +#endif + + /* Nothing good, seek and choose oldest segment */ + if( ASeek( s, i_pos ) ) return VLC_EGENERIC; + p_sys->i_pos = i_pos; + + i_new = 0; + for( i = 1; i < STREAM_CACHE_TRACK; i++ ) + { + if( p_sys->stream.tk[i].i_date < p_sys->stream.tk[i_new].i_date ) + i_new = i; + } + + /* Reset the segment */ + p_sys->stream.i_tk = i_new; + p_sys->stream.i_offset = 0; + p_sys->stream.tk[i_new].i_start = i_pos; + p_sys->stream.tk[i_new].i_end = i_pos; + + /* Read data */ + if( p_sys->stream.i_used < STREAM_READ_ATONCE / 2 ) + p_sys->stream.i_used = STREAM_READ_ATONCE / 2; + + if( AStreamRefillStream( s ) ) + return VLC_EGENERIC; + + return VLC_SUCCESS; +} + +static int AStreamRefillStream( stream_t *s ) +{ + stream_sys_t *p_sys = s->p_sys; + stream_track_t *tk = &p_sys->stream.tk[p_sys->stream.i_tk]; + + /* We read but won't increase i_start after initial start + offset */ + int i_toread = + __MIN( p_sys->stream.i_used, STREAM_CACHE_TRACK_SIZE - + (tk->i_end - tk->i_start - p_sys->stream.i_offset) ); + vlc_bool_t b_read = VLC_FALSE; + int64_t i_start, i_stop; - while( i_data > 0 ) + if( i_toread <= 0 ) return VLC_EGENERIC; /* EOF */ + + /* msg_Dbg( s, "AStreamRefillStream: toread=%d", i_toread ); */ + + i_start = mdate(); + while( i_toread > 0 ) { + int i_off = tk->i_end % STREAM_CACHE_TRACK_SIZE; int i_read; - i_read = input_SplitBuffer( s->p_input, &p_packet, - __MIN( i_data, (int)s->p_input->i_bufsize ) ); - if( i_read <= 0 ) + if( s->b_die ) + return VLC_EGENERIC; + + i_read = __MIN( i_toread, STREAM_CACHE_TRACK_SIZE - i_off ); + i_read = AReadStream( s, &tk->p_buffer[i_off], i_read ); + + /* msg_Dbg( s, "AStreamRefillStream: read=%d", i_read ); */ + if( i_read < 0 ) { - /* should occur only with EOF and max allocation reached - * it safer to return an error */ - /* free pes */ - input_DeletePES( s->p_input->p_method_data, p_pes ); - return NULL; + msleep( STREAM_DATA_WAIT ); + continue; } - - if( p_pes->p_first == NULL ) + else if( i_read == 0 ) { - p_pes->p_first = p_packet; + if( !b_read ) return VLC_EGENERIC; + return VLC_SUCCESS; } - else + b_read = VLC_TRUE; + + /* Update end */ + tk->i_end += i_read; + + /* Windows of STREAM_CACHE_TRACK_SIZE */ + if( tk->i_end - tk->i_start > STREAM_CACHE_TRACK_SIZE ) { - p_pes->p_last->p_next = p_packet; + int i_invalid = tk->i_end - tk->i_start - STREAM_CACHE_TRACK_SIZE; + + tk->i_start += i_invalid; + p_sys->stream.i_offset -= i_invalid; } - p_pes->p_last = p_packet; - p_pes->i_nb_data++; - p_pes->i_pes_size += i_read; - i_data -= i_read; + + i_toread -= i_read; + p_sys->stream.i_used -= i_read; + + p_sys->stat.i_bytes += i_read; + p_sys->stat.i_read_count++; } + i_stop = mdate(); - return p_pes; + p_sys->stat.i_read_time += i_stop - i_start; + + return VLC_SUCCESS; } +static void AStreamPrebufferStream( stream_t *s ) +{ + stream_sys_t *p_sys = s->p_sys; + access_t *p_access = p_sys->p_access; + + int64_t i_first = 0; + int64_t i_start; + int64_t i_prebuffer = p_sys->b_quick ? STREAM_CACHE_TRACK_SIZE /100 : + ( (p_access->info.i_title > 1 || p_access->info.i_seekpoint > 1) ? + STREAM_CACHE_PREBUFFER_SIZE : STREAM_CACHE_TRACK_SIZE / 3 ); + + msg_Dbg( s, "pre buffering" ); + i_start = mdate(); + for( ;; ) + { + stream_track_t *tk = &p_sys->stream.tk[p_sys->stream.i_tk]; + + int64_t i_date = mdate(); + int i_read; + + if( s->b_die || tk->i_end >= i_prebuffer || + (i_first > 0 && i_first + STREAM_CACHE_PREBUFFER_LENGTH < i_date) ) + { + int64_t i_byterate; + + /* Update stat */ + p_sys->stat.i_bytes = tk->i_end - tk->i_start; + p_sys->stat.i_read_time = i_date - i_start; + i_byterate = ( I64C(1000000) * p_sys->stat.i_bytes ) / + (p_sys->stat.i_read_time+1); + + msg_Dbg( s, "prebuffering done "I64Fd" bytes in "I64Fd"s - " + I64Fd" kbytes/s", + p_sys->stat.i_bytes, + p_sys->stat.i_read_time / I64C(1000000), + i_byterate / 1024 ); + break; + } + + /* */ + i_read = STREAM_CACHE_TRACK_SIZE - tk->i_end; + i_read = __MIN( p_sys->stream.i_read_size, i_read ); + i_read = AReadStream( s, &tk->p_buffer[tk->i_end], i_read ); + if( i_read < 0 ) + { + msleep( STREAM_DATA_WAIT ); + continue; + } + else if( i_read == 0 ) + { + /* EOF */ + break; + } + + if( i_first == 0 ) + { + i_first = mdate(); + msg_Dbg( s, "received first data for our buffer"); + } + + tk->i_end += i_read; + + p_sys->stat.i_read_count++; + } +} + + +/**************************************************************************** + * stream_ReadLine: + ****************************************************************************/ /** - * Read i_size into a data_packet_t. If b_force is not set, fewer bytes can - * be returned. You should always set b_force, unless you know what you are - * doing. + * Read from the stream untill first newline. + * \param s Stream handle to read from + * \return A null-terminated string. This must be freed, */ -data_packet_t *stream_DataPacket( stream_t *s, int i_size, vlc_bool_t b_force ) +#define STREAM_PROBE_LINE 2048 +#define STREAM_LINE_MAX (2048*100) +char *stream_ReadLine( stream_t *s ) { - data_packet_t *p_pk; - int i_read; + char *p_line = NULL; + int i_line = 0, i_read = 0; - if( i_size <= 0 ) + while( i_read < STREAM_LINE_MAX ) { - p_pk = input_NewPacket( s->p_input->p_method_data, 0 ); - if( p_pk ) + char *psz_eol; + uint8_t *p_data; + int i_data; + + /* Probe new data */ + i_data = stream_Peek( s, &p_data, STREAM_PROBE_LINE ); + if( i_data <= 0 ) break; /* No more data */ + + /* Check if there is an EOL */ + if( ( psz_eol = memchr( p_data, '\n', i_data ) ) ) { - p_pk->p_payload_end = p_pk->p_payload_start; + i_data = (psz_eol - (char *)p_data) + 1; + p_line = realloc( p_line, i_line + i_data + 1 ); + i_data = stream_Read( s, &p_line[i_line], i_data ); + if( i_data <= 0 ) break; /* Hmmm */ + i_line += (i_data - 1); + i_read += i_data; + + /* We have our line */ + break; } - return p_pk; + + /* Read data (+1 for easy \0 append) */ + p_line = realloc( p_line, i_line + STREAM_PROBE_LINE + 1 ); + i_data = stream_Read( s, &p_line[i_line], STREAM_PROBE_LINE ); + if( i_data <= 0 ) break; /* Hmmm */ + i_line += i_data; + i_read += i_data; } - i_read = input_SplitBuffer( s->p_input, &p_pk, i_size ); - if( i_read <= 0 ) + /* Remove trailing LF/CR */ + while( i_line > 0 && ( p_line[i_line-1] == '\r' || + p_line[i_line-1] == '\n') ) i_line--; + + if( i_read > 0 ) { - return NULL; + p_line[i_line] = '\0'; + return p_line; + } + + /* We failed to read any data, probably EOF */ + if( p_line ) free( p_line ); + return NULL; +} + +/**************************************************************************** + * Access reading/seeking wrappers to handle concatenated streams. + ****************************************************************************/ +static int AReadStream( stream_t *s, void *p_read, int i_read ) +{ + stream_sys_t *p_sys = s->p_sys; + access_t *p_access = p_sys->p_access; + int i_read_orig = i_read; + + if( !p_sys->i_list ) + { + i_read = p_access->pf_read( p_access, p_read, i_read ); + return i_read; + } + + i_read = p_sys->p_list_access->pf_read( p_sys->p_list_access, p_read, + i_read ); + + /* If we reached an EOF then switch to the next stream in the list */ + if( i_read == 0 && p_sys->i_list_index + 1 < p_sys->i_list ) + { + char *psz_name = p_sys->list[++p_sys->i_list_index]->psz_path; + access_t *p_list_access; + + msg_Dbg( s, "opening input `%s'", psz_name ); + + p_list_access = access2_New( s, p_access->psz_access, 0, psz_name, 0 ); + + if( !p_list_access ) return 0; + + if( p_sys->p_list_access != p_access ) + access2_Delete( p_sys->p_list_access ); + + p_sys->p_list_access = p_list_access; + + /* We have to read some data */ + return AReadStream( s, p_read, i_read_orig ); + } + + return i_read; +} + +static block_t *AReadBlock( stream_t *s, vlc_bool_t *pb_eof ) +{ + stream_sys_t *p_sys = s->p_sys; + access_t *p_access = p_sys->p_access; + block_t *p_block; + vlc_bool_t b_eof; + + if( !p_sys->i_list ) + { + p_block = p_access->pf_block( p_access ); + if( pb_eof ) *pb_eof = p_access->info.b_eof; + return p_block; } - /* Should be really rare, near 0 */ - if( i_read < i_size && b_force ) + p_block = p_sys->p_list_access->pf_block( p_access ); + b_eof = p_sys->p_list_access->info.b_eof; + if( pb_eof ) *pb_eof = b_eof; + + /* If we reached an EOF then switch to the next stream in the list */ + if( !p_block && b_eof && p_sys->i_list_index + 1 < p_sys->i_list ) { - data_packet_t *p_old = p_pk; - int i_missing = i_size - i_read; + char *psz_name = p_sys->list[++p_sys->i_list_index]->psz_path; + access_t *p_list_access; + + msg_Dbg( s, "opening input `%s'", psz_name ); - p_pk = input_NewPacket( s->p_input->p_method_data, i_size ); - if( p_pk == NULL ) + p_list_access = access2_New( s, p_access->psz_access, 0, psz_name, 0 ); + + if( !p_list_access ) return 0; + + if( p_sys->p_list_access != p_access ) + access2_Delete( p_sys->p_list_access ); + + p_sys->p_list_access = p_list_access; + + /* We have to read some data */ + return AReadBlock( s, pb_eof ); + } + + return p_block; +} + +static int ASeek( stream_t *s, int64_t i_pos ) +{ + stream_sys_t *p_sys = s->p_sys; + access_t *p_access = p_sys->p_access; + + /* Check which stream we need to access */ + if( p_sys->i_list ) + { + int i; + char *psz_name; + int64_t i_size = 0; + access_t *p_list_access = 0; + + for( i = 0; i < p_sys->i_list - 1; i++ ) + { + if( i_pos < p_sys->list[i]->i_size + i_size ) break; + i_size += p_sys->list[i]->i_size; + } + psz_name = p_sys->list[i]->psz_path; + + if( i != p_sys->i_list_index ) + msg_Dbg( s, "opening input `%s'", psz_name ); + + if( i != p_sys->i_list_index && i != 0 ) { - input_DeletePacket( s->p_input->p_method_data, p_old ); - return NULL; + p_list_access = + access2_New( s, p_access->psz_access, 0, psz_name, 0 ); + } + else if( i != p_sys->i_list_index ) + { + p_list_access = p_access; } - p_pk->p_payload_end = p_pk->p_payload_start + i_size; - memcpy( p_pk->p_payload_start, p_old->p_payload_start, i_read ); - input_DeletePacket( s->p_input->p_method_data, p_old ); - if( stream_Read( s, &p_pk->p_payload_start[i_read], i_missing ) - < i_missing ) + if( p_list_access ) { - input_DeletePacket( s->p_input->p_method_data, p_pk ); - return NULL; + if( p_sys->p_list_access != p_access ) + access2_Delete( p_sys->p_list_access ); + + p_sys->p_list_access = p_list_access; } + + p_sys->i_list_index = i; + return p_sys->p_list_access->pf_seek( p_sys->p_list_access, + i_pos - i_size ); } - return p_pk; + return p_access->pf_seek( p_access, i_pos ); }