X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finput%2Fstream.c;h=99549543799221fa5e0493df330d6a432b6599a7;hb=ce654e9f4e21951c6676361b7718646714d00b98;hp=cfd65325284dd0fe30fcc0d87a5a3469c3ae1082;hpb=68d217865aee3a510ae8e309b384056444212c44;p=vlc diff --git a/src/input/stream.c b/src/input/stream.c index cfd6532528..9954954379 100644 --- a/src/input/stream.c +++ b/src/input/stream.c @@ -1,7 +1,7 @@ /***************************************************************************** * stream.c ***************************************************************************** - * Copyright (C) 1999-2004 VideoLAN + * Copyright (C) 1999-2004 the VideoLAN team * $Id$ * * Authors: Laurent Aimar @@ -18,15 +18,19 @@ * * 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. *****************************************************************************/ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include -#include #include "input_internal.h" +#undef STREAM_DEBUG + /* TODO: * - tune the 2 methods * - compute cost for seek @@ -41,21 +45,27 @@ * More complex scheme using mutliple track to avoid seeking */ -/* How many track we have, currently only used for stream mode */ -#define STREAM_CACHE_TRACK 3 -/* Max size of our cache 4Mo per track */ -#define STREAM_CACHE_SIZE (4*STREAM_CACHE_TRACK*1024*1024) - /* How many data we try to prebuffer */ -#define STREAM_CACHE_PREBUFFER_SIZE (32767) - -#define STREAM_CACHE_PREBUFFER_LENGTH (100*1000) /* Maximum time we take to pre-buffer */ +/* 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 */ -#define STREAM_DATA_WAIT 40000 /* Time between before a pf_block retry */ +#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 @@ -81,8 +91,16 @@ typedef struct int64_t i_end; uint8_t *p_buffer; + } stream_track_t; +typedef struct +{ + char *psz_path; + int64_t i_size; + +} access_entry_t; + struct stream_sys_t { access_t *p_access; @@ -101,12 +119,13 @@ struct stream_sys_t 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 ofset in the current track */ + int i_offset; /* Buffer offset in the current track */ int i_tk; /* Current track */ stream_track_t tk[STREAM_CACHE_TRACK]; @@ -116,6 +135,7 @@ struct stream_sys_t /* */ int i_used; /* Used since last read */ int i_read_size; + } stream; /* Peek temporary buffer */ @@ -135,45 +155,102 @@ struct stream_sys_t /* 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; }; /* Method 1: */ -static int AStreamReadBlock( stream_t *, void *p_read, int i_read ); -static int AStreamPeekBlock( stream_t *, uint8_t **p_peek, int i_read ); +static int AStreamReadBlock( stream_t *s, void *p_read, int i_read ); +static int AStreamPeekBlock( stream_t *s, const uint8_t **p_peek, int i_read ); static int AStreamSeekBlock( stream_t *s, int64_t i_pos ); -static void AStreamPrebufferBlock( stream_t * ); +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 *, void *p_read, int i_read ); -static int AStreamPeekStream( stream_t *, uint8_t **pp_peek, int i_read ); +static int AStreamReadStream( stream_t *s, void *p_read, int i_read ); +static int AStreamPeekStream( stream_t *s, const uint8_t **pp_peek, int i_read ); static int AStreamSeekStream( stream_t *s, int64_t i_pos ); -static void AStreamPrebufferStream( stream_t * ); +static void AStreamPrebufferStream( stream_t *s ); +static int AReadStream( stream_t *s, void *p_read, int i_read ); /* Common */ -static int AStreamControl( stream_t *, int i_query, va_list ); +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_AccessNew: create a stream from a access + * stream_UrlNew: create a stream from a access ****************************************************************************/ -stream_t *stream_AccessNew( access_t *p_access ) +stream_t *__stream_UrlNew( vlc_object_t *p_parent, const char *psz_url ) { - stream_t *s = vlc_object_create( p_access, VLC_OBJECT_STREAM ); - stream_sys_t *p_sys; + const char *psz_access, *psz_demux; + char *psz_path; + access_t *p_access; + stream_t *p_res; - if( !s ) + if( !psz_url ) return 0; + + char psz_dup[strlen (psz_url) + 1]; + strcpy (psz_dup, psz_url);; + MRLSplit( 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 ); + + 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_stream_create( VLC_OBJECT(p_access) ); + stream_sys_t *p_sys; + char *psz_list = NULL; + + if( !s ) return NULL; /* Attach it now, needed for b_die */ vlc_object_attach( s, p_access ); - s->pf_block = NULL; s->pf_read = NULL; /* Set up later */ s->pf_peek = NULL; - s->pf_control= AStreamControl; + s->pf_control = AStreamControl; + s->pf_destroy = AStreamDestroy; s->p_sys = p_sys = malloc( sizeof( stream_sys_t ) ); + if( p_sys == NULL ) + { + msg_Err( s, "Out of memory when allocating stream_sys_t" ); + goto error; + } + + /* UTF16 and UTF32 text file conversion */ + s->i_char_width = 1; + s->b_little_endian = VLC_FALSE; + s->conv = (vlc_iconv_t)(-1); /* Common field */ p_sys->p_access = p_access; @@ -188,6 +265,77 @@ stream_t *stream_AccessNew( access_t *p_access ) 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 ) + { + access_entry_t *p_entry = malloc( sizeof(access_entry_t) ); + if( p_entry == NULL ) + { + msg_Err( s, "Out of memory when allocating access_entry_t" ); + goto error; + } + 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 ); + if( p_entry->psz_path == NULL ) + { + msg_Err( s, "Out of memory when duplicating p_access->psz_path" ); + free( p_entry ); + goto error; + } + 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, + "", 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) ); + if( p_entry == NULL ) + { + msg_Err( p_access, "Out of memory when allocating access_entry_t" ); + goto error; + } + 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++; + } + } + FREENULL( psz_list ); + /* Peek */ p_sys->i_peek = 0; p_sys->p_peek = NULL; @@ -225,8 +373,15 @@ stream_t *stream_AccessNew( access_t *p_access ) p_sys->stream.i_offset = 0; p_sys->stream.i_tk = 0; p_sys->stream.p_buffer = malloc( STREAM_CACHE_SIZE ); + if( p_sys->stream.p_buffer == NULL ) + { + msg_Err( s, "Out of memory when allocating stream cache (%d bytes)", + STREAM_CACHE_SIZE ); + goto error; + } p_sys->stream.i_used = 0; - access2_Control( p_access, ACCESS_GET_MTU, &p_sys->stream.i_read_size ); + 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 ) @@ -251,7 +406,6 @@ stream_t *stream_AccessNew( access_t *p_access ) } } - return s; error: @@ -263,6 +417,10 @@ error: { free( p_sys->stream.p_buffer ); } + while( p_sys->i_list > 0 ) + free( p_sys->list[--(p_sys->i_list)] ); + free( p_sys->list ); + free( psz_list ); free( s->p_sys ); vlc_object_detach( s ); vlc_object_destroy( s ); @@ -270,30 +428,41 @@ error: } /**************************************************************************** - * stream_AccessDelete: + * AStreamDestroy: ****************************************************************************/ -void stream_AccessDelete( stream_t *s ) +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 + 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->stream.p_buffer ); + 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 ); } - if( p_sys->p_peek ) - free( p_sys->p_peek ); - free( s->p_sys ); vlc_object_destroy( s ); } +static void UStreamDestroy( stream_t *s ) +{ + 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 ); +} + /**************************************************************************** * stream_AccessReset: ****************************************************************************/ @@ -339,6 +508,25 @@ void stream_AccessReset( stream_t *s ) } } +/**************************************************************************** + * stream_AccessUpdate: + ****************************************************************************/ +void stream_AccessUpdate( 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->i_list ) + { + int i; + for( i = 0; i < p_sys->i_list_index; i++ ) + { + p_sys->i_pos += p_sys->list[i]->i_size; + } + } +} + /**************************************************************************** * AStreamControl: ****************************************************************************/ @@ -355,6 +543,14 @@ static int AStreamControl( stream_t *s, int i_query, va_list args ) { case STREAM_GET_SIZE: pi_64 = (int64_t*)va_arg( args, int64_t * ); + if( s->p_sys->i_list ) + { + 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; + } *pi_64 = p_access->info.i_size; break; @@ -385,13 +581,19 @@ static int AStreamControl( stream_t *s, int i_query, va_list args ) case STREAM_CONTROL_ACCESS: i_int = (int) va_arg( args, int ); - if( i_int != ACCESS_SET_PRIVATE_ID_STATE ) + 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_Control( p_access, i_int, args ); + return access2_vaControl( p_access, i_int, args ); + + case STREAM_GET_CONTENT_TYPE: + return access2_Control( p_access, ACCESS_GET_CONTENT_TYPE, + va_arg( args, char ** ) ); default: msg_Err( s, "invalid stream_vaControl query=0x%x", i_query ); @@ -418,10 +620,10 @@ static void AStreamPrebufferBlock( stream_t *s ) 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 || + 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; @@ -430,9 +632,10 @@ static void AStreamPrebufferBlock( stream_t *s ) 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); + (p_sys->stat.i_read_time + 1); - msg_Dbg( s, "prebuffering done %lld bytes in %llds - %lld kbytes/s", + 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 ); @@ -440,24 +643,39 @@ static void AStreamPrebufferBlock( stream_t *s ) } /* Fetch a block */ - if( ( b = p_access->pf_block( p_access ) ) == NULL ) + if( ( b = AReadBlock( s, &b_eof ) ) == NULL ) { - if( p_access->info.b_eof ) - break; + if( b_eof ) break; msleep( STREAM_DATA_WAIT ); continue; } + while( b ) + { + /* 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++; + b = b->p_next; + } + + if( p_access->info.b_prebuffered ) + { + /* Access has already prebufferred - update stats and exit */ + p_sys->stat.i_bytes = p_sys->block.i_size; + p_sys->stat.i_read_time = mdate() - i_start; + break; + } + if( i_first == 0 ) + { i_first = mdate(); + msg_Dbg( s, "received first data for our buffer"); + } - /* 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++; } p_sys->block.p_current = p_sys->block.p_first; @@ -476,15 +694,29 @@ static int AStreamReadBlock( stream_t *s, void *p_read, int i_read ) if( p_sys->block.p_current == NULL ) return 0; + if( p_read == 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 AStreamSeekBlock( s, p_sys->i_pos + i_read ) ? 0 : i_read; + } + while( i_data < i_read ) { - int i_current = p_sys->block.p_current->i_buffer - p_sys->block.i_offset; + 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); /* Copy data */ if( p_data ) { - memcpy( p_data, &p_sys->block.p_current->p_buffer[p_sys->block.i_offset], i_copy ); + 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; @@ -510,7 +742,7 @@ static int AStreamReadBlock( stream_t *s, void *p_read, int i_read ) return i_data; } -static int AStreamPeekBlock( stream_t *s, uint8_t **pp_peek, int i_read ) +static int AStreamPeekBlock( stream_t *s, const uint8_t **pp_peek, int i_read ) { stream_sys_t *p_sys = s->p_sys; uint8_t *p_data; @@ -518,8 +750,7 @@ static int AStreamPeekBlock( stream_t *s, uint8_t **pp_peek, int i_read ) block_t *b; int i_offset; - if( p_sys->block.p_current == NULL ) - return 0; /* EOF */ + 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 ) @@ -531,23 +762,25 @@ static int AStreamPeekBlock( stream_t *s, uint8_t **pp_peek, int i_read ) /* We need to create a local copy */ if( p_sys->i_peek < i_read ) { - if( p_sys->p_peek ) - free( p_sys->p_peek ); + p_sys->p_peek = realloc( p_sys->p_peek, i_read ); + if( !p_sys->p_peek ) + { + p_sys->i_peek = 0; + return 0; + } p_sys->i_peek = i_read; - p_sys->p_peek = malloc( p_sys->i_peek ); } /* Fill enough data */ - while( p_sys->block.i_size - (p_sys->i_pos - p_sys->block.i_start) < i_read ) + 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; + if( AStreamRefillBlock( s ) ) break; /* Our buffer are probably filled enough, don't try anymore */ - if( pp_last == p_sys->block.pp_last ) - break; + if( pp_last == p_sys->block.pp_last ) break; } /* Copy what we have */ @@ -611,7 +844,7 @@ static int AStreamSeekBlock( stream_t *s, int64_t i_pos ) if( !b_aseek ) { - msg_Err( s, "backward seek impossible (access non seekable)" ); + msg_Err( s, "backward seeking impossible (access not seekable)" ); return VLC_EGENERIC; } @@ -627,7 +860,8 @@ static int AStreamSeekBlock( stream_t *s, int64_t i_pos ) if( !b_aseek ) { b_seek = VLC_FALSE; - msg_Warn( s, "%lld bytes need to be skipped (access non seekable)", + msg_Warn( s, I64Fd" bytes need to be skipped " + "(access non seekable)", i_offset - p_sys->block.i_size ); } else @@ -645,7 +879,7 @@ static int AStreamSeekBlock( stream_t *s, int64_t i_pos ) else b_seek = VLC_TRUE; - msg_Dbg( s, "b_seek=%d th*avg=%d skip=%lld", + msg_Dbg( s, "b_seek=%d th*avg=%d skip="I64Fd, b_seek, i_th*i_avg, i_skip ); } } @@ -655,8 +889,7 @@ static int AStreamSeekBlock( stream_t *s, int64_t i_pos ) int64_t i_start, i_end; /* Do the access seek */ i_start = mdate(); - if( p_access->pf_seek( p_access, i_pos ) ) - return VLC_EGENERIC; + if( ASeek( s, i_pos ) ) return VLC_EGENERIC; i_end = mdate(); /* Release data */ @@ -673,7 +906,7 @@ static int AStreamSeekBlock( stream_t *s, int64_t i_pos ) /* Refill a block */ if( AStreamRefillBlock( s ) ) { - msg_Err( s, "cannot re fill buffer" ); + msg_Err( s, "cannot pre fill buffer" ); return VLC_EGENERIC; } /* Update stat */ @@ -683,7 +916,7 @@ static int AStreamSeekBlock( stream_t *s, int64_t i_pos ) } else { - /* Read enought data */ + /* Read enough data */ while( p_sys->block.i_start + p_sys->block.i_size < i_pos ) { if( AStreamRefillBlock( s ) ) @@ -712,7 +945,6 @@ static int AStreamSeekBlock( stream_t *s, int64_t i_pos ) static int AStreamRefillBlock( stream_t *s ) { stream_sys_t *p_sys = s->p_sys; - access_t *p_access = p_sys->p_access; int64_t i_start, i_stop; block_t *b; @@ -740,35 +972,40 @@ static int AStreamRefillBlock( stream_t *s ) i_start = mdate(); for( ;; ) { - if( s->b_die ) - return VLC_EGENERIC; + vlc_bool_t b_eof; + + if( s->b_die ) return VLC_EGENERIC; /* Fetch a block */ - if( ( b = p_access->pf_block( p_access ) ) ) - break; + if( ( b = AReadBlock( s, &b_eof ) ) ) break; - if( p_access->info.b_eof ) - return VLC_EGENERIC; + 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; + while( b ) + { + i_stop = mdate(); - /* Fix p_current */ - if( p_sys->block.p_current == NULL ) - p_sys->block.p_current = b; + /* 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; - /* 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++; + /* 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++; + b = b->p_next; + i_start = mdate(); + } return VLC_SUCCESS; } @@ -783,26 +1020,42 @@ static int AStreamReadStream( stream_t *s, void *p_read, int i_read ) 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; + uint8_t *p_data = (uint8_t *)p_read; int i_data = 0; - if( tk->i_start >= tk->i_end ) - return 0; /* EOF */ + if( tk->i_start >= tk->i_end ) return 0; /* EOF */ + + if( p_read == 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; + } - /*msg_Dbg( s, "AStreamReadStream: %d pos=%lld tk=%d start=%lld offset=%d end=%lld", - i_read, - p_sys->i_pos, - p_sys->stream.i_tk, - tk->i_start, p_sys->stream.i_offset, tk->i_end );*/ +#ifdef STREAM_DEBUG + 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_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 ); + /* msg_Dbg( s, "AStreamReadStream: copy %d", i_copy ); */ if( p_data ) { memcpy( p_data, &tk->p_buffer[i_off], i_copy ); @@ -821,9 +1074,8 @@ static int AStreamReadStream( stream_t *s, void *p_read, int i_read ) { if( AStreamRefillStream( s ) ) { - /* Eof */ - if( tk->i_start >= tk->i_end ) - break; + /* EOF */ + if( tk->i_start >= tk->i_end ) break; } } } @@ -831,20 +1083,20 @@ static int AStreamReadStream( stream_t *s, void *p_read, int i_read ) return i_data; } -static int AStreamPeekStream( stream_t *s, uint8_t **pp_peek, int i_read ) +static int AStreamPeekStream( stream_t *s, const uint8_t **pp_peek, int i_read ) { 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( tk->i_start >= tk->i_end ) return 0; /* EOF */ - /*msg_Dbg( s, "AStreamPeekStream: %d pos=%lld tk=%d start=%lld offset=%d end=%lld", - i_read, - p_sys->i_pos, - p_sys->stream.i_tk, - tk->i_start, p_sys->stream.i_offset, tk->i_end );*/ +#ifdef STREAM_DEBUG + 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 ) @@ -852,8 +1104,13 @@ static int AStreamPeekStream( stream_t *s, uint8_t **pp_peek, int i_read ) while( tk->i_end - tk->i_start - p_sys->stream.i_offset < i_read ) { - if( AStreamRefillStream( s ) ) - break; + 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( tk->i_end - tk->i_start - p_sys->stream.i_offset < i_read ) @@ -869,13 +1126,19 @@ static int AStreamPeekStream( stream_t *s, uint8_t **pp_peek, int i_read ) if( p_sys->i_peek < i_read ) { - if( p_sys->p_peek ) free( p_sys->p_peek ); + p_sys->p_peek = realloc( p_sys->p_peek, i_read ); + if( !p_sys->p_peek ) + { + p_sys->i_peek = 0; + return 0; + } p_sys->i_peek = i_read; - p_sys->p_peek = malloc( 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) ); + 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; @@ -891,21 +1154,41 @@ static int AStreamSeekStream( stream_t *s, int64_t i_pos ) int i_new; int i; - /* - msg_Dbg( s, "AStreamSeekStream: to %lld pos=%lld tk=%d start=%lld offset=%d end=%lld", - 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 );*/ +#ifdef STREAM_DEBUG + 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" ); + stream_track_t *tk = &p_sys->stream.tk[p_sys->stream.i_tk]; +#ifdef STREAM_DEBUG + msg_Dbg( s, "AStreamSeekStream: current track" ); +#endif p_sys->i_pos = i_pos; - p_sys->stream.i_offset = i_pos - p_sys->stream.tk[p_sys->stream.i_tk].i_start; + p_sys->stream.i_offset = i_pos - tk->i_start; + + /* If there is not enough data left in the track, refill */ + /* \todo How to get a correct value for + * - refilling threshold + * - how much to refill + */ + if( (tk->i_end - tk->i_start ) - p_sys->stream.i_offset < + p_sys->stream.i_read_size ) + { + if( p_sys->stream.i_used < STREAM_READ_ATONCE / 2 ) + { + p_sys->stream.i_used = STREAM_READ_ATONCE / 2 ; + AStreamRefillStream( s ); + } + } return VLC_SUCCESS; } @@ -913,6 +1196,7 @@ static int AStreamSeekStream( stream_t *s, int64_t i_pos ) if( !b_aseek ) { /* We can't do nothing */ + msg_Dbg( s, "AStreamSeekStream: can't seek" ); return VLC_EGENERIC; } @@ -926,12 +1210,13 @@ static int AStreamSeekStream( stream_t *s, int64_t i_pos ) if( i_pos >= tk->i_start && i_pos <= tk->i_end ) { - /*msg_Dbg( s, "AStreamSeekStream: reusing %d start=%lld end=%lld", - i, - tk->i_start, tk->i_end );*/ +#ifdef STREAM_DEBUG + 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( p_access->pf_seek( p_access, tk->i_end ) ) - return VLC_EGENERIC; + if( ASeek( s, tk->i_end ) ) return VLC_EGENERIC; /* That's it */ p_sys->i_pos = i_pos; @@ -941,7 +1226,7 @@ static int AStreamSeekStream( stream_t *s, int64_t i_pos ) if( p_sys->stream.i_used < 1024 ) p_sys->stream.i_used = 1024; - if( AStreamRefillStream( s ) ) + if( AStreamRefillStream( s ) && i_pos == tk->i_end ) return VLC_EGENERIC; return VLC_SUCCESS; @@ -973,8 +1258,7 @@ static int AStreamSeekStream( stream_t *s, int64_t i_pos ) #endif /* Nothing good, seek and choose oldest segment */ - if( p_access->pf_seek( p_access, i_pos ) ) - return VLC_EGENERIC; + if( ASeek( s, i_pos ) ) return VLC_EGENERIC; p_sys->i_pos = i_pos; i_new = 0; @@ -1003,13 +1287,21 @@ static int AStreamSeekStream( stream_t *s, int64_t i_pos ) static int AStreamRefillStream( stream_t *s ) { stream_sys_t *p_sys = s->p_sys; - access_t *p_access = p_sys->p_access; 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 ) ); + + /* 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; - //msg_Dbg( s, "AStreamRefillStream: toread=%d", i_toread ); + if( i_toread <= 0 ) return VLC_EGENERIC; /* EOF */ + +#ifdef STREAM_DEBUG + msg_Dbg( s, "AStreamRefillStream: used=%d toread=%d", + p_sys->stream.i_used, i_toread ); +#endif i_start = mdate(); while( i_toread > 0 ) @@ -1021,8 +1313,9 @@ static int AStreamRefillStream( stream_t *s ) return VLC_EGENERIC; i_read = __MIN( i_toread, STREAM_CACHE_TRACK_SIZE - i_off ); - i_read = p_access->pf_read( p_access, &tk->p_buffer[i_off], i_read ); - //msg_Dbg( s, "AStreamRefillStream: read=%d", i_read ); + i_read = AReadStream( s, &tk->p_buffer[i_off], i_read ); + + /* msg_Dbg( s, "AStreamRefillStream: read=%d", i_read ); */ if( i_read < 0 ) { msleep( STREAM_DATA_WAIT ); @@ -1030,8 +1323,10 @@ static int AStreamRefillStream( stream_t *s ) } else if( i_read == 0 ) { - return VLC_EGENERIC; + if( !b_read ) return VLC_EGENERIC; + return VLC_SUCCESS; } + b_read = VLC_TRUE; /* Update end */ tk->i_end += i_read; @@ -1045,7 +1340,6 @@ static int AStreamRefillStream( stream_t *s ) p_sys->stream.i_offset -= i_invalid; } - i_toread -= i_read; p_sys->stream.i_used -= i_read; @@ -1066,8 +1360,11 @@ static void AStreamPrebufferStream( stream_t *s ) 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" ); + msg_Dbg( s, "pre-buffering..." ); i_start = mdate(); for( ;; ) { @@ -1076,9 +1373,8 @@ static void AStreamPrebufferStream( stream_t *s ) int64_t i_date = mdate(); int i_read; - if( s->b_die || - tk->i_end >= STREAM_CACHE_PREBUFFER_SIZE || - ( i_first > 0 && i_first + STREAM_CACHE_PREBUFFER_LENGTH < i_date ) ) + if( s->b_die || tk->i_end >= i_prebuffer || + (i_first > 0 && i_first + STREAM_CACHE_PREBUFFER_LENGTH < i_date) ) { int64_t i_byterate; @@ -1088,7 +1384,8 @@ static void AStreamPrebufferStream( stream_t *s ) i_byterate = ( I64C(1000000) * p_sys->stat.i_bytes ) / (p_sys->stat.i_read_time+1); - msg_Dbg( s, "prebuffering done %lld bytes in %llds - %lld kbytes/s", + msg_Dbg( s, "pre-buffering 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 ); @@ -1096,8 +1393,9 @@ static void AStreamPrebufferStream( stream_t *s ) } /* */ - i_read = __MIN( p_sys->stream.i_read_size, STREAM_CACHE_TRACK_SIZE - tk->i_end ); - i_read = p_access->pf_read( p_access, &tk->p_buffer[tk->i_end], i_read ); + 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 ); @@ -1110,7 +1408,10 @@ static void AStreamPrebufferStream( stream_t *s ) } if( i_first == 0 ) + { i_first = mdate(); + msg_Dbg( s, "received first data for our buffer"); + } tk->i_end += i_read; @@ -1125,38 +1426,526 @@ static void AStreamPrebufferStream( stream_t *s ) /** * Read from the stream untill first newline. * \param s Stream handle to read from - * \return A null-terminated string. This must be freed, + * \return A pointer to the allocated output string. You need to free this when you are done. */ -/* FIXME don't use stupid MAX_LINE -> do the same than net_ReadLine */ -#define MAX_LINE 1024 -char *stream_ReadLine( stream_t *s ) +#define STREAM_PROBE_LINE 2048 +#define STREAM_LINE_MAX (2048*100) +char * stream_ReadLine( stream_t *s ) { - uint8_t *p_data; - char *p_line; - int i_data; - int i = 0; - i_data = stream_Peek( s, &p_data, MAX_LINE ); + char *p_line = NULL; + int i_line = 0, i_read = 0; - while( i < i_data && p_data[i] != '\n' && p_data[i] != '\r' ) + while( i_read < STREAM_LINE_MAX ) { - i++; + char *psz_eol; + const uint8_t *p_data; + int i_data; + int64_t i_pos; + + /* Probe new data */ + i_data = stream_Peek( s, &p_data, STREAM_PROBE_LINE ); + if( i_data <= 0 ) break; /* No more data */ + + /* BOM detection */ + i_pos = stream_Tell( s ); + if( i_pos == 0 && i_data > 4 ) + { + int i_bom_size = 0; + char *psz_encoding = NULL; + + if( p_data[0] == 0xEF && p_data[1] == 0xBB && p_data[2] == 0xBF ) + { + psz_encoding = strdup( "UTF-8" ); + i_bom_size = 3; + } + else if( p_data[0] == 0x00 && p_data[1] == 0x00 ) + { + if( p_data[2] == 0xFE && p_data[3] == 0xFF ) + { + psz_encoding = strdup( "UTF-32BE" ); + s->i_char_width = 4; + i_bom_size = 4; + } + } + else if( p_data[0] == 0xFF && p_data[1] == 0xFE ) + { + if( p_data[2] == 0x00 && p_data[3] == 0x00 ) + { + psz_encoding = strdup( "UTF-32LE" ); + s->i_char_width = 4; + s->b_little_endian = VLC_TRUE; + i_bom_size = 4; + } + else + { + psz_encoding = strdup( "UTF-16LE" ); + s->b_little_endian = VLC_TRUE; + s->i_char_width = 2; + i_bom_size = 2; + } + } + else if( p_data[0] == 0xFE && p_data[1] == 0xFF ) + { + psz_encoding = strdup( "UTF-16BE" ); + s->i_char_width = 2; + i_bom_size = 2; + } + + /* Seek past the BOM */ + if( i_bom_size ) + { + stream_Seek( s, i_bom_size ); + p_data += i_bom_size; + i_data -= i_bom_size; + } + + /* Open the converter if we need it */ + if( psz_encoding != NULL ) + { + input_thread_t *p_input; + msg_Dbg( s, "%s BOM detected", psz_encoding ); + p_input = (input_thread_t *)vlc_object_find( s, VLC_OBJECT_INPUT, FIND_PARENT ); + if( s->i_char_width > 1 ) + { + s->conv = vlc_iconv_open( "UTF-8", psz_encoding ); + if( s->conv == (vlc_iconv_t)-1 ) + { + msg_Err( s, "iconv_open failed" ); + } + } + if( p_input != NULL) + { + var_Create( p_input, "subsdec-encoding", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); + var_SetString( p_input, "subsdec-encoding", "UTF-8" ); + vlc_object_release( p_input ); + } + free( psz_encoding ); + } + } + + if( i_data % s->i_char_width ) + { + /* keep i_char_width boundary */ + i_data = i_data - ( i_data % s->i_char_width ); + msg_Warn( s, "the read is not i_char_width compatible"); + } + + if( i_data == 0 ) + break; + + /* Check if there is an EOL */ + if( s->i_char_width == 1 ) + { + /* UTF-8: 0A */ + psz_eol = memchr( p_data, '\n', i_data ); + } + else + { + const uint8_t *p = p_data; + const uint8_t *p_last = p + i_data - s->i_char_width; + + if( s->i_char_width == 2 ) + { + if( s->b_little_endian == VLC_TRUE) + { + /* UTF-16LE: 0A 00 */ + while( p <= p_last && ( p[0] != 0x0A || p[1] != 0x00 ) ) + p += 2; + } + else + { + /* UTF-16BE: 00 0A */ + while( p <= p_last && ( p[1] != 0x0A || p[0] != 0x00 ) ) + p += 2; + } + } + else if( s->i_char_width == 4 ) + { + if( s->b_little_endian == VLC_TRUE) + { + /* UTF-32LE: 0A 00 00 00 */ + while( p <= p_last && ( p[0] != 0x0A || p[1] != 0x00 || + p[2] != 0x00 || p[3] != 0x00 ) ) + p += 4; + } + else + { + /* UTF-32BE: 00 00 00 0A */ + while( p <= p_last && ( p[3] != 0x0A || p[2] != 0x00 || + p[1] != 0x00 || p[0] != 0x00 ) ) + p += 4; + } + } + + if( p > p_last ) + { + psz_eol = NULL; + } + else + { + psz_eol = (char *)p + ( s->i_char_width - 1 ); + } + } + + if(psz_eol) + { + i_data = (psz_eol - (char *)p_data) + 1; + p_line = realloc( p_line, i_line + i_data + s->i_char_width ); /* add \0 */ + if( !p_line ) + { + msg_Err( s, "Out of memory when reallocating p_line" ); + goto error; + } + i_data = stream_Read( s, &p_line[i_line], i_data ); + if( i_data <= 0 ) break; /* Hmmm */ + i_line += i_data - s->i_char_width; /* skip \n */; + i_read += i_data; + + /* We have our line */ + break; + } + + /* Read data (+1 for easy \0 append) */ + p_line = realloc( p_line, i_line + STREAM_PROBE_LINE + s->i_char_width ); + if( !p_line ) + { + msg_Err( s, "Out of memory when reallocating p_line" ); + goto error; + } + 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; } - if( i_data <= 0 ) + + if( i_read > 0 ) { - return NULL; + int j; + for( j = 0; j < s->i_char_width; j++ ) + { + p_line[i_line + j] = '\0'; + } + i_line += s->i_char_width; /* the added \0 */ + if( s->i_char_width > 1 ) + { + size_t i_in = 0, i_out = 0; + const char * p_in = NULL; + char * p_out = NULL; + char * psz_new_line = NULL; + + /* iconv */ + psz_new_line = malloc( i_line ); + if( psz_new_line == NULL ) + { + msg_Err( s, "Out of memory when allocating psz_new_line" ); + goto error; + } + i_in = i_out = (size_t)i_line; + p_in = p_line; + p_out = psz_new_line; + + if( vlc_iconv( s->conv, &p_in, &i_in, &p_out, &i_out ) == (size_t)-1 ) + { + msg_Err( s, "iconv failed" ); + msg_Dbg( s, "original: %d, in %d, out %d", i_line, (int)i_in, (int)i_out ); + } + if( p_line ) free( p_line ); + p_line = psz_new_line; + i_line = (size_t)i_line - i_out; /* does not include \0 */ + } + + /* Remove trailing LF/CR */ + while( i_line >= 2 && ( p_line[i_line-2] == '\r' || + p_line[i_line-2] == '\n') ) i_line--; + + /* Make sure the \0 is there */ + p_line[i_line-1] = '\0'; + + return p_line; } - else + +error: + + /* We failed to read any data, probably EOF */ + free( p_line ); + if( s->conv != (vlc_iconv_t)(-1) ) vlc_iconv_close( s->conv ); + 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; + input_thread_t *p_input = NULL; + int i_read_orig = i_read; + int i_total = 0; + + if( s->p_parent && s->p_parent->p_parent && + s->p_parent->p_parent->i_object_type == VLC_OBJECT_INPUT ) + p_input = (input_thread_t *)s->p_parent->p_parent; + + if( !p_sys->i_list ) { - p_line = malloc( i + 1 ); - if( p_line == NULL ) + i_read = p_access->pf_read( p_access, p_read, i_read ); + if( p_input ) { - msg_Err( s, "out of memory" ); - return NULL; + vlc_object_yield( p_input ); + vlc_mutex_lock( &p_input->p->counters.counters_lock ); + stats_UpdateInteger( s, p_input->p->counters.p_read_bytes, i_read, + &i_total ); + stats_UpdateFloat( s, p_input->p->counters.p_input_bitrate, + (float)i_total, NULL ); + stats_UpdateInteger( s, p_input->p->counters.p_read_packets, 1, NULL ); + vlc_mutex_unlock( &p_input->p->counters.counters_lock ); + vlc_object_release( p_input ); } - i = stream_Read( s, p_line, i + 1 ); - p_line[ i - 1 ] = '\0'; + return i_read; + } - return p_line; + 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, "", 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 ); + } + + /* Update read bytes in input */ + if( p_input ) + { + vlc_object_yield( p_input ); + vlc_mutex_lock( &p_input->p->counters.counters_lock ); + stats_UpdateInteger( s, p_input->p->counters.p_read_bytes, i_read, &i_total ); + stats_UpdateFloat( s, p_input->p->counters.p_input_bitrate, + (float)i_total, NULL ); + stats_UpdateInteger( s, p_input->p->counters.p_read_packets, 1, NULL ); + vlc_mutex_unlock( &p_input->p->counters.counters_lock ); + vlc_object_release( p_input ); } + 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; + input_thread_t *p_input = NULL; + block_t *p_block; + vlc_bool_t b_eof; + int i_total = 0; + + if( s->p_parent && s->p_parent->p_parent && + s->p_parent->p_parent->i_object_type == VLC_OBJECT_INPUT ) + p_input = (input_thread_t *)s->p_parent->p_parent; + + if( !p_sys->i_list ) + { + p_block = p_access->pf_block( p_access ); + if( pb_eof ) *pb_eof = p_access->info.b_eof; + if( p_input && p_block && p_access->p_libvlc->b_stats ) + { + vlc_object_yield( p_input ); + vlc_mutex_lock( &p_input->p->counters.counters_lock ); + stats_UpdateInteger( s, p_input->p->counters.p_read_bytes, + p_block->i_buffer, &i_total ); + stats_UpdateFloat( s, p_input->p->counters.p_input_bitrate, + (float)i_total, NULL ); + stats_UpdateInteger( s, p_input->p->counters.p_read_packets, 1, NULL ); + vlc_mutex_unlock( &p_input->p->counters.counters_lock ); + vlc_object_release( p_input ); + } + return p_block; + } + + 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 ) + { + 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, "", 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 ); + } + if( p_block ) + { + if( p_input ) + { + vlc_object_yield( p_input ); + vlc_mutex_lock( &p_input->p->counters.counters_lock ); + stats_UpdateInteger( s, p_input->p->counters.p_read_bytes, + p_block->i_buffer, &i_total ); + stats_UpdateFloat( s, p_input->p->counters.p_input_bitrate, + (float)i_total, NULL ); + stats_UpdateInteger( s, p_input->p->counters.p_read_packets, + 1 , NULL); + vlc_mutex_unlock( &p_input->p->counters.counters_lock ); + vlc_object_release( p_input ); + } + } + 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 ) + { + p_list_access = + access2_New( s, p_access->psz_access, "", psz_name, 0 ); + } + else if( i != p_sys->i_list_index ) + { + p_list_access = p_access; + } + + if( p_list_access ) + { + 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_access->pf_seek( p_access, i_pos ); +} + + +/** + * 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_read, int i_read ) +{ + return s->pf_read( s, p_read, i_read ); +} + +/** + * 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, const uint8_t **pp_peek, int i_peek ) +{ + return s->pf_peek( s, pp_peek, i_peek ); +} + +/** + * 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_vaControl( stream_t *s, int i_query, va_list args ) +{ + return s->pf_control( s, i_query, args ); +} + +/** + * Destroy a stream + */ +void stream_Delete( stream_t *s ) +{ + s->pf_destroy( s ); +} + +int stream_Control( stream_t *s, int i_query, ... ) +{ + va_list args; + int i_result; + + if ( s == NULL ) + return VLC_EGENERIC; + + va_start( args, i_query ); + i_result = s->pf_control( s, i_query, args ); + va_end( args ); + return i_result; +} + +/** + * Read "i_size" bytes and store them in a block_t. + * It always read i_size bytes unless you are at the end of the stream + * where it return what is available. + */ +block_t *stream_Block( stream_t *s, int i_size ) +{ + if( i_size <= 0 ) return NULL; + + /* emulate block read */ + block_t *p_bk = block_New( s, i_size ); + if( p_bk ) + { + p_bk->i_buffer = stream_Read( s, p_bk->p_buffer, i_size ); + if( p_bk->i_buffer > 0 ) + { + return p_bk; + } + } + if( p_bk ) block_Release( p_bk ); + return NULL; +}