X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finput%2Fstream.c;h=aaf7f94169673cea50f9584475718935214fa1e7;hb=afcdbd2da4b1072c0c20c274b15e1177942fc784;hp=b50a1a3bb3796455b60749e2c8df8d4d7670b4ab;hpb=44a1dd652ea0d1ffe596561c9cce69e64fb47da1;p=vlc diff --git a/src/input/stream.c b/src/input/stream.c index b50a1a3bb3..aaf7f94169 100644 --- a/src/input/stream.c +++ b/src/input/stream.c @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include @@ -40,7 +40,7 @@ #include "input_internal.h" -#undef STREAM_DEBUG +// #define STREAM_DEBUG 1 /* TODO: * - tune the 2 methods (block/stream) @@ -100,8 +100,8 @@ 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; @@ -110,7 +110,7 @@ typedef struct typedef struct { char *psz_path; - int64_t i_size; + uint64_t i_size; } access_entry_t; @@ -126,16 +126,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; @@ -144,16 +144,16 @@ 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; @@ -167,13 +167,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; @@ -182,22 +182,19 @@ struct stream_sys_t access_entry_t **list; int i_list_index; access_t *p_list_access; - - /* Preparse mode ? */ - bool b_quick; }; /* 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 ); @@ -205,7 +202,7 @@ static int AReadStream( stream_t *s, void *p_read, unsigned int i_read ); 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 ASeek( stream_t *s, uint64_t i_pos ); /**************************************************************************** * stream_CommonNew: create an empty stream structure @@ -232,6 +229,7 @@ stream_t *stream_CommonNew( vlc_object_t *p_obj ) return s; } + void stream_CommonDelete( stream_t *s ) { if( s->p_text ) @@ -240,13 +238,15 @@ void stream_CommonDelete( stream_t *s ) vlc_iconv_close( s->p_text->conv ); free( s->p_text ); } + 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; @@ -260,8 +260,15 @@ stream_t *__stream_UrlNew( vlc_object_t *p_parent, const char *psz_url ) strcpy( psz_dup, psz_url ); input_SplitMRL( &psz_access, &psz_demux, &psz_path, psz_dup ); + /* Get a weak link to the parent input */ + /* FIXME: This should probably be removed in favor of a NULL input. */ + input_thread_t *p_input = (input_thread_t *)vlc_object_find( p_parent, VLC_OBJECT_INPUT, FIND_PARENT ); + /* Now try a real access */ - p_access = access_New( p_parent, psz_access, psz_demux, psz_path ); + p_access = access_New( p_parent, p_input, psz_access, psz_demux, psz_path ); + + if(p_input) + vlc_object_release((vlc_object_t*)p_input); if( p_access == NULL ) { @@ -269,7 +276,7 @@ stream_t *__stream_UrlNew( vlc_object_t *p_parent, const char *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; @@ -279,17 +286,18 @@ 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 = 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_path = strdup( p_access->psz_path ); + s->p_sys = p_sys = malloc( sizeof( *p_sys ) ); + if( !s->psz_path || !s->p_sys ) { stream_CommonDelete( s ); return NULL; @@ -320,69 +328,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 ) + 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; @@ -429,12 +422,10 @@ stream_t *stream_AccessNew( access_t *p_access, bool b_quick ) if( p_sys->stream.p_buffer == NULL ) 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++ ) { @@ -469,9 +460,7 @@ 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 ); stream_CommonDelete( s ); return NULL; } @@ -483,8 +472,6 @@ static void AStreamDestroy( stream_t *s ) { stream_sys_t *p_sys = s->p_sys; - vlc_object_detach( s ); - if( p_sys->method == STREAM_METHOD_BLOCK ) block_ChainRelease( p_sys->block.p_first ); else @@ -588,14 +575,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; - 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; @@ -618,12 +605,12 @@ 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: @@ -635,9 +622,6 @@ 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 ); @@ -678,7 +662,6 @@ static int AStreamControl( stream_t *s, int i_query, va_list args ) 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; @@ -702,7 +685,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 ); @@ -820,7 +803,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; @@ -867,7 +850,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; @@ -875,12 +858,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; @@ -974,21 +957,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; @@ -1000,7 +984,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 */ @@ -1024,7 +1007,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; @@ -1039,10 +1022,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; @@ -1054,11 +1036,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; } @@ -1068,89 +1048,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; - unsigned int i_data = 0; - - if( tk->i_start >= tk->i_end ) - return 0; /* EOF */ - - if( p_data == NULL ) - { - /* seek within this stream if possible, else use plain old read and discard */ - stream_sys_t *p_sys = s->p_sys; - access_t *p_access = p_sys->p_access; - /* 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 ); - - 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; + const uint64_t i_pos_wanted = p_sys->i_pos + i_read; - /* */ - 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( AStreamSeekStream( s, i_pos_wanted ) ) { - if( p_sys->stream.i_used < i_read - i_data ) - p_sys->stream.i_used = __MIN( i_read - i_data, STREAM_READ_ATONCE * 10 ); - - if( AStreamRefillStream( s ) ) - { - /* EOF */ - if( tk->i_start >= tk->i_end ) break; - } + if( p_sys->i_pos != i_pos_wanted ) + return 0; } + 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 */ @@ -1165,19 +1087,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; @@ -1189,7 +1113,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; @@ -1207,146 +1131,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 ); -#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" ); + p_current->i_end ); #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 = __MAX( __MIN( i_read - i_data, + STREAM_READ_ATONCE * 10 ), + STREAM_READ_ATONCE / 2 ); + + if( p_sys->stream.i_used < i_read_requested ) + p_sys->stream.i_used = i_read_requested; + + if( AStreamRefillStream( s ) ) + { + /* EOF */ + if( tk->i_start >= tk->i_end ) break; + } + } + } + + return i_data; } + static int AStreamRefillStream( stream_t *s ) { stream_sys_t *p_sys = s->p_sys; @@ -1395,9 +1391,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; @@ -1419,7 +1415,6 @@ 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; @@ -1432,19 +1427,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 >= STREAM_CACHE_PREBUFFER_SIZE ) + 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 ); @@ -1452,9 +1448,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 ) @@ -1547,13 +1543,11 @@ char *stream_ReadLine( stream_t *s ) } /* FIXME that's UGLY */ - input_thread_t *p_input; - p_input = (input_thread_t *)vlc_object_find( s, VLC_OBJECT_INPUT, FIND_PARENT ); + 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 ); } } } @@ -1573,42 +1567,46 @@ char *stream_ReadLine( stream_t *s ) { /* 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->p_text->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->p_text->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->p_text->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->p_text->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 ) { i_data = (psz_eol - (char *)p_data) + 1; - p_line = realloc( p_line, i_line + i_data + s->p_text->i_char_width ); /* add \0 */ + 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 ); @@ -1621,7 +1619,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->p_text->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 ); @@ -1696,7 +1695,7 @@ static int AReadStream( stream_t *s, void *p_read, unsigned int 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 ) + vlc_internals( s->p_parent->p_parent )->i_object_type == VLC_OBJECT_INPUT ) p_input = (input_thread_t *)s->p_parent->p_parent; if( !p_sys->i_list ) @@ -1730,7 +1729,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; @@ -1766,7 +1765,7 @@ static block_t *AReadBlock( stream_t *s, bool *pb_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 ) + vlc_internals( s->p_parent->p_parent )->i_object_type == VLC_OBJECT_INPUT ) p_input = (input_thread_t *)s->p_parent->p_parent; if( !p_sys->i_list ) @@ -1802,7 +1801,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; @@ -1831,7 +1830,7 @@ static block_t *AReadBlock( stream_t *s, bool *pb_eof ) 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; @@ -1857,7 +1856,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 ) {