X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finput%2Fstream.c;h=23276e31a9b4a4a43447166ceb0d85c828b95627;hb=2f9d9766dfe25f100ef04d0d812aebdd18401c0d;hp=e6c26b2497c77719fe7c2d86f3e3dcac76a675d4;hpb=62fb058cf20e03deab925bbcc89bd7524a6c10bc;p=vlc diff --git a/src/input/stream.c b/src/input/stream.c index e6c26b2497..23276e31a9 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,573 +18,1927 @@ * * 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 -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif -#include "ninput.h" +#include +#include + +#include +#include +#include +#include + +#include + +#include "access.h" +#include "stream.h" + +#include "input_internal.h" + +// #define STREAM_DEBUG 1 + +/* TODO: + * - tune the 2 methods (block/stream) + * - compute cost for seek + * - improve stream mode seeking with closest segments + * - ... + */ + +/* Two methods: + * - using pf_block + * One linked list of data read + * - using pf_read + * More complex scheme using mutliple track to avoid seeking + * - using directly the access (only indirection for peeking). + * This method is known to introduce much less latency. + * It should probably defaulted (instead of the stream method (2)). + */ + +/* 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 + * XXX it should be small to avoid useless latency but big enough for + * efficient demux probing */ +#define STREAM_CACHE_PREBUFFER_SIZE (128) + +/* 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 + */ + +/* 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 1024 +#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 +{ + char *psz_path; + int64_t i_size; + +} access_entry_t; + +typedef enum +{ + STREAM_METHOD_BLOCK, + STREAM_METHOD_STREAM +} stream_read_method_t; + +struct stream_sys_t +{ + access_t *p_access; + + stream_read_method_t method; /* method to use */ + + int64_t i_pos; /* Current reading offset */ + + /* Method 1: pf_block */ + struct + { + int64_t i_start; /* Offset of block for p_first */ + int64_t 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 */ + unsigned int i_peek; + uint8_t *p_peek; + + /* Stat for both method */ + struct + { + bool 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; +}; + +/* Method 1: */ +static int AStreamReadBlock( stream_t *s, void *p_read, unsigned int i_read ); +static int AStreamPeekBlock( stream_t *s, const uint8_t **p_peek, unsigned 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, bool *pb_eof ); + +/* Method 2 */ +static int AStreamReadStream( stream_t *s, void *p_read, unsigned int i_read ); +static int AStreamPeekStream( stream_t *s, const uint8_t **pp_peek, unsigned 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, unsigned 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_ReadLine: + * stream_CommonNew: create an empty stream structure ****************************************************************************/ -/** - * Read from the stream untill first newline. - * \param s Stream handle to read from - * \return A null-terminated string. This must be freed, - */ -/* FIXME don't use stupid MAX_LINE -> do the same than net_ReadLine */ -#define MAX_LINE 1024 -char *stream_ReadLine( stream_t *s ) +stream_t *stream_CommonNew( vlc_object_t *p_obj ) +{ + stream_t *s = (stream_t *)vlc_custom_create( p_obj, sizeof(*s), + VLC_OBJECT_GENERIC, "stream" ); + + if( !s ) + return NULL; + + s->p_text = malloc( sizeof(*s->p_text) ); + if( !s->p_text ) + { + vlc_object_release( s ); + return NULL; + } + + /* UTF16 and UTF32 text file conversion */ + s->p_text->conv = (vlc_iconv_t)(-1); + s->p_text->i_char_width = 1; + s->p_text->b_little_endian = false; + + return s; +} +void stream_CommonDelete( stream_t *s ) +{ + if( s->p_text ) + { + if( s->p_text->conv != (vlc_iconv_t)(-1) ) + vlc_iconv_close( s->p_text->conv ); + free( s->p_text ); + } + free( s->psz_path ); + vlc_object_release( s ); +} + +/**************************************************************************** + * stream_UrlNew: create a stream from a access + ****************************************************************************/ +stream_t *__stream_UrlNew( vlc_object_t *p_parent, const char *psz_url ) +{ + const char *psz_access, *psz_demux; + char *psz_path; + access_t *p_access; + stream_t *p_res; + + if( !psz_url ) + return NULL; + + char psz_dup[strlen( psz_url ) + 1]; + strcpy( psz_dup, psz_url ); + input_SplitMRL( &psz_access, &psz_demux, &psz_path, psz_dup ); + + /* Now try a real access */ + p_access = access_New( p_parent, psz_access, psz_demux, psz_path ); + + 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, NULL ) ) ) + { + access_Delete( p_access ); + return NULL; + } + + p_res->pf_destroy = UStreamDestroy; + return p_res; +} + +stream_t *stream_AccessNew( access_t *p_access, char **ppsz_list ) +{ + stream_t *s = stream_CommonNew( VLC_OBJECT(p_access) ); + stream_sys_t *p_sys; + + if( !s ) + return NULL; + + s->psz_path = strdup( p_access->psz_path ); + s->p_sys = p_sys = malloc( sizeof( *p_sys ) ); + if( !s->psz_path || !s->p_sys ) + { + stream_CommonDelete( s ); + return NULL; + } + + /* Attach it now, needed for b_die */ + vlc_object_attach( s, p_access ); + + s->pf_read = NULL; /* Set up later */ + s->pf_peek = NULL; + s->pf_control = AStreamControl; + s->pf_destroy = AStreamDestroy; + + /* Common field */ + p_sys->p_access = p_access; + if( p_access->pf_block ) + p_sys->method = STREAM_METHOD_BLOCK; + else + p_sys->method = STREAM_METHOD_STREAM; + + p_sys->i_pos = p_access->info.i_pos; + + /* Stats */ + access_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; + + TAB_INIT( p_sys->i_list, p_sys->list ); + p_sys->i_list_index = 0; + p_sys->p_list_access = NULL; + + /* Get the additional list of inputs if any (for concatenation) */ + if( ppsz_list && ppsz_list[0] ) + { + access_entry_t *p_entry = malloc( sizeof(*p_entry) ); + if( !p_entry ) + goto error; + + p_entry->i_size = p_access->info.i_size; + p_entry->psz_path = strdup( p_access->psz_path ); + if( !p_entry->psz_path ) + { + free( p_entry ); + goto error; + } + p_sys->p_list_access = p_access; + TAB_APPEND( p_sys->i_list, p_sys->list, p_entry ); + msg_Dbg( p_access, "adding file `%s', (%"PRId64" bytes)", + p_entry->psz_path, p_access->info.i_size ); + + for( int i = 0; ppsz_list[i] != NULL; i++ ) + { + char *psz_name = strdup( ppsz_list[i] ); + + if( !psz_name ) + break; + + access_t *p_tmp = access_New( p_access, + p_access->psz_access, "", psz_name ); + if( !p_tmp ) + continue; + + msg_Dbg( p_access, "adding file `%s', (%"PRId64" bytes)", + psz_name, p_tmp->info.i_size ); + + p_entry = malloc( sizeof(*p_entry) ); + if( p_entry ) + { + 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 ); + } + access_Delete( p_tmp ); + } + } + + /* Peek */ + p_sys->i_peek = 0; + p_sys->p_peek = NULL; + + if( p_sys->method == STREAM_METHOD_BLOCK ) + { + msg_Dbg( s, "Using AStream*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; + + assert( p_sys->method == STREAM_METHOD_STREAM ); + + msg_Dbg( s, "Using AStream*Stream" ); + + 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 ); + if( p_sys->stream.p_buffer == NULL ) + goto error; + p_sys->stream.i_used = 0; + p_sys->stream.i_read_size = STREAM_READ_ATONCE; +#if STREAM_READ_ATONCE < 256 +# error "Invalid STREAM_READ_ATONCE value" +#endif + + 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->method == STREAM_METHOD_BLOCK ) + { + /* Nothing yet */ + } + else + { + 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( s->p_sys ); + vlc_object_detach( s ); + stream_CommonDelete( s ); + return NULL; +} + +/**************************************************************************** + * AStreamDestroy: + ****************************************************************************/ +static void AStreamDestroy( stream_t *s ) +{ + stream_sys_t *p_sys = s->p_sys; + + vlc_object_detach( s ); + + if( p_sys->method == STREAM_METHOD_BLOCK ) + block_ChainRelease( p_sys->block.p_first ); + else + free( p_sys->stream.p_buffer ); + + free( p_sys->p_peek ); + + if( p_sys->p_list_access && p_sys->p_list_access != p_sys->p_access ) + access_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] ); + } + + free( p_sys->list ); + free( p_sys ); + + stream_CommonDelete( s ); +} + +static void UStreamDestroy( stream_t *s ) +{ + access_t *p_access = (access_t *)s->p_parent; + AStreamDestroy( s ); + access_Delete( p_access ); +} + +/**************************************************************************** + * AStreamControlReset: + ****************************************************************************/ +static void AStreamControlReset( 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->method == STREAM_METHOD_BLOCK ) + { + 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; + + assert( p_sys->method == STREAM_METHOD_STREAM ); + + /* Setup our tracks */ + p_sys->stream.i_offset = 0; + p_sys->stream.i_tk = 0; + p_sys->stream.i_used = 0; + + 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; + } + + /* Do the prebuffering */ + AStreamPrebufferStream( s ); + } +} + +/**************************************************************************** + * AStreamControlUpdate: + ****************************************************************************/ +static void AStreamControlUpdate( 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: + ****************************************************************************/ +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; + + bool *p_bool; + int64_t *pi_64, i_64; + int i_int; + + switch( i_query ) + { + 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; + + case STREAM_CAN_SEEK: + p_bool = (bool*)va_arg( args, bool * ); + access_Control( p_access, ACCESS_CAN_SEEK, p_bool ); + break; + + case STREAM_CAN_FASTSEEK: + p_bool = (bool*)va_arg( args, bool * ); + access_Control( p_access, ACCESS_CAN_FASTSEEK, p_bool ); + break; + + case STREAM_GET_POSITION: + pi_64 = (int64_t*)va_arg( args, int64_t * ); + *pi_64 = p_sys->i_pos; + break; + + case STREAM_SET_POSITION: + i_64 = (int64_t)va_arg( args, int64_t ); + switch( p_sys->method ) + { + case STREAM_METHOD_BLOCK: + return AStreamSeekBlock( s, i_64 ); + case STREAM_METHOD_STREAM: + return AStreamSeekStream( s, i_64 ); + default: + assert(0); + return VLC_EGENERIC; + } + + 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 && + i_int != ACCESS_SET_TITLE && + i_int != ACCESS_SET_SEEKPOINT ) + { + msg_Err( s, "Hey, what are you thinking ?" + "DON'T USE STREAM_CONTROL_ACCESS !!!" ); + return VLC_EGENERIC; + } + int i_ret = access_vaControl( p_access, i_int, args ); + if( i_int == ACCESS_SET_TITLE || i_int == ACCESS_SET_SEEKPOINT ) + AStreamControlReset( s ); + return i_ret; + } + + case STREAM_UPDATE_SIZE: + AStreamControlUpdate( s ); + return VLC_SUCCESS; + + case STREAM_GET_CONTENT_TYPE: + return access_Control( p_access, ACCESS_GET_CONTENT_TYPE, + va_arg( args, char ** ) ); + case STREAM_SET_RECORD_STATE: + default: + msg_Err( s, "invalid stream_vaControl query=0x%x", i_query ); + return VLC_EGENERIC; + } + return VLC_SUCCESS; +} + +/**************************************************************************** + * Method 1: + ****************************************************************************/ +static void AStreamPrebufferBlock( stream_t *s ) +{ + 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( ;; ) + { + const int64_t i_date = mdate(); + bool b_eof; + block_t *b; + + if( s->b_die || p_sys->block.i_size > STREAM_CACHE_PREBUFFER_SIZE ) + { + 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 = ( INT64_C(1000000) * p_sys->stat.i_bytes ) / + (p_sys->stat.i_read_time + 1); + + msg_Dbg( s, "prebuffering done %"PRId64" bytes in %"PRId64"s - " + "%"PRId64" kbytes/s", + p_sys->stat.i_bytes, + p_sys->stat.i_read_time / INT64_C(1000000), + i_byterate / 1024 ); + break; + } + + /* Fetch a block */ + if( ( b = AReadBlock( s, &b_eof ) ) == NULL ) + { + if( b_eof ) + break; + 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( i_first == 0 ) + { + i_first = mdate(); + msg_Dbg( s, "received first data after %d ms", + (int)((i_first-i_start)/1000) ); + } + } + + p_sys->block.p_current = p_sys->block.p_first; +} + +static int AStreamRefillBlock( stream_t *s ); + +static int AStreamReadBlock( stream_t *s, void *p_read, unsigned int i_read ) +{ + stream_sys_t *p_sys = s->p_sys; + + uint8_t *p_data = p_read; + unsigned int i_data = 0; + + /* It means EOF */ + if( p_sys->block.p_current == NULL ) + return 0; + + if( p_data == 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; + bool b_aseek; + access_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; + unsigned int i_copy = __MIN( (unsigned int)__MAX(i_current,0), 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 ); + 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 needed */ + if( !p_sys->block.p_current && AStreamRefillBlock( s ) ) + { + break; + } + } + } + + p_sys->i_pos += i_data; + return i_data; +} + +static int AStreamPeekBlock( stream_t *s, const uint8_t **pp_peek, unsigned int i_read ) +{ + stream_sys_t *p_sys = s->p_sys; + uint8_t *p_data; + unsigned int i_data = 0; + block_t *b; + unsigned 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; + } + p_sys->i_peek = i_read; + } + + /* 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 ) + { + unsigned int i_current = __MAX(b->i_buffer - i_offset,0); + int i_copy = __MIN( i_current, i_read - i_data ); + + memcpy( p_data, &b->p_buffer[i_offset], i_copy ); + i_data += i_copy; + p_data += i_copy; + i_offset += i_copy; + + if( i_offset >= b->i_buffer ) + { + i_offset = 0; + b = b->p_next; + } + } + + *pp_peek = p_sys->p_peek; + return i_data; +} + +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; + bool 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; + } + + 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 ) + { + bool b_aseek; + access_Control( p_access, ACCESS_CAN_SEEK, &b_aseek ); + + if( !b_aseek ) + { + msg_Err( s, "backward seeking impossible (access not seekable)" ); + return VLC_EGENERIC; + } + + b_seek = true; + } + else + { + bool b_aseek, b_aseekfast; + + access_Control( p_access, ACCESS_CAN_SEEK, &b_aseek ); + access_Control( p_access, ACCESS_CAN_FASTSEEK, &b_aseekfast ); + + if( !b_aseek ) + { + b_seek = false; + msg_Warn( s, "%"PRId64" 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; + + /* 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; + + if( i_skip <= i_th * i_avg && + i_skip < STREAM_CACHE_SIZE ) + b_seek = false; + else + b_seek = true; + + msg_Dbg( s, "b_seek=%d th*avg=%d skip=%"PRId64, + b_seek, i_th*i_avg, i_skip ); + } + } + + 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 ) ) + 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 + { + do + { + /* Read and skip enough data */ + if( AStreamRefillBlock( s ) ) + return VLC_EGENERIC; + + while( p_sys->block.p_current && + p_sys->i_pos + p_sys->block.p_current->i_buffer - p_sys->block.i_offset < i_pos ) + { + p_sys->i_pos += p_sys->block.p_current->i_buffer - p_sys->block.i_offset; + p_sys->block.p_current = p_sys->block.p_current->p_next; + p_sys->block.i_offset = 0; + } + } + while( p_sys->block.i_start + p_sys->block.i_size < i_pos ); + + p_sys->block.i_offset += i_pos - p_sys->i_pos; + p_sys->i_pos = i_pos; + + return VLC_SUCCESS; + } + + return VLC_EGENERIC; +} + +static int AStreamRefillBlock( stream_t *s ) +{ + stream_sys_t *p_sys = s->p_sys; + 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 */ + const int64_t i_start = mdate(); + for( ;; ) + { + bool 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; + } + + p_sys->stat.i_read_time += mdate() - i_start; + 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; + + /* 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_count++; + + b = b->p_next; + } + return VLC_SUCCESS; +} + + +/**************************************************************************** + * Method 2: + ****************************************************************************/ +static int AStreamRefillStream( stream_t *s ); + +static int AStreamReadStream( stream_t *s, void *p_read, unsigned 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; + unsigned int i_data = 0; + + if( tk->i_start >= tk->i_end ) + return 0; /* EOF */ + + if( p_data == 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; + + bool b_aseek; + access_Control( p_access, ACCESS_CAN_SEEK, &b_aseek ); + if( b_aseek ) + { + const int64_t i_pos_wanted = p_sys->i_pos + i_read; + + if( AStreamSeekStream( s, i_pos_wanted ) ) + { + if( p_sys->i_pos != i_pos_wanted ) + return 0; + } + return i_read; + } + } + +#ifdef STREAM_DEBUG + msg_Dbg( s, "AStreamReadStream: %d pos=%"PRId64" tk=%d start=%"PRId64 + " offset=%d end=%"PRId64, + 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; + unsigned int i_current = + __MAX(0,__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_end - tk->i_start - p_sys->stream.i_offset <= i_read -i_data ) + { + const int i_read_requested = __MAX( __MIN( i_read - i_data, + STREAM_READ_ATONCE * 10 ), + STREAM_READ_ATONCE / 2 ); + + if( p_sys->stream.i_used < i_read_requested ) + p_sys->stream.i_used = i_read_requested; + + if( AStreamRefillStream( s ) ) + { + /* EOF */ + if( tk->i_start >= tk->i_end ) break; + } + } + } + + return i_data; +} + +static int AStreamPeekStream( stream_t *s, const uint8_t **pp_peek, unsigned 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 */ + +#ifdef STREAM_DEBUG + msg_Dbg( s, "AStreamPeekStream: %d pos=%"PRId64" tk=%d " + "start=%"PRId64" offset=%d end=%"PRId64, + 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 ) + { + 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 ) + 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 ) + { + *pp_peek = &tk->p_buffer[i_off]; + return i_read; + } + + 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; + } + 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; +} + +static int AStreamSeekStream( stream_t *s, int64_t i_pos ) { - uint8_t *p_data; - char *p_line; - int i_data; - int i = 0; - i_data = stream_Peek( s, &p_data, MAX_LINE ); + stream_sys_t *p_sys = s->p_sys; + access_t *p_access = p_sys->p_access; + bool b_aseek; + bool b_afastseek; + int i_maxth; + int i_new; + int i; + +#ifdef STREAM_DEBUG + msg_Dbg( s, "AStreamSeekStream: to %"PRId64" pos=%"PRId64 + " tk=%d start=%"PRId64" offset=%d end=%"PRId64, + 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 ) + { + 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 - 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; + } - while( i < i_data && p_data[i] != '\n' && p_data[i] != '\r' ) + access_Control( p_access, ACCESS_CAN_SEEK, &b_aseek ); + if( !b_aseek ) { - i++; + /* We can't do nothing */ + msg_Dbg( s, "AStreamSeekStream: can't seek" ); + return VLC_EGENERIC; } - if( i_data <= 0 ) + + /* Date the current track */ + p_sys->stream.tk[p_sys->stream.i_tk].i_date = mdate(); + + /* 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 ) + { +#ifdef STREAM_DEBUG + msg_Dbg( s, "AStreamSeekStream: reusing %d start=%"PRId64 + " end=%"PRId64, 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 < STREAM_READ_ATONCE ) + p_sys->stream.i_used = STREAM_READ_ATONCE; + + if( AStreamRefillStream( s ) && i_pos == tk->i_end ) + return VLC_EGENERIC; + + return VLC_SUCCESS; + } } - else + + access_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_line = malloc( i + 1 ); - if( p_line == NULL ) + 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_Err( s, "out of memory" ); - return NULL; + msg_Dbg( s, "good segment after current pos, TODO" ); } - i = stream_Read( s, p_line, i + 1 ); - p_line[ i - 1 ] = '\0'; + } +#endif - return p_line; + /* 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; -/* TODO: one day we should create a special module stream - * when we would have a access wrapper, and stream filter - * (like caching, progessive, gunzip, ... ) - */ + if( AStreamRefillStream( s ) ) + return VLC_EGENERIC; -/* private stream_sys_t for input_Stream* */ -typedef struct + return VLC_SUCCESS; +} + +static int AStreamRefillStream( stream_t *s ) { - input_thread_t *p_input; -} input_stream_sys_t; + stream_sys_t *p_sys = s->p_sys; + stream_track_t *tk = &p_sys->stream.tk[p_sys->stream.i_tk]; -/* private pf_* functions declarations */ -static int IStreamRead ( stream_t *, void *p_read, int i_read ); -static int IStreamPeek ( stream_t *, uint8_t **pp_peek, int i_peek ); -static int IStreamControl( stream_t *, int i_query, va_list ); + /* 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) ); + bool b_read = false; + int64_t i_start, i_stop; -/**************************************************************************** - * input_StreamNew: create a wrapper for p_input access - ****************************************************************************/ -stream_t *input_StreamNew( input_thread_t *p_input ) -{ - stream_t *s = vlc_object_create( p_input, sizeof( stream_t ) ); - input_stream_sys_t *p_sys; - if( s ) + 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 ) { - s->pf_block = NULL; - s->pf_read = IStreamRead; - s->pf_peek = IStreamPeek; - s->pf_control= IStreamControl; + int i_off = tk->i_end % STREAM_CACHE_TRACK_SIZE; + int i_read; + + 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 ) + { + continue; + } + else if( i_read == 0 ) + { + if( !b_read ) + return VLC_EGENERIC; + return VLC_SUCCESS; + } + b_read = 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 ) + { + int i_invalid = tk->i_end - tk->i_start - STREAM_CACHE_TRACK_SIZE; - s->p_sys = malloc( sizeof( input_stream_sys_t ) ); - p_sys = (input_stream_sys_t*)s->p_sys; - p_sys->p_input = p_input; + tk->i_start += i_invalid; + p_sys->stream.i_offset -= i_invalid; + } + + i_toread -= i_read; + p_sys->stream.i_used -= i_read; + + p_sys->stat.i_bytes += i_read; + p_sys->stat.i_read_count++; } - return s; -} + i_stop = mdate(); -/**************************************************************************** - * input_StreamDelete: - ****************************************************************************/ -void input_StreamDelete( stream_t *s ) -{ - free( s->p_sys ); - vlc_object_destroy( s ); -} + p_sys->stat.i_read_time += i_stop - i_start; + return VLC_SUCCESS; +} -/**************************************************************************** - * IStreamControl: - ****************************************************************************/ -static int IStreamControl( stream_t *s, int i_query, va_list args ) +static void AStreamPrebufferStream( stream_t *s ) { - input_stream_sys_t * p_sys = (input_stream_sys_t*)s->p_sys; - input_thread_t *p_input = p_sys->p_input; + stream_sys_t *p_sys = s->p_sys; - vlc_bool_t *p_b; - int64_t *p_i64, i64; - int *p_int; + int64_t i_first = 0; + int64_t i_start; - switch( i_query ) + msg_Dbg( s, "pre buffering" ); + i_start = mdate(); + for( ;; ) { - case STREAM_GET_SIZE: - p_i64 = (int64_t*) va_arg( args, int64_t * ); + stream_track_t *tk = &p_sys->stream.tk[p_sys->stream.i_tk]; - vlc_mutex_lock( &p_input->stream.stream_lock ); - *p_i64 = p_input->stream.p_selected_area->i_size; - vlc_mutex_unlock( &p_input->stream.stream_lock ); - return VLC_SUCCESS; + int64_t i_date = mdate(); + int i_read; - case STREAM_CAN_SEEK: - p_b = (vlc_bool_t*) va_arg( args, vlc_bool_t * ); + if( s->b_die || tk->i_end >= STREAM_CACHE_PREBUFFER_SIZE ) + { + 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 = ( INT64_C(1000000) * p_sys->stat.i_bytes ) / + (p_sys->stat.i_read_time+1); + + msg_Dbg( s, "pre-buffering done %"PRId64" bytes in %"PRId64"s - " + "%"PRId64" kbytes/s", + p_sys->stat.i_bytes, + p_sys->stat.i_read_time / INT64_C(1000000), + i_byterate / 1024 ); + break; + } - vlc_mutex_lock( &p_input->stream.stream_lock ); - *p_b = p_input->stream.b_seekable; - vlc_mutex_unlock( &p_input->stream.stream_lock ); - return VLC_SUCCESS; + /* */ + 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 ) + continue; + else if( i_read == 0 ) + break; /* EOF */ - case STREAM_CAN_FASTSEEK: - p_b = (vlc_bool_t*) va_arg( args, vlc_bool_t * ); + if( i_first == 0 ) + { + i_first = mdate(); + msg_Dbg( s, "received first data after %d ms", + (int)((i_first-i_start)/1000) ); + } - vlc_mutex_lock( &p_input->stream.stream_lock ); - *p_b = p_input->stream.b_seekable && - p_input->stream.i_method == INPUT_METHOD_FILE; - vlc_mutex_unlock( &p_input->stream.stream_lock ); - return VLC_SUCCESS; + tk->i_end += i_read; - case STREAM_GET_POSITION: - p_i64 = (int64_t*) va_arg( args, int64_t * ); + p_sys->stat.i_read_count++; + } +} - vlc_mutex_lock( &p_input->stream.stream_lock ); - *p_i64 = p_input->stream.p_selected_area->i_tell; - vlc_mutex_unlock( &p_input->stream.stream_lock ); - return VLC_SUCCESS; +/**************************************************************************** + * stream_ReadLine: + ****************************************************************************/ +/** + * Read from the stream untill first newline. + * \param s Stream handle to read from + * \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 *p_line = NULL; + int i_line = 0, i_read = 0; - case STREAM_SET_POSITION: + while( i_read < STREAM_LINE_MAX ) + { + 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 >= 3 ) { - int64_t i_skip; - i64 = (int64_t) va_arg( args, int64_t ); + int i_bom_size = 0; + const char *psz_encoding = NULL; - vlc_mutex_lock( &p_input->stream.stream_lock ); - if( i64 < 0 || - ( p_input->stream.p_selected_area->i_size > 0 && - p_input->stream.p_selected_area->i_size < i64 ) ) + if( !memcmp( p_data, "\xEF\xBB\xBF", 3 ) ) { - vlc_mutex_unlock( &p_input->stream.stream_lock ); - msg_Warn( s, "seek out of bound" ); - return VLC_EGENERIC; + psz_encoding = "UTF-8"; + i_bom_size = 3; } - - i_skip = i64 - p_input->stream.p_selected_area->i_tell; - - if( i_skip == 0 ) + else if( !memcmp( p_data, "\xFF\xFE", 2 ) ) { - vlc_mutex_unlock( &p_input->stream.stream_lock ); - return VLC_SUCCESS; + psz_encoding = "UTF-16LE"; + s->p_text->b_little_endian = true; + s->p_text->i_char_width = 2; + i_bom_size = 2; } - - if( i_skip > 0 && i_skip < p_input->p_last_data - - p_input->p_current_data - 1 ) + else if( !memcmp( p_data, "\xFE\xFF", 2 ) ) { - /* We can skip without reading/seeking */ - p_input->p_current_data += i_skip; - p_input->stream.p_selected_area->i_tell = i64; - vlc_mutex_unlock( &p_input->stream.stream_lock ); - return VLC_SUCCESS; + psz_encoding = "UTF-16BE"; + s->p_text->i_char_width = 2; + i_bom_size = 2; } - vlc_mutex_unlock( &p_input->stream.stream_lock ); - if( p_input->stream.b_seekable && - ( p_input->stream.i_method == INPUT_METHOD_FILE || - i_skip < 0 || i_skip >= ( p_input->i_mtu > 0 ? - p_input->i_mtu : 4096 ) ) ) + /* Seek past the BOM */ + if( i_bom_size ) { - input_AccessReinit( p_input ); - p_input->pf_seek( p_input, i64 ); - return VLC_SUCCESS; + stream_Seek( s, i_bom_size ); + p_data += i_bom_size; + i_data -= i_bom_size; } - if( i_skip > 0 ) + /* Open the converter if we need it */ + if( psz_encoding != NULL ) { - data_packet_t *p_data; - - if( i_skip > 1000 ) - { - msg_Warn( s, "will skip "I64Fd" bytes, slow", i_skip ); - } - - while( i_skip > 0 ) + msg_Dbg( s, "%s BOM detected", psz_encoding ); + if( s->p_text->i_char_width > 1 ) { - int i_read; - - i_read = input_SplitBuffer( p_input, &p_data, - __MIN( (int)p_input->i_bufsize, i_skip ) ); - if( i_read < 0 ) + s->p_text->conv = vlc_iconv_open( "UTF-8", psz_encoding ); + if( s->p_text->conv == (vlc_iconv_t)-1 ) { - return VLC_EGENERIC; + msg_Err( s, "iconv_open failed" ); } - i_skip -= i_read; + } - input_DeletePacket( p_input->p_method_data, p_data ); - if( i_read == 0 && i_skip > 0 ) - { - return VLC_EGENERIC; - } + /* FIXME that's UGLY */ + input_thread_t *p_input; + p_input = (input_thread_t *)vlc_object_find( s, VLC_OBJECT_INPUT, FIND_PARENT ); + 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 ); } } - return VLC_SUCCESS; } - case STREAM_GET_MTU: - p_int = (int*) va_arg( args, int * ); - *p_int = p_input->i_mtu; - return VLC_SUCCESS; - - default: - msg_Err( s, "invalid stream_vaControl query=0x%x", i_query ); - return VLC_EGENERIC; - } -} + if( i_data % s->p_text->i_char_width ) + { + /* keep i_char_width boundary */ + i_data = i_data - ( i_data % s->p_text->i_char_width ); + msg_Warn( s, "the read is not i_char_width compatible"); + } -/**************************************************************************** - * IStreamRead: - ****************************************************************************/ -static int IStreamRead( stream_t *s, void *p_data, int i_data ) -{ - input_stream_sys_t * p_sys = (input_stream_sys_t*)s->p_sys; - input_thread_t *p_input = p_sys->p_input; - uint8_t *p = (uint8_t*)p_data; + if( i_data == 0 ) + break; - int i_read = 0; + /* Check if there is an EOL */ + if( s->p_text->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->p_text->i_char_width; - if( p_data == NULL && i_data > 0 ) - { - int64_t i_pos; + if( s->p_text->i_char_width == 2 ) + { + if( s->p_text->b_little_endian == 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; + } + } - stream_Control( s, STREAM_GET_POSITION, &i_pos ); + if( p > p_last ) + { + psz_eol = NULL; + } + else + { + psz_eol = (char *)p + ( s->p_text->i_char_width - 1 ); + } + } - i_pos += i_data; - if( stream_Control( s, STREAM_SET_POSITION, i_pos ) ) + if( psz_eol ) { - return 0; + i_data = (psz_eol - (char *)p_data) + 1; + p_line = realloc( p_line, i_line + i_data + s->p_text->i_char_width ); /* add \0 */ + if( !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->p_text->i_char_width; /* skip \n */; + i_read += i_data; + + /* We have our line */ + break; } - return i_data; + + /* Read data (+1 for easy \0 append) */ + p_line = realloc( p_line, i_line + STREAM_PROBE_LINE + s->p_text->i_char_width ); + if( !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; } - while( i_data > 0 && !p_input->b_die ) + if( i_read > 0 ) { - ssize_t i_count = p_input->p_last_data - p_input->p_current_data; - - if( i_count <= 0 ) + int j; + for( j = 0; j < s->p_text->i_char_width; j++ ) { - /* Go to the next buffer */ - i_count = input_FillBuffer( p_input ); - - if( i_count < 0 ) return -1; - else if( i_count == 0 ) + p_line[i_line + j] = '\0'; + } + i_line += s->p_text->i_char_width; /* the added \0 */ + if( s->p_text->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 ) + goto error; + i_in = i_out = (size_t)i_line; + p_in = p_line; + p_out = psz_new_line; + + if( vlc_iconv( s->p_text->conv, &p_in, &i_in, &p_out, &i_out ) == (size_t)-1 ) { - /* We reached the EOF */ - break; + msg_Err( s, "iconv failed" ); + msg_Dbg( s, "original: %d, in %d, out %d", i_line, (int)i_in, (int)i_out ); } + free( p_line ); + p_line = psz_new_line; + i_line = (size_t)i_line - i_out; /* does not include \0 */ } - i_count = __MIN( i_data, i_count ); - memcpy( p, p_input->p_current_data, i_count ); - p_input->p_current_data += i_count; - p += i_count; - i_data -= i_count; - i_read += i_count; + /* Remove trailing LF/CR */ + while( i_line >= 2 && ( p_line[i_line-2] == '\r' || + p_line[i_line-2] == '\n') ) i_line--; - /* Update stream position */ - vlc_mutex_lock( &p_input->stream.stream_lock ); - p_input->stream.p_selected_area->i_tell += i_count; - vlc_mutex_unlock( &p_input->stream.stream_lock ); + /* Make sure the \0 is there */ + p_line[i_line-1] = '\0'; + + return p_line; } - return i_read; -} +error: + /* We failed to read any data, probably EOF */ + free( p_line ); -/**************************************************************************** - * IStreamPeek: - ****************************************************************************/ -static int IStreamPeek( stream_t *s, uint8_t **pp_peek, int i_peek ) -{ - input_stream_sys_t * p_sys = (input_stream_sys_t*)s->p_sys; - return input_Peek( p_sys->p_input, pp_peek, i_peek ); + /* */ + if( s->p_text->conv != (vlc_iconv_t)(-1) ) + vlc_iconv_close( s->p_text->conv ); + s->p_text->conv = (vlc_iconv_t)(-1); + return NULL; } /**************************************************************************** - * stream_Demux*: create a demuxer for an outpout stream (allow demuxer chain) + * Access reading/seeking wrappers to handle concatenated streams. ****************************************************************************/ -typedef struct +static int AReadStream( stream_t *s, void *p_read, unsigned int i_read ) { - /* Data buffer */ - vlc_mutex_t lock; - int i_buffer; - int i_buffer_size; - uint8_t *p_buffer; + 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; - int64_t i_pos; + if( s->p_parent && s->p_parent->p_parent && + vlc_internals( s->p_parent->p_parent )->i_object_type == VLC_OBJECT_INPUT ) + p_input = (input_thread_t *)s->p_parent->p_parent; - /* Demuxer */ - char *psz_name; - es_out_t *out; - demux_t *p_demux; -} d_stream_sys_t; + if( !p_sys->i_list ) + { + i_read = p_access->pf_read( p_access, p_read, i_read ); + if( p_access->b_die ) + vlc_object_kill( s ); + if( 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 ); + } + return i_read; + } -static int DStreamRead ( stream_t *, void *p_read, int i_read ); -static int DStreamPeek ( stream_t *, uint8_t **pp_peek, int i_peek ); -static int DStreamControl( stream_t *, int i_query, va_list ); -static int DStreamThread ( stream_t * ); + i_read = p_sys->p_list_access->pf_read( p_sys->p_list_access, p_read, + i_read ); + if( p_access->b_die ) + vlc_object_kill( s ); + /* 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; -stream_t *__stream_DemuxNew( vlc_object_t *p_obj, char *psz_demux, es_out_t *out ) -{ - /* We create a stream reader, and launch a thread */ - stream_t *s; - d_stream_sys_t *p_sys; + msg_Dbg( s, "opening input `%s'", psz_name ); - if( psz_demux == NULL || *psz_demux == '\0' ) - { - return NULL; - } + p_list_access = access_New( s, p_access->psz_access, "", psz_name ); - s = vlc_object_create( p_obj, sizeof( stream_t ) ); - s->pf_block = NULL; - s->pf_read = DStreamRead; - s->pf_peek = DStreamPeek; - s->pf_control= DStreamControl; + if( !p_list_access ) return 0; - s->p_sys = malloc( sizeof( d_stream_sys_t) ); - p_sys = (d_stream_sys_t*)s->p_sys; + if( p_sys->p_list_access != p_access ) + access_Delete( p_sys->p_list_access ); - vlc_mutex_init( s, &p_sys->lock ); - p_sys->i_buffer = 0; - p_sys->i_buffer_size = 1000000; - p_sys->p_buffer = malloc( p_sys->i_buffer_size ); - p_sys->i_pos = 0; - p_sys->psz_name = strdup( psz_demux ); - p_sys->out = out; - p_sys->p_demux = NULL; + p_sys->p_list_access = p_list_access; - if( vlc_thread_create( s, "stream out", DStreamThread, VLC_THREAD_PRIORITY_INPUT, VLC_FALSE ) ) - { - vlc_mutex_destroy( &p_sys->lock ); - vlc_object_destroy( s ); - free( p_sys ); - return NULL; + /* We have to read some data */ + return AReadStream( s, p_read, i_read_orig ); } - return s; + /* Update read bytes in input */ + if( 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 ); + } + return i_read; } -void stream_DemuxSend( stream_t *s, block_t *p_block ) +static block_t *AReadBlock( stream_t *s, bool *pb_eof ) { - d_stream_sys_t *p_sys = (d_stream_sys_t*)s->p_sys; - - if( p_block->i_buffer > 0 ) + 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; + bool b_eof; + int i_total = 0; + + if( s->p_parent && s->p_parent->p_parent && + vlc_internals( 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 ) { - vlc_mutex_lock( &p_sys->lock ); - /* Realloc if needed */ - if( p_sys->i_buffer + p_block->i_buffer > p_sys->i_buffer_size ) + p_block = p_access->pf_block( p_access ); + if( p_access->b_die ) + vlc_object_kill( s ); + if( pb_eof ) *pb_eof = p_access->info.b_eof; + if( p_input && p_block && libvlc_stats (p_access) ) { - if( p_sys->i_buffer_size > 5000000 ) - { - vlc_mutex_unlock( &p_sys->lock ); - msg_Err( s, "stream_DemuxSend: buffer size > 5000000" ); - block_Release( p_block ); - return; - } - /* I know, it's more than needed but that's perfect */ - p_sys->i_buffer_size += p_block->i_buffer; - /* FIXME won't work with PEEK -> segfault */ - p_sys->p_buffer = realloc( p_sys->p_buffer, p_sys->i_buffer_size ); - msg_Dbg( s, "stream_DemuxSend: realloc to %d", p_sys->i_buffer_size ); + 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 ); } + return p_block; + } - /* copy data */ - memcpy( &p_sys->p_buffer[p_sys->i_buffer], p_block->p_buffer, p_block->i_buffer ); - p_sys->i_buffer += p_block->i_buffer; + p_block = p_sys->p_list_access->pf_block( p_sys->p_list_access ); + if( p_access->b_die ) + vlc_object_kill( s ); + b_eof = p_sys->p_list_access->info.b_eof; + if( pb_eof ) *pb_eof = b_eof; - vlc_mutex_unlock( &p_sys->lock ); - } + /* 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; - block_Release( p_block ); -} + msg_Dbg( s, "opening input `%s'", psz_name ); -void stream_DemuxDelete( stream_t *s ) -{ - d_stream_sys_t *p_sys = (d_stream_sys_t*)s->p_sys; + p_list_access = access_New( s, p_access->psz_access, "", psz_name ); - s->b_die = VLC_TRUE; + if( !p_list_access ) return 0; - vlc_mutex_lock( &p_sys->lock ); - if( p_sys->p_demux ) - { - p_sys->p_demux->b_die = VLC_TRUE; - } - vlc_mutex_unlock( &p_sys->lock ); + if( p_sys->p_list_access != p_access ) + access_Delete( p_sys->p_list_access ); - vlc_thread_join( s ); + p_sys->p_list_access = p_list_access; - if( p_sys->p_demux ) + /* We have to read some data */ + return AReadBlock( s, pb_eof ); + } + if( p_block ) { - demux2_Delete( p_sys->p_demux ); + if( 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_mutex_destroy( &p_sys->lock ); - free( p_sys->psz_name ); - free( p_sys->p_buffer ); - free( p_sys ); - vlc_object_destroy( s ); + return p_block; } - -static int DStreamRead ( stream_t *s, void *p_read, int i_read ) +static int ASeek( stream_t *s, int64_t i_pos ) { - d_stream_sys_t *p_sys = (d_stream_sys_t*)s->p_sys; - int i_copy; + stream_sys_t *p_sys = s->p_sys; + access_t *p_access = p_sys->p_access; - //msg_Dbg( s, "DStreamRead: wanted %d bytes", i_read ); - for( ;; ) + /* Check which stream we need to access */ + if( p_sys->i_list ) { - vlc_mutex_lock( &p_sys->lock ); - //msg_Dbg( s, "DStreamRead: buffer %d", p_sys->i_buffer ); - if( p_sys->i_buffer >= i_read || s->b_die ) + 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++ ) { - break; + if( i_pos < p_sys->list[i]->i_size + i_size ) break; + i_size += p_sys->list[i]->i_size; } - vlc_mutex_unlock( &p_sys->lock ); - msleep( 10000 ); - } + psz_name = p_sys->list[i]->psz_path; - //msg_Dbg( s, "DStreamRead: read %d buffer %d", i_read, p_sys->i_buffer ); + if( i != p_sys->i_list_index ) + msg_Dbg( s, "opening input `%s'", psz_name ); - i_copy = __MIN( i_read, p_sys->i_buffer ); - if( i_copy > 0 ) - { - if( p_read ) + if( i != p_sys->i_list_index && i != 0 ) { - memcpy( p_read, p_sys->p_buffer, i_copy ); + p_list_access = + access_New( s, p_access->psz_access, "", psz_name ); + } + else if( i != p_sys->i_list_index ) + { + p_list_access = p_access; } - p_sys->i_buffer -= i_copy; - p_sys->i_pos += i_copy; - if( p_sys->i_buffer > 0 ) + if( p_list_access ) { - memmove( p_sys->p_buffer, &p_sys->p_buffer[i_copy], p_sys->i_buffer ); + if( p_sys->p_list_access != p_access ) + access_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 ); } - vlc_mutex_unlock( &p_sys->lock ); - return i_copy; + return p_access->pf_seek( p_access, i_pos ); } -static int DStreamPeek ( stream_t *s, uint8_t **pp_peek, int i_peek ) -{ - d_stream_sys_t *p_sys = (d_stream_sys_t*)s->p_sys; - int i_copy; - //msg_Dbg( s, "DStreamPeek: wanted %d bytes", i_peek ); - for( ;; ) - { - vlc_mutex_lock( &p_sys->lock ); - //msg_Dbg( s, "DStreamPeek: buffer %d", p_sys->i_buffer ); - if( p_sys->i_buffer >= i_peek || s->b_die ) - { - break; - } - vlc_mutex_unlock( &p_sys->lock ); - msleep( 10000 ); - } - *pp_peek = p_sys->p_buffer; - i_copy = __MIN( i_peek, p_sys->i_buffer ); - vlc_mutex_unlock( &p_sys->lock ); - - return i_copy; +/** + * 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 ); } -static int DStreamControl( stream_t *s, int i_query, va_list args ) +/** + * 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 ) { - d_stream_sys_t *p_sys = (d_stream_sys_t*)s->p_sys; - int64_t *p_i64; - vlc_bool_t *p_b; - int *p_int; - switch( i_query ) - { - case STREAM_GET_SIZE: - p_i64 = (int64_t*) va_arg( args, int64_t * ); - *p_i64 = 0; - return VLC_SUCCESS; - - case STREAM_CAN_SEEK: - p_b = (vlc_bool_t*) va_arg( args, vlc_bool_t * ); - *p_b = VLC_FALSE; - return VLC_SUCCESS; - - case STREAM_CAN_FASTSEEK: - p_b = (vlc_bool_t*) va_arg( args, vlc_bool_t * ); - *p_b = VLC_FALSE; - return VLC_SUCCESS; - - case STREAM_GET_POSITION: - p_i64 = (int64_t*) va_arg( args, int64_t * ); - *p_i64 = p_sys->i_pos; - return VLC_SUCCESS; - - case STREAM_SET_POSITION: - return VLC_EGENERIC; - - case STREAM_GET_MTU: - p_int = (int*) va_arg( args, int * ); - *p_int = 0; - return VLC_SUCCESS; - - default: - msg_Err( s, "invalid DStreamControl query=0x%x", i_query ); - return VLC_EGENERIC; - } + return s->pf_peek( s, pp_peek, i_peek ); } -static int DStreamThread ( stream_t *s ) +/** + * 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 ) { - d_stream_sys_t *p_sys = (d_stream_sys_t*)s->p_sys; - char *psz_mrl; - demux_t *p_demux; + return s->pf_control( s, i_query, args ); +} - /* Create the demuxer */ +/** + * Destroy a stream + */ +void stream_Delete( stream_t *s ) +{ + s->pf_destroy( s ); +} - psz_mrl = malloc( strlen( p_sys->psz_name ) + 3 ); - sprintf( psz_mrl, "/%s:", p_sys->psz_name ); +int stream_Control( stream_t *s, int i_query, ... ) +{ + va_list args; + int i_result; - if( ( p_demux = demux2_New( s, psz_mrl, s, p_sys->out ) ) == NULL ) - { - free( psz_mrl ); + if( s == NULL ) return VLC_EGENERIC; - } - free( psz_mrl ); - vlc_mutex_lock( &p_sys->lock ); - p_sys->p_demux = p_demux; - vlc_mutex_unlock( &p_sys->lock ); + 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; - /* Main loop */ - while( !s->b_die && !p_demux->b_die ) + /* emulate block read */ + block_t *p_bk = block_New( s, i_size ); + if( p_bk ) { - if( p_demux->pf_demux( p_demux ) <= 0 ) + int i_read = stream_Read( s, p_bk->p_buffer, i_size ); + if( i_read > 0 ) { - break; + p_bk->i_buffer = i_read; + return p_bk; } + block_Release( p_bk ); } - p_demux->b_die = VLC_TRUE; - return VLC_SUCCESS; + return NULL; } - - - - -