X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finput%2Fstream.c;h=54d8ca8cf31fb618dcb22f0376c2a80c190e0dd7;hb=5ebbfb5b476207bbd9a36cd25c725f1b2231738d;hp=c6395e1942cad2224aa9eef3c23c0fc5bb26fff8;hpb=ea83a25e84bca24d045c34713ce7008ea5ce4e8a;p=vlc diff --git a/src/input/stream.c b/src/input/stream.c index c6395e1942..54d8ca8cf3 100644 --- a/src/input/stream.c +++ b/src/input/stream.c @@ -1,24 +1,24 @@ /***************************************************************************** * stream.c ***************************************************************************** - * Copyright (C) 1999-2004 the VideoLAN team + * Copyright (C) 1999-2004 VLC authors and VideoLAN * $Id$ * * Authors: Laurent Aimar * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. * - * 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ #ifdef HAVE_CONFIG_H @@ -30,8 +30,7 @@ #include #include -#include -#include +#include #include @@ -40,14 +39,13 @@ #include "input_internal.h" -#undef STREAM_DEBUG +// #define STREAM_DEBUG 1 /* TODO: * - 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: @@ -71,10 +69,10 @@ # define STREAM_CACHE_SIZE (4*STREAM_CACHE_TRACK*1024*1024) #endif -/* How many data we try to prebuffer */ -#define STREAM_CACHE_PREBUFFER_SIZE (32767) -/* Maximum time we take to pre-buffer */ -#define STREAM_CACHE_PREBUFFER_LENGTH (100*1000) +/* 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. @@ -94,15 +92,15 @@ * - compute a good value for i_read_size * - ? */ -#define STREAM_READ_ATONCE 32767 +#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; + uint64_t i_start; + uint64_t i_end; uint8_t *p_buffer; @@ -111,13 +109,12 @@ typedef struct typedef struct { char *psz_path; - int64_t i_size; + uint64_t i_size; } access_entry_t; -typedef enum stream_read_method_t +typedef enum { - STREAM_METHOD_IMMEDIATE, STREAM_METHOD_BLOCK, STREAM_METHOD_STREAM } stream_read_method_t; @@ -128,16 +125,16 @@ struct stream_sys_t stream_read_method_t method; /* method to use */ - int64_t i_pos; /* Current reading offset */ + uint64_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 */ + uint64_t i_start; /* Offset of block for p_first */ + uint64_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 */ + uint64_t i_size; /* Total amount of data in the list */ block_t *p_first; block_t **pp_last; @@ -146,26 +143,19 @@ struct stream_sys_t /* Method 2: for pf_read */ struct { - int i_offset; /* Buffer offset in the current track */ - int i_tk; /* Current track */ + unsigned 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; + unsigned i_used; /* Used since last read */ + unsigned i_read_size; } stream; - /* Method 3: for pf_read */ - struct - { - int64_t i_end; - uint8_t *p_buffer; - } immediate; - /* Peek temporary buffer */ unsigned int i_peek; uint8_t *p_peek; @@ -176,13 +166,13 @@ struct stream_sys_t bool b_fastseek; /* From access */ /* Stat about reading data */ - int64_t i_read_count; - int64_t i_bytes; - int64_t i_read_time; + uint64_t i_read_count; + uint64_t i_bytes; + uint64_t i_read_time; /* Stat about seek */ - int i_seek_count; - int64_t i_seek_time; + unsigned i_seek_count; + uint64_t i_seek_time; } stat; @@ -191,85 +181,73 @@ struct stream_sys_t access_entry_t **list; int i_list_index; access_t *p_list_access; - - /* Preparse mode ? */ - 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, 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 int AStreamSeekBlock( stream_t *s, uint64_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 int AStreamSeekStream( stream_t *s, uint64_t i_pos ); static void AStreamPrebufferStream( stream_t *s ); 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 ); +static int ASeek( stream_t *s, uint64_t i_pos ); /**************************************************************************** - * Method 3 helpers: + * stream_CommonNew: create an empty stream structure ****************************************************************************/ - -static inline int64_t stream_buffered_size( stream_t *s ) +stream_t *stream_CommonNew( vlc_object_t *p_obj ) { - return s->p_sys->immediate.i_end; -} + stream_t *s = (stream_t *)vlc_custom_create( p_obj, sizeof(*s), "stream" ); -static inline void stream_buffer_empty( stream_t *s, int length ) -{ - length = __MAX( stream_buffered_size( s ), length ); - if( length ) + if( !s ) + return NULL; + + s->p_text = malloc( sizeof(*s->p_text) ); + if( !s->p_text ) { - memmove( s->p_sys->immediate.p_buffer, - s->p_sys->immediate.p_buffer + length, - stream_buffered_size( s ) - length ); + vlc_object_release( s ); + return NULL; } - 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; + /* 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; } -static inline uint8_t * stream_buffer( stream_t *s ) +void stream_CommonDelete( stream_t *s ) { - return s->p_sys->immediate.p_buffer; + 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_access ); + free( s->psz_path ); + vlc_object_release( s ); } +#undef stream_UrlNew /**************************************************************************** * stream_UrlNew: create a stream from a access ****************************************************************************/ -stream_t *__stream_UrlNew( vlc_object_t *p_parent, const char *psz_url ) +stream_t *stream_UrlNew( vlc_object_t *p_parent, const char *psz_url ) { - const char *psz_access, *psz_demux; - char *psz_path; + const char *psz_access, *psz_demux, *psz_path, *psz_anchor; access_t *p_access; stream_t *p_res; @@ -278,18 +256,17 @@ stream_t *__stream_UrlNew( vlc_object_t *p_parent, const char *psz_url ) char psz_dup[strlen( psz_url ) + 1]; strcpy( psz_dup, psz_url ); - input_SplitMRL( &psz_access, &psz_demux, &psz_path, psz_dup ); + input_SplitMRL( &psz_access, &psz_demux, &psz_path, &psz_anchor, psz_dup ); /* Now try a real access */ - p_access = access_New( p_parent, psz_access, psz_demux, psz_path ); - + p_access = access_New( p_parent, NULL, 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, true ) ) ) + if( !( p_res = stream_AccessNew( p_access, NULL ) ) ) { access_Delete( p_access ); return NULL; @@ -299,46 +276,36 @@ stream_t *__stream_UrlNew( vlc_object_t *p_parent, const char *psz_url ) return p_res; } -stream_t *stream_AccessNew( access_t *p_access, bool b_quick ) +stream_t *stream_AccessNew( access_t *p_access, char **ppsz_list ) { - 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 = NULL; if( !s ) return NULL; - s->p_sys = p_sys = malloc( sizeof( stream_sys_t ) ); - if( !p_sys ) + s->p_input = p_access->p_input; + s->psz_access = strdup( p_access->psz_access ); + s->psz_path = strdup( p_access->psz_location ); + s->p_sys = p_sys = malloc( sizeof( *p_sys ) ); + if( !s->psz_access || !s->psz_path || !s->p_sys ) { - vlc_object_release( s ); + 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; - /* UTF16 and UTF32 text file conversion */ - s->i_char_width = 1; - s->b_little_endian = false; - s->conv = (vlc_iconv_t)(-1); - /* Common field */ p_sys->p_access = p_access; 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 */ @@ -349,69 +316,54 @@ stream_t *stream_AccessNew( access_t *p_access, bool b_quick ) p_sys->stat.i_seek_count = 0; p_sys->stat.i_seek_time = 0; - p_sys->i_list = 0; - p_sys->list = 0; + TAB_INIT( p_sys->i_list, p_sys->list ); p_sys->i_list_index = 0; - p_sys->p_list_access = 0; - - p_sys->b_quick = b_quick; + p_sys->p_list_access = NULL; /* Get the additional list of inputs if any (for concatenation) */ - if( (psz_list = var_CreateGetString( s, "input-list" )) && *psz_list ) + if( ppsz_list && ppsz_list[0] ) { - access_entry_t *p_entry = malloc( sizeof(access_entry_t) ); - if( p_entry == NULL ) + access_entry_t *p_entry = malloc( sizeof(*p_entry) ); + if( !p_entry ) 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 ) + p_entry->psz_path = strdup( p_access->psz_location ); + 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 ); - while( psz_name && *psz_name ) + for( int i = 0; ppsz_list[i] != NULL; i++ ) { - psz_parser = strchr( psz_name, ',' ); - if( psz_parser ) *psz_parser = 0; + char *psz_name = strdup( ppsz_list[i] ); - psz_name = strdup( psz_name ); - if( psz_name ) - { - access_t *p_tmp = access_New( p_access, p_access->psz_access, - "", psz_name ); + if( !psz_name ) + break; - if( !p_tmp ) - { - psz_name = psz_parser; - if( psz_name ) psz_name++; - continue; - } + access_t *p_tmp = access_New( p_access, p_access->p_input, + 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 ); + 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 = 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 ); } - - psz_name = psz_parser; - if( psz_name ) psz_name++; + access_Delete( p_tmp ); } } - FREENULL( psz_list ); /* Peek */ p_sys->i_peek = 0; @@ -419,7 +371,7 @@ stream_t *stream_AccessNew( access_t *p_access, bool b_quick ) if( p_sys->method == STREAM_METHOD_BLOCK ) { - msg_Dbg( s, "Using AStream*Block" ); + msg_Dbg( s, "Using block method for AStream*" ); s->pf_read = AStreamReadBlock; s->pf_peek = AStreamPeekBlock; @@ -440,35 +392,13 @@ stream_t *stream_AccessNew( access_t *p_access, bool 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" ); + msg_Dbg( s, "Using stream method for AStream*" ); s->pf_read = AStreamReadStream; s->pf_peek = AStreamPeekStream; @@ -478,18 +408,12 @@ stream_t *stream_AccessNew( access_t *p_access, bool b_quick ) 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; - 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; - else if( p_sys->stream.i_read_size <= 256 ) - p_sys->stream.i_read_size = 256; + 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++ ) { @@ -524,10 +448,8 @@ error: 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_release( s ); + stream_CommonDelete( s ); return NULL; } @@ -538,15 +460,8 @@ static void AStreamDestroy( stream_t *s ) { stream_sys_t *p_sys = s->p_sys; - vlc_object_detach( s ); - - if( p_sys->record.b_active ) - ARecordSetState( s, false, NULL ); - 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 ); @@ -564,7 +479,7 @@ static void AStreamDestroy( stream_t *s ) free( p_sys->list ); free( p_sys ); - vlc_object_release( s ); + stream_CommonDelete( s ); } static void UStreamDestroy( stream_t *s ) @@ -575,9 +490,9 @@ static void UStreamDestroy( stream_t *s ) } /**************************************************************************** - * stream_AccessReset: + * AStreamControlReset: ****************************************************************************/ -void stream_AccessReset( stream_t *s ) +static void AStreamControlReset( stream_t *s ) { stream_sys_t *p_sys = s->p_sys; @@ -598,10 +513,6 @@ 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; @@ -626,9 +537,9 @@ void stream_AccessReset( stream_t *s ) } /**************************************************************************** - * stream_AccessUpdate: + * AStreamControlUpdate: ****************************************************************************/ -void stream_AccessUpdate( stream_t *s ) +static void AStreamControlUpdate( stream_t *s ) { stream_sys_t *p_sys = s->p_sys; @@ -652,16 +563,14 @@ 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; - bool b_bool; - const char *psz_string; - int64_t *pi_64, i_64; - int i_int; + bool *p_bool; + uint64_t *pi_64, i_64; + int i_int; switch( i_query ) { case STREAM_GET_SIZE: - pi_64 = (int64_t*)va_arg( args, int64_t * ); + pi_64 = va_arg( args, uint64_t * ); if( s->p_sys->i_list ) { int i; @@ -684,18 +593,16 @@ static int AStreamControl( stream_t *s, int i_query, va_list args ) break; case STREAM_GET_POSITION: - pi_64 = (int64_t*)va_arg( args, int64_t * ); + pi_64 = va_arg( args, uint64_t * ); *pi_64 = p_sys->i_pos; break; case STREAM_SET_POSITION: - i_64 = (int64_t)va_arg( args, int64_t ); + i_64 = va_arg( args, uint64_t ); switch( p_sys->method ) { case STREAM_METHOD_BLOCK: return AStreamSeekBlock( s, i_64 ); - case STREAM_METHOD_IMMEDIATE: - return AStreamSeekImmediate( s, i_64 ); case STREAM_METHOD_STREAM: return AStreamSeekStream( s, i_64 ); default: @@ -703,31 +610,33 @@ static int AStreamControl( stream_t *s, int i_query, va_list args ) return VLC_EGENERIC; } - case STREAM_GET_MTU: - 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_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; } - return access_vaControl( p_access, i_int, args ); + 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: - 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 ); return VLC_EGENERIC; @@ -735,121 +644,25 @@ 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: ****************************************************************************/ static void AStreamPrebufferBlock( stream_t *s ) { stream_sys_t *p_sys = s->p_sys; - access_t *p_access = p_sys->p_access; int64_t i_first = 0; int64_t i_start; - msg_Dbg( s, "pre buffering" ); + msg_Dbg( s, "starting pre-buffering" ); i_start = mdate(); for( ;; ) { - int64_t i_date = mdate(); + 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 || - ( i_first > 0 && i_first + STREAM_CACHE_PREBUFFER_LENGTH < i_date ) ) + if( s->b_die || p_sys->block.i_size > STREAM_CACHE_PREBUFFER_SIZE ) { int64_t i_byterate; @@ -860,7 +673,7 @@ static void AStreamPrebufferBlock( stream_t *s ) (p_sys->stat.i_read_time + 1); msg_Dbg( s, "prebuffering done %"PRId64" bytes in %"PRId64"s - " - "%"PRId64" kbytes/s", + "%"PRId64" KiB/s", p_sys->stat.i_bytes, p_sys->stat.i_read_time / INT64_C(1000000), i_byterate / 1024 ); @@ -886,20 +699,12 @@ static void AStreamPrebufferBlock( stream_t *s ) b = b->p_next; } - if( p_access->info.b_prebuffered ) - { - /* Access has already prebufferred - update stats and exit */ - p_sys->stat.i_bytes = p_sys->block.i_size; - p_sys->stat.i_read_time = mdate() - i_start; - break; - } - if( i_first == 0 ) { i_first = mdate(); - msg_Dbg( s, "received first data for our buffer"); + 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; @@ -912,16 +717,12 @@ 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; - 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_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 */ @@ -937,7 +738,7 @@ static int AStreamReadBlock( stream_t *s, void *p_read, unsigned int 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); + unsigned int i_copy = VLC_CLIP( (unsigned int)i_current, 0, i_read - i_data); /* Copy data */ if( p_data ) @@ -966,14 +767,6 @@ static int AStreamReadBlock( stream_t *s, void *p_read, unsigned 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 ); - } - p_sys->i_pos += i_data; return i_data; } @@ -998,7 +791,7 @@ static int AStreamPeekBlock( stream_t *s, const uint8_t **pp_peek, unsigned int /* 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 ); + p_sys->p_peek = realloc_or_free( p_sys->p_peek, i_read ); if( !p_sys->p_peek ) { p_sys->i_peek = 0; @@ -1045,7 +838,7 @@ static int AStreamPeekBlock( stream_t *s, const uint8_t **pp_peek, unsigned int return i_data; } -static int AStreamSeekBlock( stream_t *s, int64_t i_pos ) +static int AStreamSeekBlock( stream_t *s, uint64_t i_pos ) { stream_sys_t *p_sys = s->p_sys; access_t *p_access = p_sys->p_access; @@ -1053,12 +846,12 @@ static int AStreamSeekBlock( stream_t *s, int64_t i_pos ) 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 ) + if( i_offset >= 0 && (uint64_t)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 ) + while( i_current + b->i_buffer < (uint64_t)i_offset ) { i_current += b->i_buffer; b = b->p_next; @@ -1152,21 +945,22 @@ static int AStreamSeekBlock( stream_t *s, int64_t i_pos ) { 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 <= 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; } + if( !p_sys->block.p_current && AStreamRefillBlock( s ) ) + { + if( p_sys->i_pos != i_pos ) + return VLC_EGENERIC; + } } 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->block.i_offset += i_pos - p_sys->i_pos; p_sys->i_pos = i_pos; return VLC_SUCCESS; @@ -1178,7 +972,6 @@ static int AStreamSeekBlock( stream_t *s, int64_t i_pos ) static int AStreamRefillBlock( stream_t *s ) { stream_sys_t *p_sys = s->p_sys; - int64_t i_start, i_stop; block_t *b; /* Release data */ @@ -1202,7 +995,7 @@ static int AStreamRefillBlock( stream_t *s ) } /* Now read a new block */ - i_start = mdate(); + const int64_t i_start = mdate(); for( ;; ) { bool b_eof; @@ -1217,10 +1010,9 @@ static int AStreamRefillBlock( stream_t *s ) return VLC_EGENERIC; } + p_sys->stat.i_read_time += mdate() - i_start; while( b ) { - i_stop = mdate(); - /* Append the block */ p_sys->block.i_size += b->i_buffer; *p_sys->block.pp_last = b; @@ -1232,11 +1024,9 @@ static int AStreamRefillBlock( stream_t *s ) /* Update stat */ p_sys->stat.i_bytes += b->i_buffer; - p_sys->stat.i_read_time += i_stop - i_start; p_sys->stat.i_read_count++; b = b->p_next; - i_start = mdate(); } return VLC_SUCCESS; } @@ -1246,98 +1036,31 @@ static int AStreamRefillBlock( stream_t *s ) * Method 2: ****************************************************************************/ static int AStreamRefillStream( stream_t *s ); +static int AStreamReadNoSeekStream( stream_t *s, void *p_read, unsigned 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; - uint8_t *p_record = p_data; - unsigned int i_data = 0; - - 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_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; - - /* 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=%"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 ) + if( !p_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 ); + const uint64_t i_pos_wanted = p_sys->i_pos + i_read; - if( i_copy <= 0 ) break; /* EOF */ - - /* Copy data */ - /* msg_Dbg( s, "AStreamReadStream: copy %d", i_copy ); */ - if( p_data ) + if( AStreamSeekStream( s, i_pos_wanted ) ) { - memcpy( p_data, &tk->p_buffer[i_off], i_copy ); - p_data += i_copy; + if( p_sys->i_pos != i_pos_wanted ) + return 0; } - i_data += i_copy; - p_sys->stream.i_offset += i_copy; - - /* Update pos now */ - p_sys->i_pos += i_copy; - - /* */ - p_sys->stream.i_used += i_copy; - if( tk->i_start + p_sys->stream.i_offset >= tk->i_end || - p_sys->stream.i_used >= p_sys->stream.i_read_size ) - { - if( AStreamRefillStream( s ) ) - { - /* EOF */ - if( tk->i_start >= tk->i_end ) break; - } - } - } - - 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_read; } - - return i_data; + return AStreamReadNoSeekStream( s, p_read, 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]; - int64_t i_off; + uint64_t i_off; if( tk->i_start >= tk->i_end ) return 0; /* EOF */ @@ -1352,19 +1075,21 @@ static int AStreamPeekStream( stream_t *s, const uint8_t **pp_peek, unsigned int 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 ) + 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); + p_sys->stream.i_used += tk->i_start + p_sys->stream.i_offset + i_read - tk->i_end; } if( AStreamRefillStream( s ) ) break; } - if( tk->i_end - tk->i_start - p_sys->stream.i_offset < i_read ) + 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; @@ -1376,7 +1101,7 @@ static int AStreamPeekStream( stream_t *s, const uint8_t **pp_peek, unsigned int if( p_sys->i_peek < i_read ) { - p_sys->p_peek = realloc( p_sys->p_peek, i_read ); + p_sys->p_peek = realloc_or_free( p_sys->p_peek, i_read ); if( !p_sys->p_peek ) { p_sys->i_peek = 0; @@ -1394,146 +1119,218 @@ static int AStreamPeekStream( stream_t *s, const uint8_t **pp_peek, unsigned int return i_read; } -static int AStreamSeekStream( stream_t *s, int64_t i_pos ) +static int AStreamSeekStream( stream_t *s, uint64_t i_pos ) { 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; + + stream_track_t *p_current = &p_sys->stream.tk[p_sys->stream.i_tk]; + access_t *p_access = p_sys->p_access; + + if( p_current->i_start >= p_current->i_end && i_pos >= p_current->i_end ) + return 0; /* EOF */ #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_current->i_start, p_sys->stream.i_offset, - p_sys->stream.tk[p_sys->stream.i_tk].i_end ); + p_current->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; - } - + bool b_aseek; access_Control( p_access, ACCESS_CAN_SEEK, &b_aseek ); - if( !b_aseek ) + if( !b_aseek && i_pos < p_current->i_start ) { - /* We can't do nothing */ - msg_Dbg( s, "AStreamSeekStream: can't seek" ); + msg_Warn( s, "AStreamSeekStream: can't seek" ); return VLC_EGENERIC; } - /* Date the current track */ - p_sys->stream.tk[p_sys->stream.i_tk].i_date = mdate(); + bool b_afastseek; + access_Control( p_access, ACCESS_CAN_FASTSEEK, &b_afastseek ); - /* Try to reuse already read data */ - for( i = 0; i < STREAM_CACHE_TRACK; i++ ) - { - stream_track_t *tk = &p_sys->stream.tk[i]; + /* FIXME compute seek cost (instead of static 'stupid' value) */ + uint64_t i_skip_threshold; + if( b_aseek ) + i_skip_threshold = b_afastseek ? 128 : 3*p_sys->stream.i_read_size; + else + i_skip_threshold = INT64_MAX; - 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 + /* Date the current track */ + p_current->i_date = mdate(); - /* Seek at the end of the buffer */ - if( ASeek( s, tk->i_end ) ) return VLC_EGENERIC; + /* Search a new track slot */ + stream_track_t *tk = NULL; + int i_tk_idx = -1; - /* 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; + /* Prefer the current track */ + if( p_current->i_start <= i_pos && i_pos <= p_current->i_end + i_skip_threshold ) + { + tk = p_current; + i_tk_idx = p_sys->stream.i_tk; + } + if( !tk ) + { + /* Try to maximize already read data */ + for( int i = 0; i < STREAM_CACHE_TRACK; i++ ) + { + stream_track_t *t = &p_sys->stream.tk[i]; - if( p_sys->stream.i_used < 1024 ) - p_sys->stream.i_used = 1024; + if( t->i_start > i_pos || i_pos > t->i_end ) + continue; - if( AStreamRefillStream( s ) && i_pos == tk->i_end ) - return VLC_EGENERIC; + if( !tk || tk->i_end < t->i_end ) + { + tk = t; + i_tk_idx = i; + } + } + } + if( !tk ) + { + /* Use the oldest unused */ + for( int i = 0; i < STREAM_CACHE_TRACK; i++ ) + { + stream_track_t *t = &p_sys->stream.tk[i]; - return VLC_SUCCESS; + if( !tk || tk->i_date > t->i_date ) + { + tk = t; + i_tk_idx = i; + } } } + assert( i_tk_idx >= 0 && i_tk_idx < STREAM_CACHE_TRACK ); - 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++ ) + if( tk != p_current ) + i_skip_threshold = 0; + if( tk->i_start <= i_pos && i_pos <= tk->i_end + i_skip_threshold ) { - stream_track_t *tk = &p_sys->stream.tk[i]; - - if( i_pos + i_maxth >= tk->i_start ) +#ifdef STREAM_DEBUG + msg_Err( s, "AStreamSeekStream: reusing %d start=%"PRId64 + " end=%"PRId64"(%s)", + i_tk_idx, tk->i_start, tk->i_end, + tk != p_current ? "seek" : i_pos > tk->i_end ? "skip" : "noseek" ); +#endif + if( tk != p_current ) { - msg_Dbg( s, "good segment before current pos, TODO" ); + assert( b_aseek ); + + /* Seek at the end of the buffer + * TODO it is stupid to seek now, it would be better to delay it + */ + if( ASeek( s, tk->i_end ) ) + return VLC_EGENERIC; } - if( i_pos - i_maxth <= tk->i_end ) + else if( i_pos > tk->i_end ) { - msg_Dbg( s, "good segment after current pos, TODO" ); + uint64_t i_skip = i_pos - tk->i_end; + while( i_skip > 0 ) + { + const int i_read_max = __MIN( 10 * STREAM_READ_ATONCE, i_skip ); + if( AStreamReadNoSeekStream( s, NULL, i_read_max ) != i_read_max ) + return VLC_EGENERIC; + i_skip -= i_read_max; + } } } + else + { +#ifdef STREAM_DEBUG + msg_Err( s, "AStreamSeekStream: hard seek" ); #endif + /* Nothing good, seek and choose oldest segment */ + if( ASeek( s, i_pos ) ) + return VLC_EGENERIC; - /* Nothing good, seek and choose oldest segment */ - if( ASeek( s, i_pos ) ) return VLC_EGENERIC; + tk->i_start = i_pos; + tk->i_end = i_pos; + } + p_sys->stream.i_offset = i_pos - tk->i_start; + p_sys->stream.i_tk = i_tk_idx; p_sys->i_pos = i_pos; - i_new = 0; - for( i = 1; i < STREAM_CACHE_TRACK; i++ ) + /* 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.tk[i].i_date < p_sys->stream.tk[i_new].i_date ) - i_new = i; + if( p_sys->stream.i_used < STREAM_READ_ATONCE / 2 ) + p_sys->stream.i_used = STREAM_READ_ATONCE / 2; + + if( AStreamRefillStream( s ) && i_pos == tk->i_end ) + return VLC_EGENERIC; } + return VLC_SUCCESS; +} - /* 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; +static int AStreamReadNoSeekStream( 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]; - /* Read data */ - if( p_sys->stream.i_used < STREAM_READ_ATONCE / 2 ) - p_sys->stream.i_used = STREAM_READ_ATONCE / 2; + uint8_t *p_data = (uint8_t *)p_read; + unsigned int i_data = 0; - if( AStreamRefillStream( s ) ) - return VLC_EGENERIC; + if( tk->i_start >= tk->i_end ) + return 0; /* EOF */ - return VLC_SUCCESS; +#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 ) + { + unsigned i_off = (tk->i_start + p_sys->stream.i_offset) % STREAM_CACHE_TRACK_SIZE; + unsigned int i_current = + __MIN( tk->i_end - tk->i_start - p_sys->stream.i_offset, + STREAM_CACHE_TRACK_SIZE - i_off ); + int i_copy = __MIN( i_current, i_read - i_data ); + + if( i_copy <= 0 ) break; /* EOF */ + + /* Copy data */ + /* msg_Dbg( s, "AStreamReadStream: copy %d", i_copy ); */ + if( p_data ) + { + memcpy( p_data, &tk->p_buffer[i_off], i_copy ); + p_data += i_copy; + } + i_data += i_copy; + p_sys->stream.i_offset += i_copy; + + /* Update pos now */ + p_sys->i_pos += i_copy; + + /* */ + p_sys->stream.i_used += i_copy; + + if( tk->i_end + i_data <= tk->i_start + p_sys->stream.i_offset + i_read ) + { + const unsigned i_read_requested = VLC_CLIP( i_read - i_data, + STREAM_READ_ATONCE / 2, + STREAM_READ_ATONCE * 10 ); + + 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 AStreamRefillStream( stream_t *s ) { stream_sys_t *p_sys = s->p_sys; @@ -1582,9 +1379,9 @@ static int AStreamRefillStream( stream_t *s ) tk->i_end += i_read; /* Windows of STREAM_CACHE_TRACK_SIZE */ - if( tk->i_end - tk->i_start > STREAM_CACHE_TRACK_SIZE ) + if( tk->i_start + STREAM_CACHE_TRACK_SIZE < tk->i_end ) { - int i_invalid = tk->i_end - tk->i_start - STREAM_CACHE_TRACK_SIZE; + unsigned i_invalid = tk->i_end - tk->i_start - STREAM_CACHE_TRACK_SIZE; tk->i_start += i_invalid; p_sys->stream.i_offset -= i_invalid; @@ -1606,15 +1403,11 @@ static int AStreamRefillStream( stream_t *s ) static void AStreamPrebufferStream( stream_t *s ) { stream_sys_t *p_sys = s->p_sys; - access_t *p_access = p_sys->p_access; int64_t i_first = 0; int64_t i_start; - int64_t i_prebuffer = p_sys->b_quick ? STREAM_CACHE_TRACK_SIZE /100 : - ( (p_access->info.i_title > 1 || p_access->info.i_seekpoint > 1) ? - STREAM_CACHE_PREBUFFER_SIZE : STREAM_CACHE_TRACK_SIZE / 3 ); - msg_Dbg( s, "pre-buffering..." ); + msg_Dbg( s, "starting pre-buffering" ); i_start = mdate(); for( ;; ) { @@ -1622,20 +1415,20 @@ static void AStreamPrebufferStream( stream_t *s ) int64_t i_date = mdate(); int i_read; + int i_buffered = tk->i_end - tk->i_start; - if( s->b_die || tk->i_end >= i_prebuffer || - (i_first > 0 && i_first + STREAM_CACHE_PREBUFFER_LENGTH < i_date) ) + if( s->b_die || i_buffered >= 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_bytes = i_buffered; 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", + "%"PRId64" KiB/s", p_sys->stat.i_bytes, p_sys->stat.i_read_time / INT64_C(1000000), i_byterate / 1024 ); @@ -1643,9 +1436,9 @@ static void AStreamPrebufferStream( stream_t *s ) } /* */ - i_read = STREAM_CACHE_TRACK_SIZE - tk->i_end; - i_read = __MIN( p_sys->stream.i_read_size, i_read ); - i_read = AReadStream( s, &tk->p_buffer[tk->i_end], i_read ); + i_read = STREAM_CACHE_TRACK_SIZE - i_buffered; + i_read = __MIN( (int)p_sys->stream.i_read_size, i_read ); + i_read = AReadStream( s, &tk->p_buffer[i_buffered], i_read ); if( i_read < 0 ) continue; else if( i_read == 0 ) @@ -1654,7 +1447,8 @@ static void AStreamPrebufferStream( stream_t *s ) if( i_first == 0 ) { i_first = mdate(); - msg_Dbg( s, "received first data for our buffer"); + msg_Dbg( s, "received first data after %d ms", + (int)((i_first-i_start)/1000) ); } tk->i_end += i_read; @@ -1663,145 +1457,6 @@ 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: ****************************************************************************/ @@ -1843,14 +1498,14 @@ char *stream_ReadLine( stream_t *s ) else if( !memcmp( p_data, "\xFF\xFE", 2 ) ) { psz_encoding = "UTF-16LE"; - s->b_little_endian = true; - s->i_char_width = 2; + s->p_text->b_little_endian = true; + s->p_text->i_char_width = 2; i_bom_size = 2; } else if( !memcmp( p_data, "\xFE\xFF", 2 ) ) { psz_encoding = "UTF-16BE"; - s->i_char_width = 2; + s->p_text->i_char_width = 2; i_bom_size = 2; } @@ -1865,30 +1520,30 @@ char *stream_ReadLine( stream_t *s ) /* Open the converter if we need it */ if( psz_encoding != NULL ) { - input_thread_t *p_input; msg_Dbg( s, "%s BOM detected", psz_encoding ); - p_input = (input_thread_t *)vlc_object_find( s, VLC_OBJECT_INPUT, FIND_PARENT ); - if( s->i_char_width > 1 ) + if( s->p_text->i_char_width > 1 ) { - s->conv = vlc_iconv_open( "UTF-8", psz_encoding ); - if( s->conv == (vlc_iconv_t)-1 ) + s->p_text->conv = vlc_iconv_open( "UTF-8", psz_encoding ); + if( s->p_text->conv == (vlc_iconv_t)-1 ) { msg_Err( s, "iconv_open failed" ); } } + + /* FIXME that's UGLY */ + input_thread_t *p_input = s->p_input; 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 ); } } } - if( i_data % s->i_char_width ) + if( i_data % s->p_text->i_char_width ) { /* keep i_char_width boundary */ - i_data = i_data - ( i_data % s->i_char_width ); + i_data = i_data - ( i_data % s->p_text->i_char_width ); msg_Warn( s, "the read is not i_char_width compatible"); } @@ -1896,51 +1551,55 @@ char *stream_ReadLine( stream_t *s ) break; /* Check if there is an EOL */ - if( s->i_char_width == 1 ) + if( s->p_text->i_char_width == 1 ) { /* UTF-8: 0A */ psz_eol = memchr( p_data, '\n', i_data ); + if( psz_eol == NULL ) + /* UTF-8: 0D */ + psz_eol = memchr( p_data, '\r', i_data ); } else { - const uint8_t *p = p_data; - const uint8_t *p_last = p + i_data - s->i_char_width; + const uint8_t *p_last = p_data + i_data - s->p_text->i_char_width; + uint16_t eol = s->p_text->b_little_endian ? 0x0A00 : 0x00A0; - if( s->i_char_width == 2 ) + assert( s->p_text->i_char_width == 2 ); + psz_eol = NULL; + /* UTF-16: 000A */ + for( const uint8_t *p = p_data; p <= p_last; p += 2 ) { - if( s->b_little_endian == true) - { - /* UTF-16LE: 0A 00 */ - while( p <= p_last && ( p[0] != 0x0A || p[1] != 0x00 ) ) - p += 2; - } - else + if( U16_AT( p ) == eol ) { - /* UTF-16BE: 00 0A */ - while( p <= p_last && ( p[1] != 0x0A || p[0] != 0x00 ) ) - p += 2; + psz_eol = (char *)p + 1; + break; } } - if( p > p_last ) - { - psz_eol = NULL; - } - else - { - psz_eol = (char *)p + ( s->i_char_width - 1 ); + if( psz_eol == NULL ) + { /* UTF-16: 000D */ + eol = s->p_text->b_little_endian ? 0x0D00 : 0x00D0; + for( const uint8_t *p = p_data; p <= p_last; p += 2 ) + { + if( U16_AT( p ) == eol ) + { + psz_eol = (char *)p + 1; + break; + } + } } } - if(psz_eol) + if( psz_eol ) { i_data = (psz_eol - (char *)p_data) + 1; - p_line = realloc( p_line, i_line + i_data + s->i_char_width ); /* add \0 */ + p_line = realloc_or_free( 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->i_char_width; /* skip \n */; + i_line += i_data - s->p_text->i_char_width; /* skip \n */; i_read += i_data; /* We have our line */ @@ -1948,7 +1607,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 ); + p_line = realloc_or_free( 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 ); @@ -1960,12 +1620,12 @@ char *stream_ReadLine( stream_t *s ) if( i_read > 0 ) { int j; - for( j = 0; j < s->i_char_width; j++ ) + for( j = 0; j < s->p_text->i_char_width; j++ ) { p_line[i_line + j] = '\0'; } - i_line += s->i_char_width; /* the added \0 */ - if( s->i_char_width > 1 ) + 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; @@ -1980,7 +1640,7 @@ char *stream_ReadLine( stream_t *s ) p_in = p_line; p_out = psz_new_line; - if( vlc_iconv( s->conv, &p_in, &i_in, &p_out, &i_out ) == (size_t)-1 ) + if( vlc_iconv( s->p_text->conv, &p_in, &i_in, &p_out, &i_out ) == (size_t)-1 ) { msg_Err( s, "iconv failed" ); msg_Dbg( s, "original: %d, in %d, out %d", i_line, (int)i_in, (int)i_out ); @@ -2001,10 +1661,13 @@ char *stream_ReadLine( stream_t *s ) } error: - /* We failed to read any data, probably EOF */ free( p_line ); - if( s->conv != (vlc_iconv_t)(-1) ) vlc_iconv_close( s->conv ); + + /* */ + 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; } @@ -2015,13 +1678,8 @@ 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; - input_thread_t *p_input = NULL; + input_thread_t *p_input = s->p_input; int i_read_orig = i_read; - int i_total = 0; - - if( s->p_parent && s->p_parent->p_parent && - s->p_parent->p_parent->i_object_type == VLC_OBJECT_INPUT ) - p_input = (input_thread_t *)s->p_parent->p_parent; if( !p_sys->i_list ) { @@ -2030,12 +1688,12 @@ static int AReadStream( stream_t *s, void *p_read, unsigned int i_read ) vlc_object_kill( s ); if( p_input ) { + uint64_t total; + 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 ); + stats_Update( p_input->p->counters.p_read_bytes, i_read, &total ); + stats_Update( p_input->p->counters.p_input_bitrate, total, NULL ); + stats_Update( p_input->p->counters.p_read_packets, 1, NULL ); vlc_mutex_unlock( &p_input->p->counters.counters_lock ); } return i_read; @@ -2054,7 +1712,7 @@ static int AReadStream( stream_t *s, void *p_read, unsigned int i_read ) msg_Dbg( s, "opening input `%s'", psz_name ); - p_list_access = access_New( s, p_access->psz_access, "", psz_name ); + p_list_access = access_New( s, s->p_input, p_access->psz_access, "", psz_name ); if( !p_list_access ) return 0; @@ -2070,11 +1728,12 @@ static int AReadStream( stream_t *s, void *p_read, unsigned int i_read ) /* Update read bytes in input */ if( p_input ) { + uint64_t total; + 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 ); + stats_Update( p_input->p->counters.p_read_bytes, i_read, &total ); + stats_Update( p_input->p->counters.p_input_bitrate, total, NULL ); + stats_Update( p_input->p->counters.p_read_packets, 1, NULL ); vlc_mutex_unlock( &p_input->p->counters.counters_lock ); } return i_read; @@ -2084,14 +1743,9 @@ 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; + input_thread_t *p_input = s->p_input; block_t *p_block; bool b_eof; - int i_total = 0; - - if( s->p_parent && s->p_parent->p_parent && - s->p_parent->p_parent->i_object_type == VLC_OBJECT_INPUT ) - p_input = (input_thread_t *)s->p_parent->p_parent; if( !p_sys->i_list ) { @@ -2101,12 +1755,14 @@ static block_t *AReadBlock( stream_t *s, bool *pb_eof ) if( pb_eof ) *pb_eof = p_access->info.b_eof; if( p_input && p_block && libvlc_stats (p_access) ) { + uint64_t total; + 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 ); + stats_Update( p_input->p->counters.p_read_bytes, + p_block->i_buffer, &total ); + stats_Update( p_input->p->counters.p_input_bitrate, + total, NULL ); + stats_Update( p_input->p->counters.p_read_packets, 1, NULL ); vlc_mutex_unlock( &p_input->p->counters.counters_lock ); } return p_block; @@ -2126,7 +1782,7 @@ static block_t *AReadBlock( stream_t *s, bool *pb_eof ) msg_Dbg( s, "opening input `%s'", psz_name ); - p_list_access = access_New( s, p_access->psz_access, "", psz_name ); + p_list_access = access_New( s, s->p_input, p_access->psz_access, "", psz_name ); if( !p_list_access ) return 0; @@ -2142,20 +1798,20 @@ static block_t *AReadBlock( stream_t *s, bool *pb_eof ) { if( p_input ) { + uint64_t total; + 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); + stats_Update( p_input->p->counters.p_read_bytes, + p_block->i_buffer, &total ); + stats_Update( p_input->p->counters.p_input_bitrate, total, NULL ); + stats_Update( p_input->p->counters.p_read_packets, 1 , NULL); vlc_mutex_unlock( &p_input->p->counters.counters_lock ); } } return p_block; } -static int ASeek( stream_t *s, int64_t i_pos ) +static int ASeek( stream_t *s, uint64_t i_pos ) { stream_sys_t *p_sys = s->p_sys; access_t *p_access = p_sys->p_access; @@ -2181,7 +1837,7 @@ static int ASeek( stream_t *s, int64_t i_pos ) if( i != p_sys->i_list_index && i != 0 ) { p_list_access = - access_New( s, p_access->psz_access, "", psz_name ); + access_New( s, s->p_input, p_access->psz_access, "", psz_name ); } else if( i != p_sys->i_list_index ) { @@ -2207,9 +1863,11 @@ static int ASeek( stream_t *s, int64_t i_pos ) /** * Try to read "i_read" bytes into a buffer pointed by "p_read". If - * "p_read" is NULL then data are skipped instead of read. The return - * value is the real numbers of bytes read/skip. If this value is less + * "p_read" is NULL then data are skipped instead of read. + * \return The real number of bytes read/skip. If this value is less * than i_read that means that it's the end of the stream. + * \note stream_Read increments the stream position, and when p_read is NULL, + * this is its only task. */ int stream_Read( stream_t *s, void *p_read, int i_read ) { @@ -2218,12 +1876,15 @@ int stream_Read( stream_t *s, void *p_read, int i_read ) /** * Store in pp_peek a pointer to the next "i_peek" bytes in the stream - * \return The real numbers of valid bytes, if it's less + * \return The real number 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 >= + * \note Contrary to stream_Read, stream_Peek doesn't modify the stream + * position, and doesn't necessarily involve copying of data. It's mainly + * used by the modules to quickly probe the (head of the) stream. + * \note Due to input limitation, the return value 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 ) @@ -2286,3 +1947,48 @@ block_t *stream_Block( stream_t *s, int i_size ) } return NULL; } + +/** + * Read the remaining of the data if there is less than i_max_size bytes, otherwise + * return NULL. + * + * The stream position is unknown after the call. + */ +block_t *stream_BlockRemaining( stream_t *s, int i_max_size ) +{ + int i_allocate = __MIN(1000000, i_max_size); + int64_t i_size = stream_Size( s ); + if( i_size > 0 ) + { + int64_t i_position = stream_Tell( s ); + if( i_position + i_max_size < i_size ) + { + msg_Err( s, "Remaining stream size is greater than %d bytes", + i_max_size ); + return NULL; + } + i_allocate = i_size - i_position; + } + if( i_allocate <= 0 ) + return NULL; + + block_t *p_block = block_New( s, i_allocate ); + int i_index = 0; + while( p_block ) + { + int i_read = stream_Read( s, &p_block->p_buffer[i_index], + p_block->i_buffer - i_index); + if( i_read <= 0 ) + break; + i_index += i_read; + i_max_size -= i_read; + if( i_max_size <= 0 ) + break; + p_block = block_Realloc( p_block, 0, p_block->i_buffer + + __MIN(1000000, i_max_size) ); + } + if( p_block ) + p_block->i_buffer = i_index; + return p_block; +} +