X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finput%2Fstream.c;h=4688ceaf4d10e7cd60f6c65a0a957392b270a297;hb=7b28b05e510f354a6f6c7c16940106b85a34fed4;hp=72f1bab3486cdf7894c1981b73547ecc43c8f590;hpb=e98f5605920b5f0e611b4e152800a8f0deac5032;p=vlc diff --git a/src/input/stream.c b/src/input/stream.c index 72f1bab348..4688ceaf4d 100644 --- a/src/input/stream.c +++ b/src/input/stream.c @@ -21,18 +21,33 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include + +#include +#include +#include +#include + +#include + +#include "access.h" +#include "stream.h" #include "input_internal.h" #undef STREAM_DEBUG /* TODO: - * - tune the 2 methods + * - tune the 2 methods (block/stream) * - compute cost for seek * - improve stream mode seeking with closest segments * - ... + * - Maybe remove (block/stream) in favour of immediate */ /* Two methods: @@ -40,6 +55,9 @@ * 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 */ @@ -62,7 +80,6 @@ * 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 */ /* Method2: A bit more complex, for pf_read * - We use ring buffers, only one if unseekable, all if seekable @@ -98,11 +115,18 @@ typedef struct } access_entry_t; +typedef enum stream_read_method_t +{ + STREAM_METHOD_IMMEDIATE, + STREAM_METHOD_BLOCK, + STREAM_METHOD_STREAM +} stream_read_method_t; + struct stream_sys_t { access_t *p_access; - vlc_bool_t b_block; /* Block method (1) or stream */ + stream_read_method_t method; /* method to use */ int64_t i_pos; /* Current reading offset */ @@ -110,7 +134,7 @@ struct stream_sys_t struct { int64_t i_start; /* Offset of block for p_first */ - int i_offset; /* Offset for data in p_current */ + 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 */ @@ -135,14 +159,21 @@ struct stream_sys_t } stream; + /* Method 3: for pf_read */ + struct + { + int64_t i_end; + uint8_t *p_buffer; + } immediate; + /* Peek temporary buffer */ - int i_peek; + unsigned int i_peek; uint8_t *p_peek; /* Stat for both method */ struct { - vlc_bool_t b_fastseek; /* From access */ + bool b_fastseek; /* From access */ /* Stat about reading data */ int64_t i_read_count; @@ -162,29 +193,84 @@ struct stream_sys_t access_t *p_list_access; /* Preparse mode ? */ - vlc_bool_t b_quick; + bool b_quick; + + /* */ + struct + { + bool b_active; + + FILE *f; /* TODO it could be replaced by access_output_t one day */ + bool b_error; + } record; }; /* Method 1: */ -static int AStreamReadBlock( stream_t *s, void *p_read, int i_read ); -static int AStreamPeekBlock( stream_t *s, uint8_t **p_peek, int i_read ); +static int 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, vlc_bool_t *pb_eof ); +static block_t *AReadBlock( stream_t *s, bool *pb_eof ); /* Method 2 */ -static int AStreamReadStream( stream_t *s, void *p_read, int i_read ); -static int AStreamPeekStream( stream_t *s, uint8_t **pp_peek, int i_read ); +static int 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, int i_read ); +static int AReadStream( stream_t *s, void *p_read, unsigned int i_read ); + +/* Method 3 */ +static int AStreamReadImmediate( stream_t *s, void *p_read, unsigned int i_read ); +static int AStreamPeekImmediate( stream_t *s, const uint8_t **pp_peek, unsigned int i_read ); +static int AStreamSeekImmediate( stream_t *s, int64_t i_pos ); /* 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 ); +static int ARecordSetState( stream_t *s, bool b_record, const char *psz_extension ); +static void ARecordWrite( stream_t *s, const uint8_t *p_buffer, size_t i_buffer ); + +/**************************************************************************** + * Method 3 helpers: + ****************************************************************************/ + +static inline int64_t stream_buffered_size( stream_t *s ) +{ + return s->p_sys->immediate.i_end; +} +static inline void stream_buffer_empty( stream_t *s, int length ) +{ + length = __MAX( stream_buffered_size( s ), length ); + if( length ) + { + memmove( s->p_sys->immediate.p_buffer, + s->p_sys->immediate.p_buffer + length, + stream_buffered_size( s ) - length ); + } + s->p_sys->immediate.i_end -= length; +} + +static inline void stream_buffer_fill( stream_t *s, int length ) +{ + s->p_sys->immediate.i_end += length; +} + +static inline uint8_t * stream_buffer( stream_t *s ) +{ + return s->p_sys->immediate.p_buffer; +} + +/**************************************************************************** + * stream_CommonNew: create an empty stream structure + ****************************************************************************/ +stream_t *stream_CommonNew( vlc_object_t *p_obj ) +{ + return (stream_t *)vlc_custom_create( p_obj, sizeof(stream_t), + VLC_OBJECT_GENERIC, "stream" ); +} /**************************************************************************** * stream_UrlNew: create a stream from a access @@ -196,14 +282,15 @@ stream_t *__stream_UrlNew( vlc_object_t *p_parent, const char *psz_url ) access_t *p_access; stream_t *p_res; - if( !psz_url ) return 0; + if( !psz_url ) + return NULL; - char psz_dup[strlen (psz_url) + 1]; - strcpy (psz_dup, psz_url);; - MRLSplit( p_parent, psz_dup, &psz_access, &psz_demux, &psz_path ); + 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 = access2_New( p_parent, psz_access, psz_demux, psz_path, 0 ); + p_access = access_New( p_parent, psz_access, psz_demux, psz_path ); if( p_access == NULL ) { @@ -211,9 +298,9 @@ stream_t *__stream_UrlNew( vlc_object_t *p_parent, const char *psz_url ) return NULL; } - if( !( p_res = stream_AccessNew( p_access, VLC_TRUE ) ) ) + if( !( p_res = stream_AccessNew( p_access, true ) ) ) { - access2_Delete( p_access ); + access_Delete( p_access ); return NULL; } @@ -221,37 +308,50 @@ stream_t *__stream_UrlNew( vlc_object_t *p_parent, const char *psz_url ) return p_res; } -stream_t *stream_AccessNew( access_t *p_access, vlc_bool_t b_quick ) +stream_t *stream_AccessNew( access_t *p_access, bool b_quick ) { - stream_t *s = vlc_stream_create( VLC_OBJECT(p_access) ); + stream_t *s = stream_CommonNew( VLC_OBJECT(p_access) ); stream_sys_t *p_sys; - char *psz_list; + char *psz_list = NULL; - if( !s ) return NULL; + if( !s ) + return NULL; + + s->p_sys = p_sys = malloc( sizeof( stream_sys_t ) ); + if( !p_sys ) + { + vlc_object_release( 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_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->b_little_endian = 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; + if( p_access->pf_block ) + p_sys->method = STREAM_METHOD_BLOCK; + else if( var_CreateGetBool( s, "use-stream-immediate" ) ) + p_sys->method = STREAM_METHOD_IMMEDIATE; + else + p_sys->method = STREAM_METHOD_STREAM; + + p_sys->record.b_active = false; + p_sys->i_pos = p_access->info.i_pos; /* Stats */ - access2_Control( p_access, ACCESS_CAN_FASTSEEK, &p_sys->stat.b_fastseek ); + 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; @@ -269,13 +369,20 @@ stream_t *stream_AccessNew( access_t *p_access, vlc_bool_t b_quick ) if( (psz_list = var_CreateGetString( s, "input-list" )) && *psz_list ) { access_entry_t *p_entry = malloc( sizeof(access_entry_t) ); + if( p_entry == NULL ) + 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 ) + { + 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)", + msg_Dbg( p_access, "adding file `%s', (%"PRId64" bytes)", p_entry->psz_path, p_access->info.i_size ); while( psz_name && *psz_name ) @@ -286,8 +393,8 @@ stream_t *stream_AccessNew( access_t *p_access, vlc_bool_t b_quick ) psz_name = strdup( psz_name ); if( psz_name ) { - access_t *p_tmp = access2_New( p_access, p_access->psz_access, - "", psz_name, 0 ); + access_t *p_tmp = access_New( p_access, p_access->psz_access, + "", psz_name ); if( !p_tmp ) { @@ -296,29 +403,32 @@ stream_t *stream_AccessNew( access_t *p_access, vlc_bool_t b_quick ) continue; } - msg_Dbg( p_access, "adding file `%s', ("I64Fd" bytes)", + msg_Dbg( p_access, "adding file `%s', (%"PRId64" bytes)", psz_name, p_tmp->info.i_size ); p_entry = malloc( sizeof(access_entry_t) ); + if( p_entry == NULL ) + 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 ); + access_Delete( p_tmp ); } psz_name = psz_parser; if( psz_name ) psz_name++; } } - if( psz_list ) free( psz_list ); + FREENULL( psz_list ); /* Peek */ p_sys->i_peek = 0; p_sys->p_peek = NULL; - if( p_sys->b_block ) + if( p_sys->method == STREAM_METHOD_BLOCK ) { + msg_Dbg( s, "Using AStream*Block" ); s->pf_read = AStreamReadBlock; s->pf_peek = AStreamPeekBlock; @@ -339,10 +449,36 @@ stream_t *stream_AccessNew( access_t *p_access, vlc_bool_t b_quick ) goto error; } } + else if( p_sys->method == STREAM_METHOD_IMMEDIATE ) + { + msg_Dbg( s, "Using AStream*Immediate" ); + + s->pf_read = AStreamReadImmediate; + s->pf_peek = AStreamPeekImmediate; + + /* Allocate/Setup our tracks (useful to peek)*/ + p_sys->immediate.i_end = 0; + p_sys->immediate.p_buffer = malloc( STREAM_CACHE_SIZE ); + + msg_Dbg( s, "p_buffer %p-%p", + p_sys->immediate.p_buffer, + &p_sys->immediate.p_buffer[STREAM_CACHE_SIZE] ); + + if( p_sys->immediate.p_buffer == NULL ) + { + msg_Err( s, "Out of memory when allocating stream cache (%d bytes)", + STREAM_CACHE_SIZE ); + 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; @@ -350,8 +486,14 @@ stream_t *stream_AccessNew( access_t *p_access, vlc_bool_t b_quick ) 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, + access_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; @@ -380,7 +522,7 @@ stream_t *stream_AccessNew( access_t *p_access, vlc_bool_t b_quick ) return s; error: - if( p_sys->b_block ) + if( p_sys->method == STREAM_METHOD_BLOCK ) { /* Nothing yet */ } @@ -388,9 +530,13 @@ 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 ); + vlc_object_release( s ); return NULL; } @@ -403,31 +549,38 @@ static void AStreamDestroy( stream_t *s ) vlc_object_detach( s ); - if( p_sys->b_block ) block_ChainRelease( p_sys->block.p_first ); - else free( p_sys->stream.p_buffer ); + if( p_sys->record.b_active ) + ARecordSetState( s, false, NULL ); - if( p_sys->p_peek ) free( p_sys->p_peek ); + if( p_sys->method == STREAM_METHOD_BLOCK ) + block_ChainRelease( p_sys->block.p_first ); + else if( p_sys->method == STREAM_METHOD_IMMEDIATE ) + free( p_sys->immediate.p_buffer ); + 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 ) - access2_Delete( p_sys->p_list_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] ); - if( !p_sys->i_list ) free( p_sys->list ); } - free( s->p_sys ); - vlc_object_destroy( s ); + free( p_sys->list ); + free( p_sys ); + + vlc_object_release( s ); } static void UStreamDestroy( stream_t *s ) { - access_t *p_access = (access_t*)vlc_object_find( s, VLC_OBJECT_ACCESS, FIND_PARENT ); + access_t *p_access = (access_t *)s->p_parent; AStreamDestroy( s ); - vlc_object_release( p_access ); - access2_Delete( p_access ); + access_Delete( p_access ); } /**************************************************************************** @@ -439,7 +592,7 @@ void stream_AccessReset( stream_t *s ) p_sys->i_pos = p_sys->p_access->info.i_pos; - if( p_sys->b_block ) + if( p_sys->method == STREAM_METHOD_BLOCK ) { block_ChainRelease( p_sys->block.p_first ); @@ -454,10 +607,16 @@ void stream_AccessReset( stream_t *s ) /* Do the prebuffering */ AStreamPrebufferBlock( s ); } + else if( p_sys->method == STREAM_METHOD_IMMEDIATE ) + { + stream_buffer_empty( s, stream_buffered_size( 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; @@ -502,7 +661,9 @@ 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; - vlc_bool_t *p_bool; + bool *p_bool; + bool b_bool; + const char *psz_string; int64_t *pi_64, i_64; int i_int; @@ -522,13 +683,13 @@ static int AStreamControl( stream_t *s, int i_query, va_list args ) break; case STREAM_CAN_SEEK: - p_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t * ); - access2_Control( p_access, ACCESS_CAN_SEEK, p_bool ); + p_bool = (bool*)va_arg( args, bool * ); + access_Control( p_access, ACCESS_CAN_SEEK, p_bool ); break; case STREAM_CAN_FASTSEEK: - p_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t * ); - access2_Control( p_access, ACCESS_CAN_FASTSEEK, p_bool ); + p_bool = (bool*)va_arg( args, bool * ); + access_Control( p_access, ACCESS_CAN_FASTSEEK, p_bool ); break; case STREAM_GET_POSITION: @@ -538,10 +699,18 @@ static int AStreamControl( stream_t *s, int i_query, va_list args ) case STREAM_SET_POSITION: i_64 = (int64_t)va_arg( args, int64_t ); - if( p_sys->b_block ) + switch( p_sys->method ) + { + case STREAM_METHOD_BLOCK: return AStreamSeekBlock( s, i_64 ); - else + case STREAM_METHOD_IMMEDIATE: + return AStreamSeekImmediate( s, i_64 ); + case STREAM_METHOD_STREAM: return AStreamSeekStream( s, i_64 ); + default: + assert(0); + return VLC_EGENERIC; + } case STREAM_GET_MTU: return VLC_EGENERIC; @@ -556,7 +725,17 @@ static int AStreamControl( stream_t *s, int i_query, va_list args ) "DON'T USE STREAM_CONTROL_ACCESS !!!" ); return VLC_EGENERIC; } - return access2_vaControl( p_access, i_int, args ); + return access_vaControl( p_access, i_int, args ); + + case STREAM_GET_CONTENT_TYPE: + return access_Control( p_access, ACCESS_GET_CONTENT_TYPE, + va_arg( args, char ** ) ); + case STREAM_SET_RECORD_STATE: + b_bool = (bool)va_arg( args, int ); + psz_string = NULL; + if( b_bool ) + psz_string = (const char*)va_arg( args, const char* ); + return ARecordSetState( s, b_bool, psz_string ); default: msg_Err( s, "invalid stream_vaControl query=0x%x", i_query ); @@ -565,7 +744,99 @@ static int AStreamControl( stream_t *s, int i_query, va_list args ) return VLC_SUCCESS; } +/**************************************************************************** + * ARecord*: record stream functions + ****************************************************************************/ +static int ARecordStart( stream_t *s, const char *psz_extension ) +{ + stream_sys_t *p_sys = s->p_sys; + + char *psz_file; + FILE *f; + + /* */ + if( !psz_extension ) + psz_extension = "dat"; + + /* Retreive path */ + char *psz_path = var_CreateGetString( s, "input-record-path" ); + if( !psz_path || *psz_path == '\0' ) + { + free( psz_path ); + psz_path = strdup( config_GetHomeDir() ); + } + + if( !psz_path ) + return VLC_ENOMEM; + + /* Create file name + * TODO allow prefix configuration */ + psz_file = input_CreateFilename( VLC_OBJECT(s), psz_path, INPUT_RECORD_PREFIX, psz_extension ); + + free( psz_path ); + + if( !psz_file ) + return VLC_ENOMEM; + + f = utf8_fopen( psz_file, "wb" ); + if( !f ) + { + free( psz_file ); + return VLC_EGENERIC; + } + msg_Dbg( s, "Recording into %s", psz_file ); + free( psz_file ); + + /* */ + p_sys->record.f = f; + p_sys->record.b_active = true; + p_sys->record.b_error = false; + return VLC_SUCCESS; +} +static int ARecordStop( stream_t *s ) +{ + stream_sys_t *p_sys = s->p_sys; + + assert( p_sys->record.b_active ); + msg_Dbg( s, "Recording completed" ); + fclose( p_sys->record.f ); + p_sys->record.b_active = false; + return VLC_SUCCESS; +} + +static int ARecordSetState( stream_t *s, bool b_record, const char *psz_extension ) +{ + stream_sys_t *p_sys = s->p_sys; + + if( !!p_sys->record.b_active == !!b_record ) + return VLC_SUCCESS; + + if( b_record ) + return ARecordStart( s, psz_extension ); + else + return ARecordStop( s ); +} +static void ARecordWrite( stream_t *s, const uint8_t *p_buffer, size_t i_buffer ) +{ + stream_sys_t *p_sys = s->p_sys; + + assert( p_sys->record.b_active ); + + if( i_buffer > 0 ) + { + const bool b_previous_error = p_sys->record.b_error; + const size_t i_written = fwrite( p_buffer, 1, i_buffer, p_sys->record.f ); + + p_sys->record.b_error = i_written != i_buffer; + + /* TODO maybe a intf_UserError or something like that ? */ + if( p_sys->record.b_error && !b_previous_error ) + msg_Err( s, "Failed to record data (begin)" ); + else if( !p_sys->record.b_error && b_previous_error ) + msg_Err( s, "Failed to record data (end)" ); + } +} /**************************************************************************** * Method 1: @@ -583,7 +854,7 @@ static void AStreamPrebufferBlock( stream_t *s ) for( ;; ) { int64_t i_date = mdate(); - vlc_bool_t b_eof; + bool b_eof; block_t *b; if( s->b_die || p_sys->block.i_size > STREAM_CACHE_PREBUFFER_SIZE || @@ -594,13 +865,13 @@ static void AStreamPrebufferBlock( stream_t *s ) /* Update stat */ p_sys->stat.i_bytes = p_sys->block.i_size; p_sys->stat.i_read_time = i_date - i_start; - i_byterate = ( I64C(1000000) * p_sys->stat.i_bytes ) / + i_byterate = ( INT64_C(1000000) * p_sys->stat.i_bytes ) / (p_sys->stat.i_read_time + 1); - msg_Dbg( s, "prebuffering done "I64Fd" bytes in "I64Fd"s - " - I64Fd" kbytes/s", + msg_Dbg( s, "prebuffering done %"PRId64" bytes in %"PRId64"s - " + "%"PRId64" kbytes/s", p_sys->stat.i_bytes, - p_sys->stat.i_read_time / I64C(1000000), + p_sys->stat.i_read_time / INT64_C(1000000), i_byterate / 1024 ); break; } @@ -608,9 +879,8 @@ static void AStreamPrebufferBlock( stream_t *s ) /* Fetch a block */ if( ( b = AReadBlock( s, &b_eof ) ) == NULL ) { - if( b_eof ) break; - - msleep( STREAM_DATA_WAIT ); + if( b_eof ) + break; continue; } @@ -646,24 +916,28 @@ static void AStreamPrebufferBlock( stream_t *s ) static int AStreamRefillBlock( stream_t *s ); -static int AStreamReadBlock( stream_t *s, void *p_read, int i_read ) +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= (uint8_t*)p_read; - int i_data = 0; + uint8_t *p_data = p_read; + uint8_t *p_record = p_data; + unsigned int i_data = 0; /* It means EOF */ if( p_sys->block.p_current == NULL ) return 0; - if( p_read == NULL ) + if( p_sys->record.b_active && !p_data ) + p_record = p_data = malloc( i_read ); + + 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; - vlc_bool_t b_aseek; - access2_Control( p_access, ACCESS_CAN_SEEK, &b_aseek ); + 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; } @@ -672,7 +946,7 @@ static int AStreamReadBlock( stream_t *s, void *p_read, int i_read ) { int i_current = p_sys->block.p_current->i_buffer - p_sys->block.i_offset; - int i_copy = __MIN( i_current, i_read - i_data); + unsigned int i_copy = __MIN( (unsigned int)__MAX(i_current,0), i_read - i_data); /* Copy data */ if( p_data ) @@ -693,25 +967,33 @@ static int AStreamReadBlock( stream_t *s, void *p_read, int i_read ) p_sys->block.i_offset = 0; p_sys->block.p_current = p_sys->block.p_current->p_next; } - /*Get a new block */ - if( AStreamRefillBlock( s ) ) + /*Get a new block if needed */ + if( !p_sys->block.p_current && AStreamRefillBlock( s ) ) { break; } } } + if( p_sys->record.b_active ) + { + if( i_data > 0 && p_record != NULL) + ARecordWrite( s, p_record, i_data ); + if( !p_read ) + free( p_record ); + } + p_sys->i_pos += i_data; 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, unsigned int i_read ) { stream_sys_t *p_sys = s->p_sys; uint8_t *p_data; - int i_data = 0; + unsigned int i_data = 0; block_t *b; - int i_offset; + unsigned int i_offset; if( p_sys->block.p_current == NULL ) return 0; /* EOF */ @@ -753,7 +1035,7 @@ static int AStreamPeekBlock( stream_t *s, uint8_t **pp_peek, int i_read ) while( b && i_data < i_read ) { - int i_current = b->i_buffer - i_offset; + 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 ); @@ -777,7 +1059,7 @@ static int AStreamSeekBlock( stream_t *s, int64_t i_pos ) stream_sys_t *p_sys = s->p_sys; access_t *p_access = p_sys->p_access; int64_t i_offset = i_pos - p_sys->block.i_start; - vlc_bool_t b_seek; + 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 ) @@ -802,8 +1084,8 @@ static int AStreamSeekBlock( stream_t *s, int64_t i_pos ) /* We may need to seek or to read data */ if( i_offset < 0 ) { - vlc_bool_t b_aseek; - access2_Control( p_access, ACCESS_CAN_SEEK, &b_aseek ); + bool b_aseek; + access_Control( p_access, ACCESS_CAN_SEEK, &b_aseek ); if( !b_aseek ) { @@ -811,19 +1093,19 @@ static int AStreamSeekBlock( stream_t *s, int64_t i_pos ) return VLC_EGENERIC; } - b_seek = VLC_TRUE; + b_seek = true; } else { - vlc_bool_t b_aseek, b_aseekfast; + bool b_aseek, b_aseekfast; - access2_Control( p_access, ACCESS_CAN_SEEK, &b_aseek ); - access2_Control( p_access, ACCESS_CAN_FASTSEEK, &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 = VLC_FALSE; - msg_Warn( s, I64Fd" bytes need to be skipped " + b_seek = false; + msg_Warn( s, "%"PRId64" bytes need to be skipped " "(access non seekable)", i_offset - p_sys->block.i_size ); } @@ -838,11 +1120,11 @@ static int AStreamSeekBlock( stream_t *s, int64_t i_pos ) if( i_skip <= i_th * i_avg && i_skip < STREAM_CACHE_SIZE ) - b_seek = VLC_FALSE; + b_seek = false; else - b_seek = VLC_TRUE; + b_seek = true; - msg_Dbg( s, "b_seek=%d th*avg=%d skip="I64Fd, + msg_Dbg( s, "b_seek=%d th*avg=%d skip=%"PRId64, b_seek, i_th*i_avg, i_skip ); } } @@ -868,10 +1150,8 @@ static int AStreamSeekBlock( stream_t *s, int64_t i_pos ) /* Refill a block */ if( AStreamRefillBlock( s ) ) - { - msg_Err( s, "cannot re fill buffer" ); return VLC_EGENERIC; - } + /* Update stat */ p_sys->stat.i_seek_time += i_end - i_start; p_sys->stat.i_seek_count++; @@ -879,26 +1159,25 @@ static int AStreamSeekBlock( stream_t *s, int64_t i_pos ) } else { - /* Read enough data */ - while( p_sys->block.i_start + p_sys->block.i_size < i_pos ) + do { + /* Read and skip enough data */ if( AStreamRefillBlock( s ) ) - { - msg_Err( s, "can't read enough data in seek" ); return VLC_EGENERIC; - } + while( p_sys->block.p_current && - p_sys->i_pos + p_sys->block.p_current->i_buffer < i_pos ) + p_sys->i_pos + p_sys->block.p_current->i_buffer - p_sys->block.i_offset < i_pos ) { - p_sys->i_pos += p_sys->block.p_current->i_buffer; + 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; - /* TODO read data */ return VLC_SUCCESS; } @@ -935,17 +1214,16 @@ static int AStreamRefillBlock( stream_t *s ) i_start = mdate(); for( ;; ) { - vlc_bool_t b_eof; - - if( s->b_die ) return VLC_EGENERIC; + 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; - - msleep( STREAM_DATA_WAIT ); + if( ( b = AReadBlock( s, &b_eof ) ) ) + break; + if( b_eof ) + return VLC_EGENERIC; } while( b ) @@ -978,30 +1256,40 @@ static int AStreamRefillBlock( stream_t *s ) ****************************************************************************/ static int AStreamRefillStream( stream_t *s ); -static int AStreamReadStream( stream_t *s, void *p_read, int i_read ) +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; - int i_data = 0; + uint8_t *p_record = p_data; + unsigned 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_sys->record.b_active && !p_data ) + p_record = p_data = malloc( i_read ); - if( p_read == NULL ) + 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; - 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; + + /* seeking after EOF is not what we want */ + if( !( p_access->info.b_eof ) ) + { + bool b_aseek; + access_Control( p_access, ACCESS_CAN_SEEK, &b_aseek ); + if( b_aseek ) + return AStreamSeekStream( s, p_sys->i_pos + i_read ) ? 0 : i_read; + } } #ifdef STREAM_DEBUG - msg_Dbg( s, "AStreamReadStream: %d pos="I64Fd" tk=%d start="I64Fd - " offset=%d end="I64Fd, + 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 @@ -1010,9 +1298,9 @@ static int AStreamReadStream( stream_t *s, void *p_read, int 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 ); + 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 */ @@ -1043,10 +1331,18 @@ static int AStreamReadStream( stream_t *s, void *p_read, int i_read ) } } + if( p_sys->record.b_active ) + { + if( i_data > 0 && p_record != NULL) + ARecordWrite( s, p_record, i_data ); + if( !p_read ) + free( p_record ); + } + 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, 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]; @@ -1055,8 +1351,8 @@ static int AStreamPeekStream( stream_t *s, uint8_t **pp_peek, int i_read ) if( tk->i_start >= tk->i_end ) return 0; /* EOF */ #ifdef STREAM_DEBUG - msg_Dbg( s, "AStreamPeekStream: %d pos="I64Fd" tk=%d " - "start="I64Fd" offset=%d end="I64Fd, + 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 @@ -1111,15 +1407,15 @@ static int AStreamSeekStream( stream_t *s, int64_t i_pos ) { stream_sys_t *p_sys = s->p_sys; access_t *p_access = p_sys->p_access; - vlc_bool_t b_aseek; - vlc_bool_t b_afastseek; + bool b_aseek; + bool b_afastseek; int i_maxth; int i_new; int i; #ifdef STREAM_DEBUG - msg_Dbg( s, "AStreamSeekStream: to "I64Fd" pos="I64Fd - " tk=%d start="I64Fd" offset=%d end="I64Fd, + 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, @@ -1155,7 +1451,7 @@ static int AStreamSeekStream( stream_t *s, int64_t i_pos ) return VLC_SUCCESS; } - access2_Control( p_access, ACCESS_CAN_SEEK, &b_aseek ); + access_Control( p_access, ACCESS_CAN_SEEK, &b_aseek ); if( !b_aseek ) { /* We can't do nothing */ @@ -1174,8 +1470,8 @@ static int AStreamSeekStream( stream_t *s, int64_t i_pos ) if( i_pos >= tk->i_start && i_pos <= tk->i_end ) { #ifdef STREAM_DEBUG - msg_Dbg( s, "AStreamSeekStream: reusing %d start="I64Fd - " end="I64Fd, i, tk->i_start, tk->i_end ); + 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 */ @@ -1196,7 +1492,7 @@ static int AStreamSeekStream( stream_t *s, int64_t i_pos ) } } - access2_Control( p_access, ACCESS_CAN_SEEK, &b_afastseek ); + 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 ) @@ -1256,7 +1552,7 @@ static int AStreamRefillStream( stream_t *s ) 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; + bool b_read = false; int64_t i_start, i_stop; if( i_toread <= 0 ) return VLC_EGENERIC; /* EOF */ @@ -1281,15 +1577,15 @@ static int AStreamRefillStream( stream_t *s ) /* msg_Dbg( s, "AStreamRefillStream: read=%d", i_read ); */ if( i_read < 0 ) { - msleep( STREAM_DATA_WAIT ); continue; } else if( i_read == 0 ) { - if( !b_read ) return VLC_EGENERIC; + if( !b_read ) + return VLC_EGENERIC; return VLC_SUCCESS; } - b_read = VLC_TRUE; + b_read = true; /* Update end */ tk->i_end += i_read; @@ -1344,13 +1640,13 @@ static void AStreamPrebufferStream( stream_t *s ) /* Update stat */ p_sys->stat.i_bytes = tk->i_end - tk->i_start; p_sys->stat.i_read_time = i_date - i_start; - i_byterate = ( I64C(1000000) * p_sys->stat.i_bytes ) / + i_byterate = ( INT64_C(1000000) * p_sys->stat.i_bytes ) / (p_sys->stat.i_read_time+1); - msg_Dbg( s, "pre-buffering done "I64Fd" bytes in "I64Fd"s - " - I64Fd" kbytes/s", + 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 / I64C(1000000), + p_sys->stat.i_read_time / INT64_C(1000000), i_byterate / 1024 ); break; } @@ -1360,15 +1656,9 @@ static void AStreamPrebufferStream( stream_t *s ) i_read = __MIN( p_sys->stream.i_read_size, i_read ); i_read = AReadStream( s, &tk->p_buffer[tk->i_end], i_read ); if( i_read < 0 ) - { - msleep( STREAM_DATA_WAIT ); continue; - } else if( i_read == 0 ) - { - /* EOF */ - break; - } + break; /* EOF */ if( i_first == 0 ) { @@ -1382,6 +1672,144 @@ static void AStreamPrebufferStream( stream_t *s ) } } +/**************************************************************************** + * Method 3: + ****************************************************************************/ + +static int AStreamReadImmediate( stream_t *s, void *p_read, unsigned int i_read ) +{ + stream_sys_t *p_sys = s->p_sys; + uint8_t *p_data= (uint8_t*)p_read; + uint8_t *p_record = p_data; + unsigned int i_data; + +#ifdef STREAM_DEBUG + msg_Dbg( s, "AStreamReadImmediate p_read=%p i_read=%d", + p_read, i_read ); +#endif + + if( p_sys->record.b_active && !p_data ) + p_record = p_data = malloc( i_read ); + + /* First, check if we already have some data in the buffer, + * that we could copy directly */ + i_data = __MIN( stream_buffered_size( s ), i_read ); + if( i_data > 0 ) + { +#ifdef STREAM_DEBUG + msg_Dbg( s, "AStreamReadImmediate: copy %u from %p", i_data, stream_buffer( s ) ); +#endif + + assert( i_data <= STREAM_CACHE_SIZE ); + + if( p_data ) + { + memcpy( p_data, stream_buffer( s ), i_data ); + p_data += i_data; + } + } + + /* Now that we've read our buffer we don't need its i_copy bytes */ + stream_buffer_empty( s, i_data ); + + /* Now check if we have still to really read some data */ + while( i_data < i_read ) + { + const unsigned int i_to_read = i_read - i_data; + int i_result; + + if( p_data ) + { + i_result = AReadStream( s, p_data, i_to_read ); + } + else + { + void *p_dummy = malloc( i_to_read ); + + if( !p_dummy ) + break; + + i_result = AReadStream( s, p_dummy, i_to_read ); + + free( p_dummy ); + } + if( i_result <= 0 ) + break; + + p_sys->i_pos += i_data; + if( p_data ) + p_data += i_result; + i_data += i_result; + } + + if( p_sys->record.b_active ) + { + if( i_data > 0 && p_record != NULL) + ARecordWrite( s, p_record, i_data ); + if( !p_read ) + free( p_record ); + } + return i_data; +} + +static int AStreamPeekImmediate( stream_t *s, const uint8_t **pp_peek, unsigned int i_read ) +{ +#ifdef STREAM_DEBUG + msg_Dbg( s, "AStreamPeekImmediate: %d size=%"PRId64, + i_read, size_buffered_size( s ) ); +#endif + + /* Avoid problem, but that shouldn't happen + * FIXME yes it can */ + if( i_read > STREAM_CACHE_SIZE / 2 ) + i_read = STREAM_CACHE_SIZE / 2; + + int i_to_read = i_read - stream_buffered_size( s ); + if( i_to_read > 0 ) + { +#ifdef STREAM_DEBUG + msg_Dbg( s, "AStreamPeekImmediate: Reading %d", + i_to_read ); +#endif + i_to_read = AReadStream( s, stream_buffer( s ) + stream_buffered_size( s ), + i_to_read ); + + if( i_to_read > 0 ) + stream_buffer_fill( s, i_to_read ); + } + + *pp_peek = stream_buffer( s ); + + return __MIN( stream_buffered_size( s ), i_read ); +} + +static int AStreamSeekImmediate( stream_t *s, int64_t i_pos ) +{ + stream_sys_t *p_sys = s->p_sys; + access_t *p_access = p_sys->p_access; + bool b_aseek; + +#ifdef STREAM_DEBUG + msg_Dbg( s, "AStreamSeekImmediate to %"PRId64" pos=%"PRId64 + i_pos, p_sys->i_pos ); +#endif + + access_Control( p_access, ACCESS_CAN_SEEK, &b_aseek ); + if( !b_aseek ) + { + /* We can't do nothing */ + msg_Dbg( s, "AStreamSeekImmediate: can't seek" ); + return VLC_EGENERIC; + } + + /* Just reset our buffer */ + stream_buffer_empty( s, stream_buffered_size( s ) ); + + if( ASeek( s, i_pos ) ) + return VLC_EGENERIC; + + return VLC_SUCCESS; +} /**************************************************************************** * stream_ReadLine: @@ -1393,7 +1821,7 @@ static void AStreamPrebufferStream( stream_t *s ) */ #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; @@ -1401,7 +1829,7 @@ char * stream_ReadLine( stream_t *s ) while( i_read < STREAM_LINE_MAX ) { char *psz_eol; - uint8_t *p_data; + const uint8_t *p_data; int i_data; int64_t i_pos; @@ -1411,45 +1839,26 @@ char * stream_ReadLine( stream_t *s ) /* BOM detection */ i_pos = stream_Tell( s ); - if( i_pos == 0 && i_data > 4 ) + if( i_pos == 0 && i_data >= 3 ) { int i_bom_size = 0; - char *psz_encoding = NULL; + const char *psz_encoding = NULL; - if( p_data[0] == 0xEF && p_data[1] == 0xBB && p_data[2] == 0xBF ) + if( !memcmp( p_data, "\xEF\xBB\xBF", 3 ) ) { - psz_encoding = strdup( "UTF-8" ); + psz_encoding = "UTF-8"; i_bom_size = 3; } - else if( p_data[0] == 0x00 && p_data[1] == 0x00 ) + else if( !memcmp( p_data, "\xFF\xFE", 2 ) ) { - 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; - } + psz_encoding = "UTF-16LE"; + s->b_little_endian = true; + s->i_char_width = 2; + i_bom_size = 2; } - else if( p_data[0] == 0xFE && p_data[1] == 0xFF ) + else if( !memcmp( p_data, "\xFE\xFF", 2 ) ) { - psz_encoding = strdup( "UTF-16BE" ); + psz_encoding = "UTF-16BE"; s->i_char_width = 2; i_bom_size = 2; } @@ -1482,7 +1891,6 @@ char * stream_ReadLine( stream_t *s ) var_SetString( p_input, "subsdec-encoding", "UTF-8" ); vlc_object_release( p_input ); } - if( psz_encoding ) free( psz_encoding ); } } @@ -1504,12 +1912,12 @@ char * stream_ReadLine( stream_t *s ) } else { - uint8_t *p = p_data; - uint8_t *p_last = p + i_data - s->i_char_width; + 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) + if( s->b_little_endian == true) { /* UTF-16LE: 0A 00 */ while( p <= p_last && ( p[0] != 0x0A || p[1] != 0x00 ) ) @@ -1522,23 +1930,6 @@ char * stream_ReadLine( stream_t *s ) 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 ) { @@ -1554,6 +1945,8 @@ char * stream_ReadLine( stream_t *s ) { 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 ) + 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 */; @@ -1565,6 +1958,8 @@ char * stream_ReadLine( stream_t *s ) /* Read data (+1 for easy \0 append) */ p_line = realloc( p_line, i_line + STREAM_PROBE_LINE + s->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; @@ -1588,7 +1983,8 @@ char * stream_ReadLine( stream_t *s ) /* 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; @@ -1598,7 +1994,7 @@ char * stream_ReadLine( stream_t *s ) 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 ); + free( p_line ); p_line = psz_new_line; i_line = (size_t)i_line - i_out; /* does not include \0 */ } @@ -1613,8 +2009,10 @@ char * stream_ReadLine( stream_t *s ) return p_line; } +error: + /* We failed to read any data, probably EOF */ - if( p_line ) free( p_line ); + free( p_line ); if( s->conv != (vlc_iconv_t)(-1) ) vlc_iconv_close( s->conv ); return NULL; } @@ -1622,7 +2020,7 @@ char * stream_ReadLine( stream_t *s ) /**************************************************************************** * Access reading/seeking wrappers to handle concatenated streams. ****************************************************************************/ -static int AReadStream( stream_t *s, void *p_read, int i_read ) +static int AReadStream( stream_t *s, void *p_read, unsigned int i_read ) { stream_sys_t *p_sys = s->p_sys; access_t *p_access = p_sys->p_access; @@ -1637,9 +2035,10 @@ static int AReadStream( stream_t *s, void *p_read, int i_read ) 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_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 ); @@ -1647,13 +2046,14 @@ static int AReadStream( stream_t *s, void *p_read, int i_read ) (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; } 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 ) @@ -1663,12 +2063,12 @@ static int AReadStream( stream_t *s, void *p_read, int i_read ) msg_Dbg( s, "opening input `%s'", psz_name ); - p_list_access = access2_New( s, p_access->psz_access, "", psz_name, 0 ); + p_list_access = access_New( s, p_access->psz_access, "", psz_name ); if( !p_list_access ) return 0; if( p_sys->p_list_access != p_access ) - access2_Delete( p_sys->p_list_access ); + access_Delete( p_sys->p_list_access ); p_sys->p_list_access = p_list_access; @@ -1679,25 +2079,23 @@ static int AReadStream( stream_t *s, void *p_read, int i_read ) /* 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 ) +static block_t *AReadBlock( stream_t *s, bool *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; + bool b_eof; int i_total = 0; if( s->p_parent && s->p_parent->p_parent && @@ -1707,10 +2105,11 @@ static block_t *AReadBlock( stream_t *s, vlc_bool_t *pb_eof ) if( !p_sys->i_list ) { 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 && p_access->p_libvlc->b_stats ) + if( p_input && p_block && libvlc_stats (p_access) ) { - 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 ); @@ -1718,12 +2117,13 @@ static block_t *AReadBlock( stream_t *s, vlc_bool_t *pb_eof ) (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 ); + 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; @@ -1735,12 +2135,12 @@ static block_t *AReadBlock( stream_t *s, vlc_bool_t *pb_eof ) msg_Dbg( s, "opening input `%s'", psz_name ); - p_list_access = access2_New( s, p_access->psz_access, "", psz_name, 0 ); + p_list_access = access_New( s, p_access->psz_access, "", psz_name ); if( !p_list_access ) return 0; if( p_sys->p_list_access != p_access ) - access2_Delete( p_sys->p_list_access ); + access_Delete( p_sys->p_list_access ); p_sys->p_list_access = p_list_access; @@ -1751,7 +2151,6 @@ static block_t *AReadBlock( stream_t *s, vlc_bool_t *pb_eof ) { 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 ); @@ -1760,7 +2159,6 @@ static block_t *AReadBlock( stream_t *s, vlc_bool_t *pb_eof ) 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; @@ -1792,7 +2190,7 @@ static int ASeek( stream_t *s, int64_t i_pos ) if( i != p_sys->i_list_index && i != 0 ) { p_list_access = - access2_New( s, p_access->psz_access, "", psz_name, 0 ); + access_New( s, p_access->psz_access, "", psz_name ); } else if( i != p_sys->i_list_index ) { @@ -1802,7 +2200,7 @@ static int ASeek( stream_t *s, int64_t i_pos ) if( p_list_access ) { if( p_sys->p_list_access != p_access ) - access2_Delete( p_sys->p_list_access ); + access_Delete( p_sys->p_list_access ); p_sys->p_list_access = p_list_access; } @@ -1837,7 +2235,7 @@ int stream_Read( stream_t *s, void *p_read, int i_read ) * the end of the stream (but only when you have i_peek >= * p_input->i_bufsize) */ -int stream_Peek( stream_t *s, uint8_t **pp_peek, int i_peek ) +int stream_Peek( stream_t *s, const uint8_t **pp_peek, int i_peek ) { return s->pf_peek( s, pp_peek, i_peek ); } @@ -1865,7 +2263,7 @@ int stream_Control( stream_t *s, int i_query, ... ) va_list args; int i_result; - if ( s == NULL ) + if( s == NULL ) return VLC_EGENERIC; va_start( args, i_query ); @@ -1883,23 +2281,17 @@ block_t *stream_Block( stream_t *s, int i_size ) { if( i_size <= 0 ) return NULL; - if( s->pf_block ) - { - return s->pf_block( s, i_size ); - } - else + /* emulate block read */ + block_t *p_bk = block_New( s, i_size ); + if( p_bk ) { - /* emulate block read */ - block_t *p_bk = block_New( s, i_size ); - if( p_bk ) + int i_read = stream_Read( s, p_bk->p_buffer, i_size ); + if( i_read > 0 ) { - p_bk->i_buffer = stream_Read( s, p_bk->p_buffer, i_size ); - if( p_bk->i_buffer > 0 ) - { - return p_bk; - } + p_bk->i_buffer = i_read; + return p_bk; } - if( p_bk ) block_Release( p_bk ); - return NULL; + block_Release( p_bk ); } + return NULL; }