/*****************************************************************************
* stream.c
*****************************************************************************
- * Copyright (C) 1999-2004 VideoLAN
+ * Copyright (C) 1999-2004 the VideoLAN team
* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#include <stdlib.h>
-#include <vlc/vlc.h>
-#include <vlc/input.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
#include "input_internal.h"
+#undef STREAM_DEBUG
+
/* TODO:
* - tune the 2 methods
* - compute cost for seek
{
access_t *p_access;
- vlc_bool_t b_block; /* Block method (1) or stream */
+ bool b_block; /* Block method (1) or stream */
int64_t i_pos; /* Current reading offset */
/* Stat for both method */
struct
{
- vlc_bool_t b_fastseek; /* From access */
+ bool b_fastseek; /* From access */
/* Stat about reading data */
int64_t i_read_count;
access_t *p_list_access;
/* Preparse mode ? */
- vlc_bool_t b_quick;
+ bool b_quick;
};
/* Method 1: */
static int AStreamReadBlock( stream_t *s, void *p_read, int i_read );
-static int AStreamPeekBlock( stream_t *s, uint8_t **p_peek, int i_read );
+static int AStreamPeekBlock( stream_t *s, const uint8_t **p_peek, int i_read );
static int AStreamSeekBlock( stream_t *s, int64_t i_pos );
static void AStreamPrebufferBlock( stream_t *s );
-static block_t *AReadBlock( stream_t *s, vlc_bool_t *pb_eof );
+static block_t *AReadBlock( stream_t *s, bool *pb_eof );
/* Method 2 */
static int AStreamReadStream( stream_t *s, void *p_read, int i_read );
-static int AStreamPeekStream( stream_t *s, uint8_t **pp_peek, int i_read );
+static int AStreamPeekStream( stream_t *s, const uint8_t **pp_peek, int i_read );
static int AStreamSeekStream( stream_t *s, int64_t i_pos );
static void AStreamPrebufferStream( stream_t *s );
static int AReadStream( stream_t *s, void *p_read, int i_read );
/* Common */
static int AStreamControl( stream_t *s, int i_query, va_list );
+static void AStreamDestroy( stream_t *s );
+static void UStreamDestroy( stream_t *s );
static int ASeek( stream_t *s, int64_t i_pos );
/****************************************************************************
- * stream_AccessNew: create a stream from a access
+ * stream_UrlNew: create a stream from a access
****************************************************************************/
-stream_t *stream_AccessNew( access_t *p_access, vlc_bool_t b_quick )
+stream_t *__stream_UrlNew( vlc_object_t *p_parent, const char *psz_url )
{
- stream_t *s = vlc_object_create( p_access, VLC_OBJECT_STREAM );
+ const char *psz_access, *psz_demux;
+ char *psz_path;
+ access_t *p_access;
+ stream_t *p_res;
+
+ if( !psz_url ) return 0;
+
+ char psz_dup[strlen (psz_url) + 1];
+ strcpy (psz_dup, psz_url);;
+ MRLSplit( psz_dup, &psz_access, &psz_demux, &psz_path );
+
+ /* Now try a real access */
+ p_access = access_New( p_parent, psz_access, psz_demux, psz_path );
+
+ if( p_access == NULL )
+ {
+ msg_Err( p_parent, "no suitable access module for `%s'", psz_url );
+ return NULL;
+ }
+
+ if( !( p_res = stream_AccessNew( p_access, true ) ) )
+ {
+ access_Delete( p_access );
+ return NULL;
+ }
+
+ p_res->pf_destroy = UStreamDestroy;
+ return p_res;
+}
+
+stream_t *stream_AccessNew( access_t *p_access, bool b_quick )
+{
+ stream_t *s = vlc_stream_create( VLC_OBJECT(p_access) );
stream_sys_t *p_sys;
- char *psz_list;
+ char *psz_list = NULL;
if( !s ) return NULL;
/* Attach it now, needed for b_die */
vlc_object_attach( s, p_access );
- s->pf_block = NULL;
s->pf_read = NULL; /* Set up later */
s->pf_peek = NULL;
- s->pf_control= AStreamControl;
+ s->pf_control = AStreamControl;
+ s->pf_destroy = AStreamDestroy;
s->p_sys = p_sys = malloc( sizeof( stream_sys_t ) );
+ if( p_sys == NULL )
+ {
+ msg_Err( s, "Out of memory when allocating stream_sys_t" );
+ goto error;
+ }
+
+ /* 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;
- p_sys->b_block = p_access->pf_block ? VLC_TRUE : VLC_FALSE;
+ p_sys->b_block = p_access->pf_block ? true : false;
p_sys->i_pos = p_access->info.i_pos;
/* Stats */
- access2_Control( p_access, ACCESS_CAN_FASTSEEK, &p_sys->stat.b_fastseek );
+ access_Control( p_access, ACCESS_CAN_FASTSEEK, &p_sys->stat.b_fastseek );
p_sys->stat.i_bytes = 0;
p_sys->stat.i_read_time = 0;
p_sys->stat.i_read_count = 0;
if( (psz_list = var_CreateGetString( s, "input-list" )) && *psz_list )
{
access_entry_t *p_entry = malloc( sizeof(access_entry_t) );
+ if( p_entry == NULL )
+ {
+ msg_Err( s, "Out of memory when allocating access_entry_t" );
+ 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 )
+ {
+ msg_Err( s, "Out of memory when duplicating p_access->psz_path" );
+ free( p_entry );
+ goto error;
+ }
TAB_APPEND( p_sys->i_list, p_sys->list, p_entry );
- msg_Dbg( p_access, "adding file `%s', ("I64Fd" bytes)",
+ msg_Dbg( p_access, "adding file `%s', (%"PRId64" bytes)",
p_entry->psz_path, p_access->info.i_size );
while( psz_name && *psz_name )
psz_name = strdup( psz_name );
if( psz_name )
{
- access_t *p_tmp = access2_New( p_access, p_access->psz_access,
- 0, psz_name, 0 );
+ access_t *p_tmp = access_New( p_access, p_access->psz_access,
+ "", psz_name );
if( !p_tmp )
{
continue;
}
- msg_Dbg( p_access, "adding file `%s', ("I64Fd" bytes)",
+ msg_Dbg( p_access, "adding file `%s', (%"PRId64" bytes)",
psz_name, p_tmp->info.i_size );
p_entry = malloc( sizeof(access_entry_t) );
+ if( p_entry == NULL )
+ {
+ msg_Err( p_access, "Out of memory when allocating access_entry_t" );
+ goto error;
+ }
p_entry->i_size = p_tmp->info.i_size;
p_entry->psz_path = psz_name;
TAB_APPEND( p_sys->i_list, p_sys->list, p_entry );
- access2_Delete( p_tmp );
+ access_Delete( p_tmp );
}
psz_name = psz_parser;
if( psz_name ) psz_name++;
}
}
- if( psz_list ) free( psz_list );
+ FREENULL( psz_list );
/* Peek */
p_sys->i_peek = 0;
p_sys->stream.i_offset = 0;
p_sys->stream.i_tk = 0;
p_sys->stream.p_buffer = malloc( STREAM_CACHE_SIZE );
+ if( p_sys->stream.p_buffer == NULL )
+ {
+ msg_Err( s, "Out of memory when allocating stream cache (%d bytes)",
+ STREAM_CACHE_SIZE );
+ goto error;
+ }
p_sys->stream.i_used = 0;
- access2_Control( p_access, ACCESS_GET_MTU,
+ access_Control( p_access, ACCESS_GET_MTU,
&p_sys->stream.i_read_size );
if( p_sys->stream.i_read_size <= 0 )
p_sys->stream.i_read_size = STREAM_READ_ATONCE;
{
free( p_sys->stream.p_buffer );
}
+ while( p_sys->i_list > 0 )
+ free( p_sys->list[--(p_sys->i_list)] );
+ free( p_sys->list );
+ free( psz_list );
free( s->p_sys );
vlc_object_detach( s );
- vlc_object_destroy( s );
+ vlc_object_release( s );
return NULL;
}
/****************************************************************************
- * stream_AccessDelete:
+ * AStreamDestroy:
****************************************************************************/
-void stream_AccessDelete( stream_t *s )
+static void AStreamDestroy( stream_t *s )
{
stream_sys_t *p_sys = s->p_sys;
if( p_sys->b_block ) block_ChainRelease( p_sys->block.p_first );
else free( p_sys->stream.p_buffer );
- if( p_sys->p_peek ) free( p_sys->p_peek );
+ free( p_sys->p_peek );
if( p_sys->p_list_access && p_sys->p_list_access != p_sys->p_access )
- access2_Delete( p_sys->p_list_access );
+ access_Delete( p_sys->p_list_access );
while( p_sys->i_list-- )
{
free( p_sys->list[p_sys->i_list]->psz_path );
free( p_sys->list[p_sys->i_list] );
- if( !p_sys->i_list ) free( p_sys->list );
}
- free( s->p_sys );
- vlc_object_destroy( s );
+ free( p_sys->list );
+ free( p_sys );
+
+ vlc_object_release( s );
+}
+
+static void UStreamDestroy( stream_t *s )
+{
+ access_t *p_access = (access_t*)vlc_object_find( s, VLC_OBJECT_ACCESS, FIND_PARENT );
+ AStreamDestroy( s );
+ vlc_object_release( p_access );
+ access_Delete( p_access );
}
/****************************************************************************
stream_sys_t *p_sys = s->p_sys;
access_t *p_access = p_sys->p_access;
- vlc_bool_t *p_bool;
+ bool *p_bool;
int64_t *pi_64, i_64;
int i_int;
break;
case STREAM_CAN_SEEK:
- p_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t * );
- access2_Control( p_access, ACCESS_CAN_SEEK, p_bool );
+ p_bool = (bool*)va_arg( args, bool * );
+ access_Control( p_access, ACCESS_CAN_SEEK, p_bool );
break;
case STREAM_CAN_FASTSEEK:
- p_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t * );
- access2_Control( p_access, ACCESS_CAN_FASTSEEK, p_bool );
+ p_bool = (bool*)va_arg( args, bool * );
+ access_Control( p_access, ACCESS_CAN_FASTSEEK, p_bool );
break;
case STREAM_GET_POSITION:
"DON'T USE STREAM_CONTROL_ACCESS !!!" );
return VLC_EGENERIC;
}
- return access2_vaControl( p_access, i_int, args );
+ return access_vaControl( p_access, i_int, args );
+
+ case STREAM_GET_CONTENT_TYPE:
+ return access_Control( p_access, ACCESS_GET_CONTENT_TYPE,
+ va_arg( args, char ** ) );
default:
msg_Err( s, "invalid stream_vaControl query=0x%x", i_query );
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;
for( ;; )
{
int64_t i_date = mdate();
- vlc_bool_t b_eof;
+ bool b_eof;
block_t *b;
if( s->b_die || p_sys->block.i_size > STREAM_CACHE_PREBUFFER_SIZE ||
/* Update stat */
p_sys->stat.i_bytes = p_sys->block.i_size;
p_sys->stat.i_read_time = i_date - i_start;
- i_byterate = ( I64C(1000000) * p_sys->stat.i_bytes ) /
+ i_byterate = ( INT64_C(1000000) * p_sys->stat.i_bytes ) /
(p_sys->stat.i_read_time + 1);
- msg_Dbg( s, "prebuffering done "I64Fd" bytes in "I64Fd"s - "
- I64Fd" kbytes/s",
+ msg_Dbg( s, "prebuffering done %"PRId64" bytes in %"PRId64"s - "
+ "%"PRId64" kbytes/s",
p_sys->stat.i_bytes,
- p_sys->stat.i_read_time / I64C(1000000),
+ p_sys->stat.i_read_time / INT64_C(1000000),
i_byterate / 1024 );
break;
}
continue;
}
+ while( b )
+ {
+ /* Append the block */
+ p_sys->block.i_size += b->i_buffer;
+ *p_sys->block.pp_last = b;
+ p_sys->block.pp_last = &b->p_next;
+
+ p_sys->stat.i_read_count++;
+ b = b->p_next;
+ }
+
+ if( 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");
}
- /* Append the block */
- p_sys->block.i_size += b->i_buffer;
- *p_sys->block.pp_last = b;
- p_sys->block.pp_last = &b->p_next;
-
- p_sys->stat.i_read_count++;
}
p_sys->block.p_current = p_sys->block.p_first;
/* seek within this stream if possible, else use plain old read and discard */
stream_sys_t *p_sys = s->p_sys;
access_t *p_access = p_sys->p_access;
- vlc_bool_t b_aseek;
- access2_Control( p_access, ACCESS_CAN_SEEK, &b_aseek );
+ bool b_aseek;
+ access_Control( p_access, ACCESS_CAN_SEEK, &b_aseek );
if( b_aseek )
return AStreamSeekBlock( s, p_sys->i_pos + i_read ) ? 0 : i_read;
}
p_sys->block.i_offset = 0;
p_sys->block.p_current = p_sys->block.p_current->p_next;
}
- /*Get a new block */
- if( AStreamRefillBlock( s ) )
+ /*Get a new block if needed */
+ if( !p_sys->block.p_current && AStreamRefillBlock( s ) )
{
break;
}
return i_data;
}
-static int AStreamPeekBlock( stream_t *s, uint8_t **pp_peek, int i_read )
+static int AStreamPeekBlock( stream_t *s, const uint8_t **pp_peek, int i_read )
{
stream_sys_t *p_sys = s->p_sys;
uint8_t *p_data;
/* We need to create a local copy */
if( p_sys->i_peek < i_read )
{
- if( p_sys->p_peek )
- free( p_sys->p_peek );
+ p_sys->p_peek = realloc( p_sys->p_peek, i_read );
+ if( !p_sys->p_peek )
+ {
+ p_sys->i_peek = 0;
+ return 0;
+ }
p_sys->i_peek = i_read;
- p_sys->p_peek = malloc( p_sys->i_peek );
}
/* Fill enough data */
{
block_t **pp_last = p_sys->block.pp_last;
- if( AStreamRefillBlock( s ) )
- break;
+ if( AStreamRefillBlock( s ) ) break;
/* Our buffer are probably filled enough, don't try anymore */
- if( pp_last == p_sys->block.pp_last )
- break;
+ if( pp_last == p_sys->block.pp_last ) break;
}
/* Copy what we have */
stream_sys_t *p_sys = s->p_sys;
access_t *p_access = p_sys->p_access;
int64_t i_offset = i_pos - p_sys->block.i_start;
- vlc_bool_t b_seek;
+ bool b_seek;
/* We already have thoses data, just update p_current/i_offset */
if( i_offset >= 0 && i_offset < p_sys->block.i_size )
/* We may need to seek or to read data */
if( i_offset < 0 )
{
- vlc_bool_t b_aseek;
- access2_Control( p_access, ACCESS_CAN_SEEK, &b_aseek );
+ bool b_aseek;
+ access_Control( p_access, ACCESS_CAN_SEEK, &b_aseek );
if( !b_aseek )
{
- msg_Err( s, "backward seek impossible (access non seekable)" );
+ msg_Err( s, "backward seeking impossible (access not seekable)" );
return VLC_EGENERIC;
}
- b_seek = VLC_TRUE;
+ b_seek = true;
}
else
{
- vlc_bool_t b_aseek, b_aseekfast;
+ bool b_aseek, b_aseekfast;
- access2_Control( p_access, ACCESS_CAN_SEEK, &b_aseek );
- access2_Control( p_access, ACCESS_CAN_FASTSEEK, &b_aseekfast );
+ access_Control( p_access, ACCESS_CAN_SEEK, &b_aseek );
+ access_Control( p_access, ACCESS_CAN_FASTSEEK, &b_aseekfast );
if( !b_aseek )
{
- b_seek = VLC_FALSE;
- msg_Warn( s, I64Fd" bytes need to be skipped "
+ b_seek = false;
+ msg_Warn( s, "%"PRId64" bytes need to be skipped "
"(access non seekable)",
i_offset - p_sys->block.i_size );
}
if( i_skip <= i_th * i_avg &&
i_skip < STREAM_CACHE_SIZE )
- b_seek = VLC_FALSE;
+ b_seek = false;
else
- b_seek = VLC_TRUE;
+ b_seek = true;
- msg_Dbg( s, "b_seek=%d th*avg=%d skip="I64Fd,
+ msg_Dbg( s, "b_seek=%d th*avg=%d skip=%"PRId64,
b_seek, i_th*i_avg, i_skip );
}
}
/* Refill a block */
if( AStreamRefillBlock( s ) )
- {
- msg_Err( s, "cannot re fill buffer" );
return VLC_EGENERIC;
- }
+
/* Update stat */
p_sys->stat.i_seek_time += i_end - i_start;
p_sys->stat.i_seek_count++;
}
else
{
- /* Read enought data */
+ /* Read enough data */
while( p_sys->block.i_start + p_sys->block.i_size < i_pos )
{
if( AStreamRefillBlock( s ) )
- {
- msg_Err( s, "can't read enough data in seek" );
return VLC_EGENERIC;
- }
+
while( p_sys->block.p_current &&
p_sys->i_pos + p_sys->block.p_current->i_buffer < i_pos )
{
p_sys->block.i_offset = i_pos - p_sys->i_pos;
p_sys->i_pos = i_pos;
- /* TODO read data */
return VLC_SUCCESS;
}
i_start = mdate();
for( ;; )
{
- vlc_bool_t b_eof;
+ bool b_eof;
if( s->b_die ) return VLC_EGENERIC;
msleep( STREAM_DATA_WAIT );
}
- i_stop = mdate();
- /* Append the block */
- p_sys->block.i_size += b->i_buffer;
- *p_sys->block.pp_last = b;
- p_sys->block.pp_last = &b->p_next;
+ while( b )
+ {
+ i_stop = mdate();
- /* Fix p_current */
- if( p_sys->block.p_current == NULL )
- p_sys->block.p_current = b;
+ /* Append the block */
+ p_sys->block.i_size += b->i_buffer;
+ *p_sys->block.pp_last = b;
+ p_sys->block.pp_last = &b->p_next;
- /* 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++;
+ /* Fix p_current */
+ if( p_sys->block.p_current == NULL )
+ p_sys->block.p_current = b;
+ /* Update stat */
+ p_sys->stat.i_bytes += b->i_buffer;
+ p_sys->stat.i_read_time += i_stop - i_start;
+ p_sys->stat.i_read_count++;
+
+ b = b->p_next;
+ i_start = mdate();
+ }
return VLC_SUCCESS;
}
/* seek within this stream if possible, else use plain old read and discard */
stream_sys_t *p_sys = s->p_sys;
access_t *p_access = p_sys->p_access;
- vlc_bool_t b_aseek;
- access2_Control( p_access, ACCESS_CAN_SEEK, &b_aseek );
- if( b_aseek )
- return AStreamSeekStream( s, p_sys->i_pos + i_read ) ? 0 : i_read;
+
+ /* seeking after EOF is not what we want */
+ if( !( p_access->info.b_eof ) )
+ {
+ bool b_aseek;
+ access_Control( p_access, ACCESS_CAN_SEEK, &b_aseek );
+ if( b_aseek )
+ return AStreamSeekStream( s, p_sys->i_pos + i_read ) ? 0 : i_read;
+ }
}
-#if 0
- msg_Dbg( s, "AStreamReadStream: %d pos="I64Fd" tk=%d start="I64Fd
- " offset=%d end="I64Fd,
+#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
return i_data;
}
-static int AStreamPeekStream( stream_t *s, uint8_t **pp_peek, int i_read )
+static int AStreamPeekStream( stream_t *s, const uint8_t **pp_peek, int i_read )
{
stream_sys_t *p_sys = s->p_sys;
stream_track_t *tk = &p_sys->stream.tk[p_sys->stream.i_tk];
if( tk->i_start >= tk->i_end ) return 0; /* EOF */
-#if 0
- msg_Dbg( s, "AStreamPeekStream: %d pos="I64Fd" tk=%d "
- "start="I64Fd" offset=%d end="I64Fd,
+#ifdef STREAM_DEBUG
+ msg_Dbg( s, "AStreamPeekStream: %d pos=%"PRId64" tk=%d "
+ "start=%"PRId64" offset=%d end=%"PRId64,
i_read, p_sys->i_pos, p_sys->stream.i_tk,
tk->i_start, p_sys->stream.i_offset, tk->i_end );
#endif
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 += i_read -
+ (tk->i_end - tk->i_start - p_sys->stream.i_offset);
}
- if( AStreamRefillStream( s ) )
- break;
+ if( AStreamRefillStream( s ) ) break;
}
if( tk->i_end - tk->i_start - p_sys->stream.i_offset < i_read )
if( p_sys->i_peek < i_read )
{
- if( p_sys->p_peek ) free( p_sys->p_peek );
+ p_sys->p_peek = realloc( p_sys->p_peek, i_read );
+ if( !p_sys->p_peek )
+ {
+ p_sys->i_peek = 0;
+ return 0;
+ }
p_sys->i_peek = i_read;
- p_sys->p_peek = malloc( i_read );
}
memcpy( p_sys->p_peek, &tk->p_buffer[i_off],
{
stream_sys_t *p_sys = s->p_sys;
access_t *p_access = p_sys->p_access;
- vlc_bool_t b_aseek;
- vlc_bool_t b_afastseek;
+ bool b_aseek;
+ bool b_afastseek;
int i_maxth;
int i_new;
int i;
-#if 0
- msg_Dbg( s, "AStreamSeekStream: to "I64Fd" pos="I64Fd
- "tk=%d start="I64Fd" offset=%d end="I64Fd,
+#ifdef STREAM_DEBUG
+ msg_Dbg( s, "AStreamSeekStream: to %"PRId64" pos=%"PRId64
+ " tk=%d start=%"PRId64" offset=%d end=%"PRId64,
i_pos, p_sys->i_pos, p_sys->stream.i_tk,
p_sys->stream.tk[p_sys->stream.i_tk].i_start,
p_sys->stream.i_offset,
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 )
{
- //msg_Dbg( s, "AStreamSeekStream: current track" );
+ 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 - p_sys->stream.tk[p_sys->stream.i_tk].i_start;
+ 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;
}
- access2_Control( p_access, ACCESS_CAN_SEEK, &b_aseek );
+ access_Control( p_access, ACCESS_CAN_SEEK, &b_aseek );
if( !b_aseek )
{
/* We can't do nothing */
if( i_pos >= tk->i_start && i_pos <= tk->i_end )
{
-#if 0
- msg_Dbg( s, "AStreamSeekStream: reusing %d start="I64Fd
- " end="I64Fd, i, tk->i_start, tk->i_end );
+#ifdef STREAM_DEBUG
+ msg_Dbg( s, "AStreamSeekStream: reusing %d start=%"PRId64
+ " end=%"PRId64, i, tk->i_start, tk->i_end );
#endif
+
/* Seek at the end of the buffer */
if( ASeek( s, tk->i_end ) ) return VLC_EGENERIC;
}
}
- access2_Control( p_access, ACCESS_CAN_SEEK, &b_afastseek );
+ access_Control( p_access, ACCESS_CAN_SEEK, &b_afastseek );
/* FIXME compute seek cost (instead of static 'stupid' value) */
i_maxth = __MIN( p_sys->stream.i_read_size, STREAM_READ_ATONCE / 2 );
if( !b_afastseek )
int i_toread =
__MIN( p_sys->stream.i_used, STREAM_CACHE_TRACK_SIZE -
(tk->i_end - tk->i_start - p_sys->stream.i_offset) );
- vlc_bool_t b_read = VLC_FALSE;
+ bool b_read = false;
int64_t i_start, i_stop;
if( i_toread <= 0 ) return VLC_EGENERIC; /* EOF */
- /* msg_Dbg( s, "AStreamRefillStream: toread=%d", i_toread ); */
+#ifdef STREAM_DEBUG
+ msg_Dbg( s, "AStreamRefillStream: used=%d toread=%d",
+ p_sys->stream.i_used, i_toread );
+#endif
i_start = mdate();
while( i_toread > 0 )
if( !b_read ) return VLC_EGENERIC;
return VLC_SUCCESS;
}
- b_read = VLC_TRUE;
+ b_read = true;
/* Update end */
tk->i_end += i_read;
( (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, "pre-buffering..." );
i_start = mdate();
for( ;; )
{
/* Update stat */
p_sys->stat.i_bytes = tk->i_end - tk->i_start;
p_sys->stat.i_read_time = i_date - i_start;
- i_byterate = ( I64C(1000000) * p_sys->stat.i_bytes ) /
+ i_byterate = ( INT64_C(1000000) * p_sys->stat.i_bytes ) /
(p_sys->stat.i_read_time+1);
- msg_Dbg( s, "prebuffering done "I64Fd" bytes in "I64Fd"s - "
- I64Fd" kbytes/s",
+ msg_Dbg( s, "pre-buffering done %"PRId64" bytes in %"PRId64"s - "
+ "%"PRId64" kbytes/s",
p_sys->stat.i_bytes,
- p_sys->stat.i_read_time / I64C(1000000),
+ p_sys->stat.i_read_time / INT64_C(1000000),
i_byterate / 1024 );
break;
}
/**
* Read from the stream untill first newline.
* \param s Stream handle to read from
- * \return A null-terminated string. This must be freed,
+ * \return A pointer to the allocated output string. You need to free this when you are done.
*/
#define STREAM_PROBE_LINE 2048
#define STREAM_LINE_MAX (2048*100)
-char *stream_ReadLine( stream_t *s )
+char * stream_ReadLine( stream_t *s )
{
char *p_line = NULL;
int i_line = 0, i_read = 0;
while( i_read < STREAM_LINE_MAX )
{
char *psz_eol;
- uint8_t *p_data;
+ const uint8_t *p_data;
int i_data;
+ int64_t i_pos;
/* Probe new data */
i_data = stream_Peek( s, &p_data, STREAM_PROBE_LINE );
if( i_data <= 0 ) break; /* No more data */
+ /* BOM detection */
+ i_pos = stream_Tell( s );
+ if( i_pos == 0 && i_data > 4 )
+ {
+ int i_bom_size = 0;
+ char *psz_encoding = NULL;
+
+ if( p_data[0] == 0xEF && p_data[1] == 0xBB && p_data[2] == 0xBF )
+ {
+ psz_encoding = strdup( "UTF-8" );
+ i_bom_size = 3;
+ }
+ else if( p_data[0] == 0x00 && p_data[1] == 0x00 )
+ {
+ if( p_data[2] == 0xFE && p_data[3] == 0xFF )
+ {
+ psz_encoding = strdup( "UTF-32BE" );
+ s->i_char_width = 4;
+ i_bom_size = 4;
+ }
+ }
+ else if( p_data[0] == 0xFF && p_data[1] == 0xFE )
+ {
+ if( p_data[2] == 0x00 && p_data[3] == 0x00 )
+ {
+ psz_encoding = strdup( "UTF-32LE" );
+ s->i_char_width = 4;
+ s->b_little_endian = true;
+ i_bom_size = 4;
+ }
+ else
+ {
+ psz_encoding = strdup( "UTF-16LE" );
+ s->b_little_endian = true;
+ s->i_char_width = 2;
+ i_bom_size = 2;
+ }
+ }
+ else if( p_data[0] == 0xFE && p_data[1] == 0xFF )
+ {
+ psz_encoding = strdup( "UTF-16BE" );
+ s->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 )
+ {
+ 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 )
+ {
+ s->conv = vlc_iconv_open( "UTF-8", psz_encoding );
+ if( s->conv == (vlc_iconv_t)-1 )
+ {
+ msg_Err( s, "iconv_open failed" );
+ }
+ }
+ 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 );
+ }
+ free( psz_encoding );
+ }
+ }
+
+ if( i_data % s->i_char_width )
+ {
+ /* keep i_char_width boundary */
+ i_data = i_data - ( i_data % s->i_char_width );
+ msg_Warn( s, "the read is not i_char_width compatible");
+ }
+
+ if( i_data == 0 )
+ break;
+
/* Check if there is an EOL */
- if( ( psz_eol = memchr( p_data, '\n', i_data ) ) )
+ if( s->i_char_width == 1 )
+ {
+ /* UTF-8: 0A <LF> */
+ psz_eol = memchr( p_data, '\n', i_data );
+ }
+ else
+ {
+ const uint8_t *p = p_data;
+ const uint8_t *p_last = p + i_data - s->i_char_width;
+
+ if( s->i_char_width == 2 )
+ {
+ if( s->b_little_endian == true)
+ {
+ /* UTF-16LE: 0A 00 <LF> */
+ while( p <= p_last && ( p[0] != 0x0A || p[1] != 0x00 ) )
+ p += 2;
+ }
+ else
+ {
+ /* UTF-16BE: 00 0A <LF> */
+ while( p <= p_last && ( p[1] != 0x0A || p[0] != 0x00 ) )
+ p += 2;
+ }
+ }
+ else if( s->i_char_width == 4 )
+ {
+ if( s->b_little_endian == true)
+ {
+ /* UTF-32LE: 0A 00 00 00 <LF> */
+ while( p <= p_last && ( p[0] != 0x0A || p[1] != 0x00 ||
+ p[2] != 0x00 || p[3] != 0x00 ) )
+ p += 4;
+ }
+ else
+ {
+ /* UTF-32BE: 00 00 00 0A <LF> */
+ while( p <= p_last && ( p[3] != 0x0A || p[2] != 0x00 ||
+ p[1] != 0x00 || p[0] != 0x00 ) )
+ p += 4;
+ }
+ }
+
+ if( p > p_last )
+ {
+ psz_eol = NULL;
+ }
+ else
+ {
+ psz_eol = (char *)p + ( s->i_char_width - 1 );
+ }
+ }
+
+ if(psz_eol)
{
i_data = (psz_eol - (char *)p_data) + 1;
- p_line = realloc( p_line, i_line + i_data + 1 );
+ p_line = realloc( p_line, i_line + i_data + s->i_char_width ); /* add \0 */
+ if( !p_line )
+ {
+ msg_Err( s, "Out of memory when reallocating 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 - 1);
+ i_line += i_data - s->i_char_width; /* skip \n */;
i_read += i_data;
/* We have our line */
}
/* Read data (+1 for easy \0 append) */
- p_line = realloc( p_line, i_line + STREAM_PROBE_LINE + 1 );
+ p_line = realloc( p_line, i_line + STREAM_PROBE_LINE + s->i_char_width );
+ if( !p_line )
+ {
+ msg_Err( s, "Out of memory when reallocating p_line" );
+ goto error;
+ }
i_data = stream_Read( s, &p_line[i_line], STREAM_PROBE_LINE );
if( i_data <= 0 ) break; /* Hmmm */
i_line += i_data;
i_read += i_data;
}
- /* Remove trailing LF/CR */
- while( i_line > 0 && ( p_line[i_line-1] == '\r' ||
- p_line[i_line-1] == '\n') ) i_line--;
-
if( i_read > 0 )
{
- p_line[i_line] = '\0';
+ int j;
+ for( j = 0; j < s->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 )
+ {
+ size_t i_in = 0, i_out = 0;
+ const char * p_in = NULL;
+ char * p_out = NULL;
+ char * psz_new_line = NULL;
+
+ /* iconv */
+ psz_new_line = malloc( i_line );
+ if( psz_new_line == NULL )
+ {
+ msg_Err( s, "Out of memory when allocating psz_new_line" );
+ goto error;
+ }
+ i_in = i_out = (size_t)i_line;
+ 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 )
+ {
+ msg_Err( s, "iconv failed" );
+ msg_Dbg( s, "original: %d, in %d, out %d", i_line, (int)i_in, (int)i_out );
+ }
+ free( p_line );
+ p_line = psz_new_line;
+ i_line = (size_t)i_line - i_out; /* does not include \0 */
+ }
+
+ /* Remove trailing LF/CR */
+ while( i_line >= 2 && ( p_line[i_line-2] == '\r' ||
+ p_line[i_line-2] == '\n') ) i_line--;
+
+ /* Make sure the \0 is there */
+ p_line[i_line-1] = '\0';
+
return p_line;
}
+error:
+
/* We failed to read any data, probably EOF */
- if( p_line ) free( p_line );
+ free( p_line );
+ if( s->conv != (vlc_iconv_t)(-1) ) vlc_iconv_close( s->conv );
return NULL;
}
{
stream_sys_t *p_sys = s->p_sys;
access_t *p_access = p_sys->p_access;
+ input_thread_t *p_input = NULL;
int i_read_orig = i_read;
+ int i_total = 0;
+
+ 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 )
{
i_read = p_access->pf_read( p_access, p_read, i_read );
+ if( p_input )
+ {
+ vlc_mutex_lock( &p_input->p->counters.counters_lock );
+ stats_UpdateInteger( s, p_input->p->counters.p_read_bytes, i_read,
+ &i_total );
+ stats_UpdateFloat( s, p_input->p->counters.p_input_bitrate,
+ (float)i_total, NULL );
+ stats_UpdateInteger( s, p_input->p->counters.p_read_packets, 1, NULL );
+ vlc_mutex_unlock( &p_input->p->counters.counters_lock );
+ }
return i_read;
}
msg_Dbg( s, "opening input `%s'", psz_name );
- p_list_access = access2_New( s, p_access->psz_access, 0, psz_name, 0 );
+ p_list_access = access_New( s, p_access->psz_access, "", psz_name );
if( !p_list_access ) return 0;
if( p_sys->p_list_access != p_access )
- access2_Delete( p_sys->p_list_access );
+ access_Delete( p_sys->p_list_access );
p_sys->p_list_access = p_list_access;
return AReadStream( s, p_read, i_read_orig );
}
+ /* Update read bytes in input */
+ if( p_input )
+ {
+ vlc_mutex_lock( &p_input->p->counters.counters_lock );
+ stats_UpdateInteger( s, p_input->p->counters.p_read_bytes, i_read, &i_total );
+ stats_UpdateFloat( s, p_input->p->counters.p_input_bitrate,
+ (float)i_total, NULL );
+ stats_UpdateInteger( s, p_input->p->counters.p_read_packets, 1, NULL );
+ vlc_mutex_unlock( &p_input->p->counters.counters_lock );
+ }
return i_read;
}
-static block_t *AReadBlock( stream_t *s, vlc_bool_t *pb_eof )
+static block_t *AReadBlock( stream_t *s, bool *pb_eof )
{
stream_sys_t *p_sys = s->p_sys;
access_t *p_access = p_sys->p_access;
+ input_thread_t *p_input = NULL;
block_t *p_block;
- vlc_bool_t b_eof;
+ bool b_eof;
+ int i_total = 0;
+
+ if( s->p_parent && s->p_parent->p_parent &&
+ 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( pb_eof ) *pb_eof = p_access->info.b_eof;
+ if( p_input && p_block && libvlc_stats (p_access) )
+ {
+ vlc_mutex_lock( &p_input->p->counters.counters_lock );
+ stats_UpdateInteger( s, p_input->p->counters.p_read_bytes,
+ p_block->i_buffer, &i_total );
+ stats_UpdateFloat( s, p_input->p->counters.p_input_bitrate,
+ (float)i_total, NULL );
+ stats_UpdateInteger( s, p_input->p->counters.p_read_packets, 1, NULL );
+ vlc_mutex_unlock( &p_input->p->counters.counters_lock );
+ }
return p_block;
}
msg_Dbg( s, "opening input `%s'", psz_name );
- p_list_access = access2_New( s, p_access->psz_access, 0, psz_name, 0 );
+ p_list_access = access_New( s, p_access->psz_access, "", psz_name );
if( !p_list_access ) return 0;
if( p_sys->p_list_access != p_access )
- access2_Delete( p_sys->p_list_access );
+ access_Delete( p_sys->p_list_access );
p_sys->p_list_access = p_list_access;
/* We have to read some data */
return AReadBlock( s, pb_eof );
}
-
+ if( p_block )
+ {
+ if( p_input )
+ {
+ vlc_mutex_lock( &p_input->p->counters.counters_lock );
+ stats_UpdateInteger( s, p_input->p->counters.p_read_bytes,
+ p_block->i_buffer, &i_total );
+ stats_UpdateFloat( s, p_input->p->counters.p_input_bitrate,
+ (float)i_total, NULL );
+ stats_UpdateInteger( s, p_input->p->counters.p_read_packets,
+ 1 , NULL);
+ vlc_mutex_unlock( &p_input->p->counters.counters_lock );
+ }
+ }
return p_block;
}
if( i != p_sys->i_list_index && i != 0 )
{
p_list_access =
- access2_New( s, p_access->psz_access, 0, psz_name, 0 );
+ access_New( s, p_access->psz_access, "", psz_name );
}
else if( i != p_sys->i_list_index )
{
if( p_list_access )
{
if( p_sys->p_list_access != p_access )
- access2_Delete( p_sys->p_list_access );
+ access_Delete( p_sys->p_list_access );
p_sys->p_list_access = p_list_access;
}
return p_access->pf_seek( p_access, 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
+ * than i_read that means that it's the end of the stream.
+ */
+int stream_Read( stream_t *s, void *p_read, int i_read )
+{
+ return s->pf_read( s, p_read, i_read );
+}
+
+/**
+ * Store in pp_peek a pointer to the next "i_peek" bytes in the stream
+ * \return The real numbers of valid bytes, if it's less
+ * or equal to 0, *pp_peek is invalid.
+ * \note pp_peek is a pointer to internal buffer and it will be invalid as
+ * soons as other stream_* functions are called.
+ * \note Due to input limitation, it could be less than i_peek without meaning
+ * the end of the stream (but only when you have i_peek >=
+ * p_input->i_bufsize)
+ */
+int stream_Peek( stream_t *s, const uint8_t **pp_peek, int i_peek )
+{
+ return s->pf_peek( s, pp_peek, i_peek );
+}
+
+/**
+ * Use to control the "stream_t *". Look at #stream_query_e for
+ * possible "i_query" value and format arguments. Return VLC_SUCCESS
+ * if ... succeed ;) and VLC_EGENERIC if failed or unimplemented
+ */
+int stream_vaControl( stream_t *s, int i_query, va_list args )
+{
+ return s->pf_control( s, i_query, args );
+}
+
+/**
+ * Destroy a stream
+ */
+void stream_Delete( stream_t *s )
+{
+ s->pf_destroy( s );
+}
+
+int stream_Control( stream_t *s, int i_query, ... )
+{
+ va_list args;
+ int i_result;
+
+ if ( s == NULL )
+ return VLC_EGENERIC;
+
+ va_start( args, i_query );
+ i_result = s->pf_control( s, i_query, args );
+ va_end( args );
+ return i_result;
+}
+
+/**
+ * Read "i_size" bytes and store them in a block_t.
+ * It always read i_size bytes unless you are at the end of the stream
+ * where it return what is available.
+ */
+block_t *stream_Block( stream_t *s, int i_size )
+{
+ if( i_size <= 0 ) return NULL;
+
+ /* emulate block read */
+ block_t *p_bk = block_New( s, i_size );
+ if( p_bk )
+ {
+ p_bk->i_buffer = stream_Read( s, p_bk->p_buffer, i_size );
+ if( p_bk->i_buffer > 0 )
+ {
+ return p_bk;
+ }
+ }
+ if( p_bk ) block_Release( p_bk );
+ return NULL;
+}
projects / vlc / blobdiff