/*****************************************************************************
* stream.c
*****************************************************************************
- * Copyright (C) 1999-2004 the VideoLAN team
+ * Copyright (C) 1999-2004 VLC authors and VideoLAN
* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
- * 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
#include <vlc_common.h>
#include <vlc_strings.h>
-#include <vlc_osd.h>
-#include <vlc_charset.h>
#include <vlc_memory.h>
#include <libvlc.h>
{
int64_t i_date;
- int64_t i_start;
- int64_t i_end;
+ uint64_t i_start;
+ uint64_t i_end;
uint8_t *p_buffer;
typedef struct
{
char *psz_path;
- int64_t i_size;
+ uint64_t i_size;
} access_entry_t;
typedef enum
{
STREAM_METHOD_BLOCK,
- STREAM_METHOD_STREAM
+ STREAM_METHOD_STREAM,
+ STREAM_METHOD_READDIR
} stream_read_method_t;
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;
/* 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;
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;
/* 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 );
+/* ReadDir */
+static int AStreamReadDir( stream_t *s, input_item_node_t *p_node );
+
/* Common */
+static int AStreamGenericError( ) { return VLC_EGENERIC; }
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
****************************************************************************/
stream_t *stream_CommonNew( vlc_object_t *p_obj )
{
- stream_t *s = (stream_t *)vlc_custom_create( p_obj, sizeof(*s),
- VLC_OBJECT_GENERIC, "stream" );
+ stream_t *s = (stream_t *)vlc_custom_create( p_obj, sizeof(*s), "stream" );
if( !s )
return NULL;
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;
if( !psz_url )
return NULL;
char psz_dup[strlen( psz_url ) + 1];
strcpy( psz_dup, psz_url );
- input_SplitMRL( &psz_access, &psz_demux, &psz_path, psz_dup );
+ input_SplitMRL( &psz_access, &psz_demux, &psz_path, &psz_anchor, 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, p_input, psz_access, psz_demux, psz_path );
-
- if(p_input)
- vlc_object_release((vlc_object_t*)p_input);
-
+ 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, NULL ) ) )
- {
- access_Delete( p_access );
- return NULL;
- }
-
- p_res->pf_destroy = UStreamDestroy;
- return p_res;
+ return stream_AccessNew( p_access, NULL );
}
stream_t *stream_AccessNew( access_t *p_access, char **ppsz_list )
return NULL;
s->p_input = p_access->p_input;
- s->psz_path = strdup( p_access->psz_path );
+ 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_path || !s->p_sys )
+ if( !s->psz_access || !s->psz_path || !s->p_sys )
{
stream_CommonDelete( s );
return NULL;
}
- /* Attach it now, needed for b_die */
- vlc_object_attach( s, p_access );
-
- s->pf_read = NULL; /* Set up later */
- s->pf_peek = NULL;
+ s->pf_read = AStreamGenericError; /* Replaced later */
+ s->pf_peek = AStreamGenericError;
+ s->pf_readdir = AStreamGenericError;
s->pf_control = AStreamControl;
s->pf_destroy = AStreamDestroy;
/* Common field */
p_sys->p_access = p_access;
+ assert( p_access->pf_block || p_access->pf_read || p_access->pf_readdir );
if( p_access->pf_block )
p_sys->method = STREAM_METHOD_BLOCK;
- else
+ else if( p_access->pf_read )
p_sys->method = STREAM_METHOD_STREAM;
+ else
+ p_sys->method = STREAM_METHOD_READDIR;
p_sys->i_pos = p_access->info.i_pos;
if( !p_entry )
goto error;
- p_entry->i_size = p_access->info.i_size;
- p_entry->psz_path = strdup( p_access->psz_path );
+ p_entry->i_size = access_GetSize( p_access );
+ p_entry->psz_path = strdup( p_access->psz_location );
if( !p_entry->psz_path )
{
free( p_entry );
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 );
+ p_entry->psz_path, p_entry->i_size );
for( int i = 0; ppsz_list[i] != NULL; i++ )
{
access_t *p_tmp = access_New( p_access, p_access->p_input,
p_access->psz_access, "", psz_name );
if( !p_tmp )
+ {
+ free( psz_name );
continue;
-
- msg_Dbg( p_access, "adding file `%s', (%"PRId64" bytes)",
- psz_name, p_tmp->info.i_size );
+ }
p_entry = malloc( sizeof(*p_entry) );
if( p_entry )
{
- p_entry->i_size = p_tmp->info.i_size;
+ p_entry->i_size = access_GetSize( p_tmp );
p_entry->psz_path = psz_name;
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_entry->i_size );
}
access_Delete( p_tmp );
}
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;
goto error;
}
}
- else
+ else if ( p_sys->method == STREAM_METHOD_STREAM )
{
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;
goto error;
}
}
+ else
+ {
+ msg_Dbg( s, "Using readdir method for AStream*" );
+
+ assert( p_sys->method == STREAM_METHOD_READDIR );
+ s->pf_readdir = AStreamReadDir;
+ }
return s;
{
/* Nothing yet */
}
- else
+ else if( p_sys->method == STREAM_METHOD_STREAM )
{
free( p_sys->stream.p_buffer );
}
free( p_sys->list[--(p_sys->i_list)] );
free( p_sys->list );
free( s->p_sys );
- vlc_object_detach( s );
stream_CommonDelete( s );
+ access_Delete( p_access );
return NULL;
}
{
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
+ else if( p_sys->method == STREAM_METHOD_STREAM )
free( p_sys->stream.p_buffer );
free( p_sys->p_peek );
free( p_sys->list[p_sys->i_list]->psz_path );
free( p_sys->list[p_sys->i_list] );
}
-
free( p_sys->list );
- free( p_sys );
stream_CommonDelete( s );
-}
-
-static void UStreamDestroy( stream_t *s )
-{
- access_t *p_access = (access_t *)s->p_parent;
- AStreamDestroy( s );
- access_Delete( p_access );
+ access_Delete( p_sys->p_access );
+ free( p_sys );
}
/****************************************************************************
}
}
+#define static_control_match(foo) \
+ static_assert((unsigned) STREAM_##foo == ACCESS_##foo, "Mismatch")
+
/****************************************************************************
* AStreamControl:
****************************************************************************/
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;
+ static_control_match(CAN_SEEK);
+ static_control_match(CAN_FASTSEEK);
+ static_control_match(CAN_PAUSE);
+ static_control_match(CAN_CONTROL_PACE);
+ static_control_match(GET_PTS_DELAY);
+ static_control_match(GET_TITLE_INFO);
+ static_control_match(GET_TITLE);
+ static_control_match(GET_SEEKPOINT);
+ static_control_match(GET_META);
+ static_control_match(GET_CONTENT_TYPE);
+ static_control_match(GET_SIGNAL);
+ static_control_match(SET_PAUSE_STATE);
+ static_control_match(SET_TITLE);
+ static_control_match(SET_SEEKPOINT);
+ static_control_match(SET_PRIVATE_ID_STATE);
+ static_control_match(SET_PRIVATE_ID_CA);
+ static_control_match(GET_PRIVATE_ID_STATE);
switch( i_query )
{
+ case STREAM_CAN_SEEK:
+ case STREAM_CAN_FASTSEEK:
+ case STREAM_CAN_PAUSE:
+ case STREAM_CAN_CONTROL_PACE:
+ case STREAM_GET_PTS_DELAY:
+ case STREAM_GET_TITLE_INFO:
+ case STREAM_GET_TITLE:
+ case STREAM_GET_SEEKPOINT:
+ case STREAM_GET_META:
+ case STREAM_GET_CONTENT_TYPE:
+ case STREAM_GET_SIGNAL:
+ case STREAM_SET_PAUSE_STATE:
+ case STREAM_SET_PRIVATE_ID_STATE:
+ case STREAM_SET_PRIVATE_ID_CA:
+ case STREAM_GET_PRIVATE_ID_STATE:
+ return access_vaControl( p_access, i_query, args );
+
case STREAM_GET_SIZE:
- pi_64 = (int64_t*)va_arg( args, int64_t * );
+ {
+ uint64_t *pi_64 = va_arg( args, uint64_t * );
if( s->p_sys->i_list )
{
int i;
*pi_64 += s->p_sys->list[i]->i_size;
break;
}
- *pi_64 = p_access->info.i_size;
- break;
-
- case STREAM_CAN_SEEK:
- p_bool = (bool*)va_arg( args, bool * );
- access_Control( p_access, ACCESS_CAN_SEEK, p_bool );
- break;
-
- case STREAM_CAN_FASTSEEK:
- p_bool = (bool*)va_arg( args, bool * );
- access_Control( p_access, ACCESS_CAN_FASTSEEK, p_bool );
+ *pi_64 = access_GetSize( p_access );
break;
+ }
case STREAM_GET_POSITION:
- pi_64 = (int64_t*)va_arg( args, int64_t * );
- *pi_64 = p_sys->i_pos;
+ *va_arg( args, uint64_t * ) = p_sys->i_pos;
break;
case STREAM_SET_POSITION:
- i_64 = (int64_t)va_arg( args, int64_t );
+ {
+ uint64_t offset = va_arg( args, uint64_t );
switch( p_sys->method )
{
case STREAM_METHOD_BLOCK:
- return AStreamSeekBlock( s, i_64 );
+ return AStreamSeekBlock( s, offset );
case STREAM_METHOD_STREAM:
- return AStreamSeekStream( s, i_64 );
+ return AStreamSeekStream( s, offset );
default:
assert(0);
return VLC_EGENERIC;
}
+ }
+
+ case STREAM_UPDATE_SIZE:
+ AStreamControlUpdate( s );
+ return VLC_SUCCESS;
- case STREAM_CONTROL_ACCESS:
+ case STREAM_SET_TITLE:
+ case STREAM_SET_SEEKPOINT:
{
- i_int = (int) va_arg( args, int );
- if( i_int != ACCESS_SET_PRIVATE_ID_STATE &&
- i_int != ACCESS_SET_PRIVATE_ID_CA &&
- i_int != ACCESS_GET_PRIVATE_ID_STATE &&
- i_int != ACCESS_SET_TITLE &&
- i_int != ACCESS_SET_SEEKPOINT )
- {
- msg_Err( s, "Hey, what are you thinking ?"
- "DON'T USE STREAM_CONTROL_ACCESS !!!" );
- return VLC_EGENERIC;
- }
- int i_ret = access_vaControl( p_access, i_int, args );
- if( i_int == ACCESS_SET_TITLE || i_int == ACCESS_SET_SEEKPOINT )
+ int ret = access_vaControl( p_access, i_query, args );
+ if( ret == VLC_SUCCESS )
AStreamControlReset( s );
- return i_ret;
+ return ret;
}
- case STREAM_UPDATE_SIZE:
- AStreamControlUpdate( s );
+ case STREAM_IS_DIRECTORY:
+ {
+ bool *pb_canreaddir = va_arg( args, bool * );
+ *pb_canreaddir = p_sys->method == STREAM_METHOD_READDIR;
return VLC_SUCCESS;
+ }
- case STREAM_GET_CONTENT_TYPE:
- return access_Control( p_access, ACCESS_GET_CONTENT_TYPE,
- va_arg( args, char ** ) );
case STREAM_SET_RECORD_STATE:
default:
msg_Err( s, "invalid stream_vaControl query=0x%x", i_query );
int64_t i_first = 0;
int64_t i_start;
- msg_Dbg( s, "pre buffering" );
+ msg_Dbg( s, "starting pre-buffering" );
i_start = mdate();
for( ;; )
{
bool b_eof;
block_t *b;
- if( s->b_die || p_sys->block.i_size > STREAM_CACHE_PREBUFFER_SIZE )
+ if( !vlc_object_alive(s) || p_sys->block.i_size > STREAM_CACHE_PREBUFFER_SIZE )
{
int64_t i_byterate;
/* Update stat */
p_sys->stat.i_bytes = p_sys->block.i_size;
p_sys->stat.i_read_time = i_date - i_start;
- i_byterate = ( INT64_C(1000000) * p_sys->stat.i_bytes ) /
+ i_byterate = ( CLOCK_FREQ * p_sys->stat.i_bytes ) /
(p_sys->stat.i_read_time + 1);
msg_Dbg( s, "prebuffering done %"PRId64" bytes in %"PRId64"s - "
- "%"PRId64" kbytes/s",
+ "%"PRId64" KiB/s",
p_sys->stat.i_bytes,
- p_sys->stat.i_read_time / INT64_C(1000000),
+ p_sys->stat.i_read_time / CLOCK_FREQ,
i_byterate / 1024 );
break;
}
if( p_data == NULL )
{
/* seek within this stream if possible, else use plain old read and discard */
- stream_sys_t *p_sys = s->p_sys;
- access_t *p_access = p_sys->p_access;
- bool b_aseek;
+ access_t *p_access = p_sys->p_access;
+ bool b_aseek;
+
access_Control( p_access, ACCESS_CAN_SEEK, &b_aseek );
if( b_aseek )
return AStreamSeekBlock( s, p_sys->i_pos + i_read ) ? 0 : i_read;
{
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 )
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;
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;
{
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 );
static int AStreamRefillBlock( stream_t *s )
{
stream_sys_t *p_sys = s->p_sys;
- block_t *b;
/* Release data */
while( p_sys->block.i_size >= STREAM_CACHE_SIZE &&
/* Now read a new block */
const int64_t i_start = mdate();
+ block_t *b;
+
for( ;; )
{
bool b_eof;
- if( s->b_die )
+ if( !vlc_object_alive(s) )
return VLC_EGENERIC;
/* Fetch a block */
if( !p_read )
{
- const int64_t i_pos_wanted = p_sys->i_pos + i_read;
+ const uint64_t i_pos_wanted = p_sys->i_pos + i_read;
if( AStreamSeekStream( s, i_pos_wanted ) )
{
{
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 */
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;
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_Control( p_access, ACCESS_CAN_FASTSEEK, &b_afastseek );
/* FIXME compute seek cost (instead of static 'stupid' value) */
- int64_t i_skip_threshold;
+ uint64_t i_skip_threshold;
if( b_aseek )
i_skip_threshold = b_afastseek ? 128 : 3*p_sys->stream.i_read_size;
else
int i_tk_idx = -1;
/* Prefer the current track */
- if( p_current->i_start <= i_pos && i_pos - p_current->i_end <= i_skip_threshold )
+ 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 != p_current )
i_skip_threshold = 0;
- if( tk->i_start <= i_pos && i_pos - tk->i_end <= i_skip_threshold )
+ if( tk->i_start <= i_pos && i_pos <= tk->i_end + i_skip_threshold )
{
#ifdef STREAM_DEBUG
msg_Err( s, "AStreamSeekStream: reusing %d start=%"PRId64
if( ASeek( s, tk->i_end ) )
return VLC_EGENERIC;
}
- else
+ else if( i_pos > tk->i_end )
{
- int64_t i_skip = i_pos - tk->i_end;
+ 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 );
* - 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( 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;
- if( AStreamRefillStream( s ) && i_pos == tk->i_end )
+ if( AStreamRefillStream( s ) && i_pos >= tk->i_end )
return VLC_EGENERIC;
}
return VLC_SUCCESS;
while( i_data < i_read )
{
- int i_off = (tk->i_start + p_sys->stream.i_offset) %
- STREAM_CACHE_TRACK_SIZE;
+ unsigned 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 ));
+ __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 */
/* */
p_sys->stream.i_used += i_copy;
- if( tk->i_end - tk->i_start - p_sys->stream.i_offset <= i_read -i_data )
+ if( tk->i_end + i_data <= tk->i_start + p_sys->stream.i_offset + i_read )
{
- const int i_read_requested = __MAX( __MIN( i_read - i_data,
- STREAM_READ_ATONCE * 10 ),
- STREAM_READ_ATONCE / 2 );
+ 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;
int i_off = tk->i_end % STREAM_CACHE_TRACK_SIZE;
int i_read;
- if( s->b_die )
+ if( !vlc_object_alive(s) )
return VLC_EGENERIC;
i_read = __MIN( i_toread, STREAM_CACHE_TRACK_SIZE - i_off );
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;
int64_t i_first = 0;
int64_t i_start;
- msg_Dbg( s, "pre buffering" );
+ msg_Dbg( s, "starting pre-buffering" );
i_start = mdate();
for( ;; )
{
int i_read;
int i_buffered = tk->i_end - tk->i_start;
- if( s->b_die || i_buffered >= STREAM_CACHE_PREBUFFER_SIZE )
+ if( !vlc_object_alive(s) || i_buffered >= STREAM_CACHE_PREBUFFER_SIZE )
{
int64_t i_byterate;
/* Update stat */
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 ) /
+ i_byterate = ( CLOCK_FREQ * 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),
+ p_sys->stat.i_read_time / CLOCK_FREQ,
i_byterate / 1024 );
break;
}
/* */
i_read = STREAM_CACHE_TRACK_SIZE - i_buffered;
- i_read = __MIN( p_sys->stream.i_read_size, i_read );
+ 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;
char *p_line = NULL;
int i_line = 0, i_read = 0;
- while( i_read < STREAM_LINE_MAX )
+ /* Let's fail quickly if this is a readdir access */
+ if( s->pf_read == NULL )
+ return NULL;
+
+ for( ;; )
{
char *psz_eol;
const uint8_t *p_data;
/* BOM detection */
i_pos = stream_Tell( s );
- if( i_pos == 0 && i_data >= 3 )
+ if( i_pos == 0 && i_data >= 2 )
{
- int i_bom_size = 0;
const char *psz_encoding = NULL;
- if( !memcmp( p_data, "\xEF\xBB\xBF", 3 ) )
- {
- psz_encoding = "UTF-8";
- i_bom_size = 3;
- }
- else if( !memcmp( p_data, "\xFF\xFE", 2 ) )
+ if( !memcmp( p_data, "\xFF\xFE", 2 ) )
{
psz_encoding = "UTF-16LE";
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->p_text->i_char_width = 2;
- i_bom_size = 2;
- }
-
- /* Seek past the BOM */
- if( i_bom_size )
- {
- stream_Seek( s, i_bom_size );
- p_data += i_bom_size;
- i_data -= i_bom_size;
}
/* Open the converter if we need it */
if( psz_encoding != NULL )
{
- msg_Dbg( s, "%s BOM detected", psz_encoding );
- if( s->p_text->i_char_width > 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" );
- }
+ msg_Dbg( s, "UTF-16 BOM detected" );
+ s->p_text->i_char_width = 2;
+ 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" );
}
}
{
/* UTF-8: 0A <LF> */
psz_eol = memchr( p_data, '\n', i_data );
+ if( psz_eol == NULL )
+ /* UTF-8: 0D <CR> */
+ 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 <LF> */
+ for( const uint8_t *p = p_data; p <= p_last; p += 2 )
{
- if( s->p_text->b_little_endian == true)
- {
- /* UTF-16LE: 0A 00 <LF> */
- while( p <= p_last && ( p[0] != 0x0A || p[1] != 0x00 ) )
- p += 2;
- }
- else
+ if( U16_AT( p ) == eol )
{
- /* UTF-16BE: 00 0A <LF> */
- 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 <CR> */
+ 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( i_data <= 0 ) break; /* Hmmm */
i_line += i_data;
i_read += i_data;
+
+ if( i_read >= STREAM_LINE_MAX )
+ goto error; /* line too long */
}
if( i_read > 0 )
i_line += s->p_text->i_char_width; /* the added \0 */
if( s->p_text->i_char_width > 1 )
{
+ int i_new_line = 0;
size_t i_in = 0, i_out = 0;
const char * p_in = NULL;
char * p_out = NULL;
char * psz_new_line = NULL;
/* iconv */
- psz_new_line = malloc( i_line );
+ /* UTF-8 needs at most 150% of the buffer as many as UTF-16 */
+ i_new_line = i_line * 3 / 2;
+ psz_new_line = malloc( i_new_line );
if( psz_new_line == NULL )
goto error;
- i_in = i_out = (size_t)i_line;
+ i_in = (size_t)i_line;
+ i_out = (size_t)i_new_line;
p_in = p_line;
p_out = psz_new_line;
}
free( p_line );
p_line = psz_new_line;
- i_line = (size_t)i_line - i_out; /* does not include \0 */
+ i_line = (size_t)i_new_line - i_out; /* does not include \0 */
}
/* Remove trailing LF/CR */
{
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 &&
- 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 )
{
i_read = p_access->pf_read( p_access, p_read, i_read );
- if( p_access->b_die )
- 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;
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 )
/* 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;
{
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 &&
- 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 )
{
p_block = p_access->pf_block( p_access );
- if( p_access->b_die )
- vlc_object_kill( s );
if( pb_eof ) *pb_eof = p_access->info.b_eof;
if( p_input && p_block && libvlc_stats (p_access) )
{
+ 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;
}
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;
{
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;
return p_access->pf_seek( p_access, i_pos );
}
+static int AStreamReadDir( stream_t *s, input_item_node_t *p_node )
+{
+ access_t *p_access = s->p_sys->p_access;
+
+ return p_access->pf_readdir( p_access, p_node );
+}
/**
* 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 )
{
/**
* 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 )
if( i_size <= 0 ) return NULL;
/* emulate block read */
- block_t *p_bk = block_New( s, i_size );
+ block_t *p_bk = block_Alloc( i_size );
if( p_bk )
{
int i_read = stream_Read( s, p_bk->p_buffer, 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_Alloc( 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;
+}
+
+/**
+ * Returns a node containing all the input_item of the directory pointer by
+ * this stream. returns VLC_SUCCESS on success.
+ */
+int stream_ReadDir( stream_t *s, input_item_node_t *p_node )
+{
+ return s->pf_readdir( s, p_node );
+}
projects / vlc / blobdiff