X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finput%2Fstream.c;h=c3bec91be25c6cdf8236539f401ed791be84dad0;hb=e56193e811c52c1f0945524e47f0f9aa4069d5e0;hp=2cb50efe5b3a51ccebbed3d4c38f95a85e3d47f3;hpb=01aca2cc006e2c2ef00bc5ca723180e27ab15a76;p=vlc diff --git a/src/input/stream.c b/src/input/stream.c index 2cb50efe5b..c3bec91be2 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 @@ -27,6 +27,8 @@ #include "input_internal.h" +#undef STREAM_DEBUG + /* TODO: * - tune the 2 methods * - compute cost for seek @@ -41,16 +43,22 @@ * 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 */ +/* 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 @@ -81,8 +89,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,6 +117,7 @@ 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 */ @@ -116,6 +133,7 @@ struct stream_sys_t /* */ int i_used; /* Used since last read */ int i_read_size; + } stream; /* Peek temporary buffer */ @@ -135,38 +153,81 @@ 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; + 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, 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, 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_UrlNew( vlc_object_t *p_parent, const char *psz_url ) +{ + 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; + if( !s ) return NULL; /* Attach it now, needed for b_die */ vlc_object_attach( s, p_access ); @@ -175,9 +236,15 @@ stream_t *stream_AccessNew( access_t *p_access, vlc_bool_t b_quick ) 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 ) ); + /* 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; p_sys->b_block = p_access->pf_block ? VLC_TRUE : VLC_FALSE; @@ -191,8 +258,61 @@ stream_t *stream_AccessNew( access_t *p_access, vlc_bool_t b_quick ) 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) ); + 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; @@ -275,30 +395,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: ****************************************************************************/ @@ -350,7 +481,17 @@ void stream_AccessReset( stream_t *s ) 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; + } + } } /**************************************************************************** @@ -369,6 +510,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; @@ -399,8 +548,9 @@ 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 - && i_int != ACCESS_SET_PRIVATE_ID_CA ) + 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 !!!" ); @@ -433,6 +583,7 @@ 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 || @@ -455,27 +606,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; @@ -496,7 +659,7 @@ static int AStreamReadBlock( stream_t *s, void *p_read, int i_read ) if( p_read == NULL ) { - /* seek within this stream if possible, else use plain old read and discard */ + /* 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; @@ -562,10 +725,13 @@ 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 */ @@ -574,12 +740,10 @@ static int AStreamPeekBlock( stream_t *s, uint8_t **pp_peek, int 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 */ @@ -688,8 +852,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 */ @@ -716,7 +879,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 ) ) @@ -745,7 +908,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; @@ -773,35 +935,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; } @@ -823,7 +990,7 @@ static int AStreamReadStream( stream_t *s, void *p_read, int i_read ) if( p_read == NULL ) { - /* seek within this stream if possible, else use plain old read and discard */ + /* 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; @@ -832,7 +999,7 @@ static int AStreamReadStream( stream_t *s, void *p_read, int i_read ) return AStreamSeekStream( s, p_sys->i_pos + i_read ) ? 0 : i_read; } -#if 0 +#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, @@ -887,7 +1054,7 @@ static int AStreamPeekStream( stream_t *s, uint8_t **pp_peek, int i_read ) if( tk->i_start >= tk->i_end ) return 0; /* EOF */ -#if 0 +#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, @@ -903,10 +1070,10 @@ static int AStreamPeekStream( stream_t *s, uint8_t **pp_peek, int i_read ) 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); + p_sys->stream.i_used += i_read - + (tk->i_end - tk->i_start - p_sys->stream.i_offset); } - if( AStreamRefillStream( s ) ) - break; + if( AStreamRefillStream( s ) ) break; } if( tk->i_end - tk->i_start - p_sys->stream.i_offset < i_read ) @@ -922,9 +1089,13 @@ 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], @@ -946,9 +1117,9 @@ static int AStreamSeekStream( stream_t *s, int64_t i_pos ) int i_new; int i; -#if 0 +#ifdef STREAM_DEBUG msg_Dbg( s, "AStreamSeekStream: to "I64Fd" pos="I64Fd - "tk=%d start="I64Fd" offset=%d end="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, @@ -960,9 +1131,27 @@ static int AStreamSeekStream( stream_t *s, int64_t i_pos ) 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; } @@ -984,13 +1173,13 @@ static int AStreamSeekStream( stream_t *s, int64_t i_pos ) if( i_pos >= tk->i_start && i_pos <= tk->i_end ) { -#if 0 +#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; @@ -1032,8 +1221,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; @@ -1062,7 +1250,6 @@ 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 */ @@ -1074,7 +1261,10 @@ static int AStreamRefillStream( stream_t *s ) if( i_toread <= 0 ) return VLC_EGENERIC; /* EOF */ - /* msg_Dbg( s, "AStreamRefillStream: toread=%d", i_toread ); */ +#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 ) @@ -1086,7 +1276,7 @@ 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 ); + i_read = AReadStream( s, &tk->p_buffer[i_off], i_read ); /* msg_Dbg( s, "AStreamRefillStream: read=%d", i_read ); */ if( i_read < 0 ) @@ -1096,8 +1286,7 @@ static int AStreamRefillStream( stream_t *s ) } else if( i_read == 0 ) { - if( !b_read ) - return VLC_EGENERIC; + if( !b_read ) return VLC_EGENERIC; return VLC_SUCCESS; } b_read = VLC_TRUE; @@ -1135,8 +1324,8 @@ 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 : - ((s->p_sys->p_access->info.i_title > 1 || - s->p_sys->p_access->info.i_seekpoint > 1) ? STREAM_CACHE_PREBUFFER_SIZE : STREAM_CACHE_TRACK_SIZE / 3); + ( (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(); @@ -1169,8 +1358,7 @@ static void AStreamPrebufferStream( stream_t *s ) /* */ i_read = STREAM_CACHE_TRACK_SIZE - tk->i_end; i_read = __MIN( p_sys->stream.i_read_size, i_read ); - i_read = p_access->pf_read( p_access, &tk->p_buffer[tk->i_end], - i_read ); + i_read = AReadStream( s, &tk->p_buffer[tk->i_end], i_read ); if( i_read < 0 ) { msleep( STREAM_DATA_WAIT ); @@ -1201,11 +1389,11 @@ 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. */ #define STREAM_PROBE_LINE 2048 #define STREAM_LINE_MAX (2048*100) -char *stream_ReadLine( stream_t *s ) +char * stream_ReadLine( stream_t *s ) { char *p_line = NULL; int i_line = 0, i_read = 0; @@ -1215,19 +1403,98 @@ char *stream_ReadLine( stream_t *s ) char *psz_eol; 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 ) + { + msg_Dbg( s, "%s BOM detected", psz_encoding ); + 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( psz_encoding ) free( psz_encoding ); + } + } + + if( i_data % s->i_char_width ) + { + msg_Warn( s, "the read is not i_char_width compatible"); + } + /* Check if there is an EOL */ if( ( psz_eol = memchr( p_data, '\n', i_data ) ) ) { + if( s->b_little_endian == VLC_TRUE && s->i_char_width > 1 ) + { + psz_eol += ( s->i_char_width - 1 ); + } i_data = (psz_eol - (char *)p_data) + 1; - p_line = realloc( p_line, i_line + i_data + 1 ); + p_line = realloc( p_line, i_line + i_data + s->i_char_width ); /* add \0 */ i_data = stream_Read( s, &p_line[i_line], i_data ); if( i_data <= 0 ) break; /* Hmmm */ - i_line += (i_data - 1); + i_line += i_data - s->i_char_width; /* skip \n */; i_read += i_data; /* We have our line */ @@ -1235,24 +1502,197 @@ char *stream_ReadLine( stream_t *s ) } /* Read data (+1 for easy \0 append) */ - p_line = realloc( p_line, i_line + STREAM_PROBE_LINE + 1 ); + p_line = realloc( p_line, i_line + STREAM_PROBE_LINE + s->i_char_width ); 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; } - /* 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 ) { - p_line[i_line] = '\0'; + 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; + char * p_in = NULL; + char * p_out = NULL; + char * psz_new_line = NULL; + + /* iconv */ + psz_new_line = malloc( i_line ); + + 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 > 0 && ( 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; } /* We failed to read any data, probably EOF */ if( p_line ) 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; + int i_read_orig = i_read; + + if( !p_sys->i_list ) + { + i_read = p_access->pf_read( p_access, p_read, i_read ); + stats_UpdateInteger( s->p_parent->p_parent , "read_bytes", i_read ); + stats_UpdateInteger( s->p_parent->p_parent , "input_bitrate", i_read ); + stats_UpdateInteger( s->p_parent->p_parent , "read_packets", 1 ); + 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 ); + } + + /* Update read bytes in input */ + stats_UpdateInteger( s->p_parent->p_parent , "read_bytes", i_read ); + stats_UpdateInteger( s->p_parent->p_parent , "input_bitrate", i_read ); + stats_UpdateInteger( s->p_parent->p_parent , "read_packets", 1 ); + 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; + } + + 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, 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 ) + { + 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; + } + + 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 ); +}