/*****************************************************************************
* 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 <dirent.h>
+#include <assert.h>
+
+#include <vlc_common.h>
+#include <vlc_strings.h>
+#include <vlc_osd.h>
+#include <vlc_charset.h>
+
+#include <libvlc.h>
+
+#include "access.h"
+#include "stream.h"
#include "input_internal.h"
+#undef STREAM_DEBUG
+
/* TODO:
- * - tune the 2 methods
+ * - tune the 2 methods (block/stream)
* - compute cost for seek
* - improve stream mode seeking with closest segments
* - ...
* One linked list of data read
* - using pf_read
* More complex scheme using mutliple track to avoid seeking
+ * - using directly the access (only indirection for peeking).
+ * This method is known to introduce much less latency.
+ * It should probably defaulted (instead of the stream method (2)).
*/
/* How many tracks we have, currently only used for stream mode */
# define STREAM_CACHE_SIZE (4*STREAM_CACHE_TRACK*1024*1024)
#endif
-/* How many data we try to prebuffer */
-#define STREAM_CACHE_PREBUFFER_SIZE (32767)
-/* Maximum time we take to pre-buffer */
-#define STREAM_CACHE_PREBUFFER_LENGTH (100*1000)
+/* How many data we try to prebuffer
+ * XXX it should be small to avoid useless latency but big enough for
+ * efficient demux probing */
+#define STREAM_CACHE_PREBUFFER_SIZE (128)
/* Method1: Simple, for pf_block.
* We get blocks and put them in the linked list.
* We release blocks once the total size is bigger than CACHE_BLOCK_SIZE
*/
-#define STREAM_DATA_WAIT 40000 /* Time between before a pf_block retry */
/* Method2: A bit more complex, for pf_read
* - We use ring buffers, only one if unseekable, all if seekable
* - compute a good value for i_read_size
* - ?
*/
-#define STREAM_READ_ATONCE 32767
+#define STREAM_READ_ATONCE 1024
#define STREAM_CACHE_TRACK_SIZE (STREAM_CACHE_SIZE/STREAM_CACHE_TRACK)
typedef struct
} access_entry_t;
+typedef enum
+{
+ STREAM_METHOD_BLOCK,
+ STREAM_METHOD_STREAM
+} stream_read_method_t;
+
struct stream_sys_t
{
access_t *p_access;
- vlc_bool_t b_block; /* Block method (1) or stream */
+ stream_read_method_t method; /* method to use */
int64_t i_pos; /* Current reading offset */
struct
{
int64_t i_start; /* Offset of block for p_first */
- int i_offset; /* Offset for data in p_current */
+ int64_t i_offset; /* Offset for data in p_current */
block_t *p_current; /* Current block */
int i_size; /* Total amount of data in the list */
} stream;
/* Peek temporary buffer */
- int i_peek;
+ unsigned int i_peek;
uint8_t *p_peek;
/* Stat for both method */
struct
{
- vlc_bool_t b_fastseek; /* From access */
+ bool b_fastseek; /* From access */
/* Stat about reading data */
int64_t i_read_count;
access_t *p_list_access;
/* Preparse mode ? */
- vlc_bool_t b_quick;
+ bool b_quick;
+
+ /* */
+ struct
+ {
+ bool b_active;
+
+ FILE *f; /* TODO it could be replaced by access_output_t one day */
+ bool b_error;
+ } record;
};
/* Method 1: */
-static int AStreamReadBlock( stream_t *s, void *p_read, int i_read );
-static int AStreamPeekBlock( stream_t *s, uint8_t **p_peek, int i_read );
+static int AStreamReadBlock( stream_t *s, void *p_read, unsigned int i_read );
+static int AStreamPeekBlock( stream_t *s, const uint8_t **p_peek, unsigned int i_read );
static int AStreamSeekBlock( stream_t *s, int64_t i_pos );
static void AStreamPrebufferBlock( stream_t *s );
-static block_t *AReadBlock( stream_t *s, vlc_bool_t *pb_eof );
+static block_t *AReadBlock( stream_t *s, bool *pb_eof );
/* Method 2 */
-static int AStreamReadStream( stream_t *s, void *p_read, int i_read );
-static int AStreamPeekStream( stream_t *s, uint8_t **pp_peek, int i_read );
+static int AStreamReadStream( stream_t *s, void *p_read, unsigned int i_read );
+static int AStreamPeekStream( stream_t *s, const uint8_t **pp_peek, unsigned int i_read );
static int AStreamSeekStream( stream_t *s, int64_t i_pos );
static void AStreamPrebufferStream( stream_t *s );
-static int AReadStream( stream_t *s, void *p_read, int i_read );
+static int AReadStream( stream_t *s, void *p_read, unsigned int i_read );
/* Common */
static int AStreamControl( stream_t *s, int i_query, va_list );
static void AStreamDestroy( stream_t *s );
static void UStreamDestroy( stream_t *s );
static int ASeek( stream_t *s, int64_t i_pos );
+static int ARecordSetState( stream_t *s, bool b_record, const char *psz_extension );
+static void ARecordWrite( stream_t *s, const uint8_t *p_buffer, size_t i_buffer );
+/****************************************************************************
+ * stream_CommonNew: create an empty stream structure
+ ****************************************************************************/
+stream_t *stream_CommonNew( vlc_object_t *p_obj )
+{
+ return (stream_t *)vlc_custom_create( p_obj, sizeof(stream_t),
+ VLC_OBJECT_GENERIC, "stream" );
+}
/****************************************************************************
- * stream_AccessNew: create a stream from a access
+ * stream_UrlNew: create a stream from a access
****************************************************************************/
stream_t *__stream_UrlNew( vlc_object_t *p_parent, const char *psz_url )
{
- char *psz_access, *psz_demux, *psz_path, *psz_dup;
+ const char *psz_access, *psz_demux;
+ char *psz_path;
access_t *p_access;
stream_t *p_res;
- psz_dup = strdup( psz_url );
- MRLSplit( p_parent, psz_dup, &psz_access, &psz_demux, &psz_path );
-
+ 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 );
+
/* Now try a real access */
- p_access = access2_New( p_parent, psz_access, NULL,
- psz_path, VLC_FALSE );
+ 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 );
- free( psz_dup );
return NULL;
}
- p_res = stream_AccessNew( p_access, VLC_TRUE );
- if( p_res )
- {
- p_res->pf_destroy = UStreamDestroy;
- free( psz_dup );
- return p_res;
- }
- else
+
+ if( !( p_res = stream_AccessNew( p_access, true ) ) )
{
- access2_Delete( p_access );
+ access_Delete( p_access );
+ return NULL;
}
- free( psz_dup );
- return NULL;
+
+ p_res->pf_destroy = UStreamDestroy;
+ return p_res;
}
-stream_t *stream_AccessNew( access_t *p_access, vlc_bool_t b_quick )
+stream_t *stream_AccessNew( access_t *p_access, bool b_quick )
{
- stream_t *s = vlc_object_create( p_access, VLC_OBJECT_STREAM );
+ stream_t *s = stream_CommonNew( VLC_OBJECT(p_access) );
stream_sys_t *p_sys;
- char *psz_list;
+ char *psz_list = NULL;
+
+ if( !s )
+ return NULL;
- if( !s ) return NULL;
+ s->p_sys = p_sys = malloc( sizeof( stream_sys_t ) );
+ if( !p_sys )
+ {
+ vlc_object_release( s );
+ return NULL;
+ }
/* Attach it now, needed for b_die */
vlc_object_attach( s, p_access );
- s->pf_block = NULL;
s->pf_read = NULL; /* Set up later */
s->pf_peek = NULL;
- s->pf_control= AStreamControl;
+ s->pf_control = AStreamControl;
s->pf_destroy = AStreamDestroy;
- s->p_sys = p_sys = malloc( sizeof( stream_sys_t ) );
+ /* UTF16 and UTF32 text file conversion */
+ s->i_char_width = 1;
+ s->b_little_endian = false;
+ s->conv = (vlc_iconv_t)(-1);
/* Common field */
p_sys->p_access = p_access;
- p_sys->b_block = p_access->pf_block ? VLC_TRUE : VLC_FALSE;
+ if( p_access->pf_block )
+ p_sys->method = STREAM_METHOD_BLOCK;
+ else
+ p_sys->method = STREAM_METHOD_STREAM;
+
+ p_sys->record.b_active = false;
+
p_sys->i_pos = p_access->info.i_pos;
/* Stats */
- access2_Control( p_access, ACCESS_CAN_FASTSEEK, &p_sys->stat.b_fastseek );
+ access_Control( p_access, ACCESS_CAN_FASTSEEK, &p_sys->stat.b_fastseek );
p_sys->stat.i_bytes = 0;
p_sys->stat.i_read_time = 0;
p_sys->stat.i_read_count = 0;
if( (psz_list = var_CreateGetString( s, "input-list" )) && *psz_list )
{
access_entry_t *p_entry = malloc( sizeof(access_entry_t) );
+ if( p_entry == NULL )
+ goto error;
char *psz_name, *psz_parser = psz_name = psz_list;
p_sys->p_list_access = p_access;
p_entry->i_size = p_access->info.i_size;
p_entry->psz_path = strdup( p_access->psz_path );
+ if( p_entry->psz_path == NULL )
+ {
+ free( p_entry );
+ goto error;
+ }
TAB_APPEND( p_sys->i_list, p_sys->list, p_entry );
- msg_Dbg( p_access, "adding file `%s', ("I64Fd" bytes)",
+ msg_Dbg( p_access, "adding file `%s', (%"PRId64" bytes)",
p_entry->psz_path, p_access->info.i_size );
while( psz_name && *psz_name )
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 )
+ goto error;
p_entry->i_size = p_tmp->info.i_size;
p_entry->psz_path = psz_name;
TAB_APPEND( p_sys->i_list, p_sys->list, p_entry );
- access2_Delete( p_tmp );
+ access_Delete( p_tmp );
}
psz_name = psz_parser;
if( psz_name ) psz_name++;
}
}
- if( psz_list ) free( psz_list );
+ FREENULL( psz_list );
/* Peek */
p_sys->i_peek = 0;
p_sys->p_peek = NULL;
- if( p_sys->b_block )
+ if( p_sys->method == STREAM_METHOD_BLOCK )
{
+ msg_Dbg( s, "Using AStream*Block" );
s->pf_read = AStreamReadBlock;
s->pf_peek = AStreamPeekBlock;
{
int i;
+ assert( p_sys->method == STREAM_METHOD_STREAM );
+
+ msg_Dbg( s, "Using AStream*Stream" );
+
s->pf_read = AStreamReadStream;
s->pf_peek = AStreamPeekStream;
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 )
+ 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;
return s;
error:
- if( p_sys->b_block )
+ if( p_sys->method == STREAM_METHOD_BLOCK )
{
/* Nothing yet */
}
{
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;
}
vlc_object_detach( s );
- if( p_sys->b_block ) block_ChainRelease( p_sys->block.p_first );
- else free( p_sys->stream.p_buffer );
+ if( p_sys->record.b_active )
+ ARecordSetState( s, false, NULL );
+
+ if( p_sys->method == STREAM_METHOD_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 );
+ access_t *p_access = (access_t *)s->p_parent;
AStreamDestroy( s );
- access2_Delete( p_access );
+ access_Delete( p_access );
}
/****************************************************************************
p_sys->i_pos = p_sys->p_access->info.i_pos;
- if( p_sys->b_block )
+ if( p_sys->method == STREAM_METHOD_BLOCK )
{
block_ChainRelease( p_sys->block.p_first );
{
int i;
+ assert( p_sys->method == STREAM_METHOD_STREAM );
+
/* Setup our tracks */
p_sys->stream.i_offset = 0;
p_sys->stream.i_tk = 0;
stream_sys_t *p_sys = s->p_sys;
access_t *p_access = p_sys->p_access;
- vlc_bool_t *p_bool;
+ bool *p_bool;
+ bool b_bool;
+ const char *psz_string;
int64_t *pi_64, i_64;
int i_int;
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:
case STREAM_SET_POSITION:
i_64 = (int64_t)va_arg( args, int64_t );
- if( p_sys->b_block )
+ switch( p_sys->method )
+ {
+ case STREAM_METHOD_BLOCK:
return AStreamSeekBlock( s, i_64 );
- else
+ case STREAM_METHOD_STREAM:
return AStreamSeekStream( s, i_64 );
+ default:
+ assert(0);
+ return VLC_EGENERIC;
+ }
case STREAM_GET_MTU:
return VLC_EGENERIC;
"DON'T USE STREAM_CONTROL_ACCESS !!!" );
return VLC_EGENERIC;
}
- return access2_vaControl( p_access, i_int, args );
+ return access_vaControl( p_access, i_int, args );
+
+ case STREAM_GET_CONTENT_TYPE:
+ return access_Control( p_access, ACCESS_GET_CONTENT_TYPE,
+ va_arg( args, char ** ) );
+ case STREAM_SET_RECORD_STATE:
+ b_bool = (bool)va_arg( args, int );
+ psz_string = NULL;
+ if( b_bool )
+ psz_string = (const char*)va_arg( args, const char* );
+ return ARecordSetState( s, b_bool, psz_string );
default:
msg_Err( s, "invalid stream_vaControl query=0x%x", i_query );
return VLC_SUCCESS;
}
+/****************************************************************************
+ * ARecord*: record stream functions
+ ****************************************************************************/
+static int ARecordStart( stream_t *s, const char *psz_extension )
+{
+ stream_sys_t *p_sys = s->p_sys;
+
+ char *psz_file;
+ FILE *f;
+
+ /* */
+ if( !psz_extension )
+ psz_extension = "dat";
+
+ /* Retreive path */
+ char *psz_path = var_CreateGetString( s, "input-record-path" );
+ if( !psz_path || *psz_path == '\0' )
+ {
+ free( psz_path );
+ psz_path = strdup( config_GetHomeDir() );
+ }
+
+ if( !psz_path )
+ return VLC_ENOMEM;
+
+ /* Create file name
+ * TODO allow prefix configuration */
+ psz_file = input_CreateFilename( VLC_OBJECT(s), psz_path, INPUT_RECORD_PREFIX, psz_extension );
+
+ free( psz_path );
+
+ if( !psz_file )
+ return VLC_ENOMEM;
+
+ f = utf8_fopen( psz_file, "wb" );
+ if( !f )
+ {
+ free( psz_file );
+ return VLC_EGENERIC;
+ }
+ msg_Dbg( s, "Recording into %s", psz_file );
+ free( psz_file );
+
+ /* */
+ p_sys->record.f = f;
+ p_sys->record.b_active = true;
+ p_sys->record.b_error = false;
+ return VLC_SUCCESS;
+}
+static int ARecordStop( stream_t *s )
+{
+ stream_sys_t *p_sys = s->p_sys;
+
+ assert( p_sys->record.b_active );
+
+ msg_Dbg( s, "Recording completed" );
+ fclose( p_sys->record.f );
+ p_sys->record.b_active = false;
+ return VLC_SUCCESS;
+}
+
+static int ARecordSetState( stream_t *s, bool b_record, const char *psz_extension )
+{
+ stream_sys_t *p_sys = s->p_sys;
+
+ if( !!p_sys->record.b_active == !!b_record )
+ return VLC_SUCCESS;
+
+ if( b_record )
+ return ARecordStart( s, psz_extension );
+ else
+ return ARecordStop( s );
+}
+static void ARecordWrite( stream_t *s, const uint8_t *p_buffer, size_t i_buffer )
+{
+ stream_sys_t *p_sys = s->p_sys;
+
+ assert( p_sys->record.b_active );
+ if( i_buffer > 0 )
+ {
+ const bool b_previous_error = p_sys->record.b_error;
+ const size_t i_written = fwrite( p_buffer, 1, i_buffer, p_sys->record.f );
+
+ p_sys->record.b_error = i_written != i_buffer;
+
+ /* TODO maybe a intf_UserError or something like that ? */
+ if( p_sys->record.b_error && !b_previous_error )
+ msg_Err( s, "Failed to record data (begin)" );
+ else if( !p_sys->record.b_error && b_previous_error )
+ msg_Err( s, "Failed to record data (end)" );
+ }
+}
/****************************************************************************
* Method 1:
static void AStreamPrebufferBlock( stream_t *s )
{
stream_sys_t *p_sys = s->p_sys;
+ access_t *p_access = p_sys->p_access;
int64_t i_first = 0;
int64_t i_start;
i_start = mdate();
for( ;; )
{
- int64_t i_date = mdate();
- vlc_bool_t b_eof;
+ const int64_t i_date = mdate();
+ bool b_eof;
block_t *b;
- if( s->b_die || p_sys->block.i_size > STREAM_CACHE_PREBUFFER_SIZE ||
- ( i_first > 0 && i_first + STREAM_CACHE_PREBUFFER_LENGTH < i_date ) )
+ if( s->b_die || p_sys->block.i_size > STREAM_CACHE_PREBUFFER_SIZE )
{
int64_t i_byterate;
/* 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;
}
/* Fetch a block */
if( ( b = AReadBlock( s, &b_eof ) ) == NULL )
{
- if( b_eof ) break;
-
- msleep( STREAM_DATA_WAIT );
+ if( b_eof )
+ 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( i_first == 0 )
{
i_first = mdate();
- msg_Dbg( s, "received first data for our buffer");
+ msg_Dbg( s, "received first data after %d ms",
+ (int)((i_first-i_start)/1000) );
}
-
- /* 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;
static int AStreamRefillBlock( stream_t *s );
-static int AStreamReadBlock( stream_t *s, void *p_read, int i_read )
+static int AStreamReadBlock( stream_t *s, void *p_read, unsigned int i_read )
{
stream_sys_t *p_sys = s->p_sys;
- uint8_t *p_data= (uint8_t*)p_read;
- int i_data = 0;
+ uint8_t *p_data = p_read;
+ uint8_t *p_record = p_data;
+ unsigned int i_data = 0;
/* It means EOF */
if( p_sys->block.p_current == NULL )
return 0;
- if( p_read == NULL )
+ if( p_sys->record.b_active && !p_data )
+ p_record = p_data = malloc( i_read );
+
+ if( p_data == NULL )
{
/* seek within this stream if possible, else use plain old read and discard */
stream_sys_t *p_sys = s->p_sys;
access_t *p_access = p_sys->p_access;
- vlc_bool_t b_aseek;
- access2_Control( p_access, ACCESS_CAN_SEEK, &b_aseek );
+ bool b_aseek;
+ access_Control( p_access, ACCESS_CAN_SEEK, &b_aseek );
if( b_aseek )
return AStreamSeekBlock( s, p_sys->i_pos + i_read ) ? 0 : i_read;
}
{
int i_current =
p_sys->block.p_current->i_buffer - p_sys->block.i_offset;
- int i_copy = __MIN( i_current, i_read - i_data);
+ unsigned int i_copy = __MIN( (unsigned int)__MAX(i_current,0), i_read - i_data);
/* Copy data */
if( p_data )
p_sys->block.i_offset = 0;
p_sys->block.p_current = p_sys->block.p_current->p_next;
}
- /*Get a new block */
- if( AStreamRefillBlock( s ) )
+ /*Get a new block if needed */
+ if( !p_sys->block.p_current && AStreamRefillBlock( s ) )
{
break;
}
}
}
+ if( p_sys->record.b_active )
+ {
+ if( i_data > 0 && p_record != NULL)
+ ARecordWrite( s, p_record, i_data );
+ if( !p_read )
+ free( p_record );
+ }
+
p_sys->i_pos += i_data;
return i_data;
}
-static int AStreamPeekBlock( stream_t *s, uint8_t **pp_peek, int i_read )
+static int AStreamPeekBlock( stream_t *s, const uint8_t **pp_peek, unsigned int i_read )
{
stream_sys_t *p_sys = s->p_sys;
uint8_t *p_data;
- int i_data = 0;
+ unsigned int i_data = 0;
block_t *b;
- int i_offset;
+ unsigned int i_offset;
if( p_sys->block.p_current == NULL ) return 0; /* EOF */
while( b && i_data < i_read )
{
- int i_current = b->i_buffer - i_offset;
+ unsigned int i_current = __MAX(b->i_buffer - i_offset,0);
int i_copy = __MIN( i_current, i_read - i_data );
memcpy( p_data, &b->p_buffer[i_offset], i_copy );
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 */
- while( p_sys->block.i_start + p_sys->block.i_size < i_pos )
+ do
{
+ /* Read and skip enough data */
if( AStreamRefillBlock( s ) )
- {
- msg_Err( s, "can't read enough data in seek" );
return VLC_EGENERIC;
- }
+
while( p_sys->block.p_current &&
- p_sys->i_pos + p_sys->block.p_current->i_buffer < i_pos )
+ p_sys->i_pos + p_sys->block.p_current->i_buffer - p_sys->block.i_offset < i_pos )
{
- p_sys->i_pos += p_sys->block.p_current->i_buffer;
+ p_sys->i_pos += p_sys->block.p_current->i_buffer - p_sys->block.i_offset;
p_sys->block.p_current = p_sys->block.p_current->p_next;
+ p_sys->block.i_offset = 0;
}
}
+ while( p_sys->block.i_start + p_sys->block.i_size < i_pos );
p_sys->block.i_offset = i_pos - p_sys->i_pos;
p_sys->i_pos = i_pos;
- /* TODO read data */
return VLC_SUCCESS;
}
i_start = mdate();
for( ;; )
{
- vlc_bool_t b_eof;
-
- if( s->b_die ) return VLC_EGENERIC;
+ bool b_eof;
+ if( s->b_die )
+ return VLC_EGENERIC;
/* Fetch a block */
- if( ( b = AReadBlock( s, &b_eof ) ) ) break;
-
- if( b_eof ) return VLC_EGENERIC;
-
- msleep( STREAM_DATA_WAIT );
+ if( ( b = AReadBlock( s, &b_eof ) ) )
+ break;
+ if( b_eof )
+ return VLC_EGENERIC;
}
- 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;
}
****************************************************************************/
static int AStreamRefillStream( stream_t *s );
-static int AStreamReadStream( stream_t *s, void *p_read, int i_read )
+static int AStreamReadStream( stream_t *s, void *p_read, unsigned int i_read )
{
stream_sys_t *p_sys = s->p_sys;
stream_track_t *tk = &p_sys->stream.tk[p_sys->stream.i_tk];
uint8_t *p_data = (uint8_t *)p_read;
- int i_data = 0;
+ uint8_t *p_record = p_data;
+ unsigned int i_data = 0;
- if( tk->i_start >= tk->i_end ) return 0; /* EOF */
+ if( tk->i_start >= tk->i_end )
+ return 0; /* EOF */
+
+ if( p_sys->record.b_active && !p_data )
+ p_record = p_data = malloc( i_read );
- if( p_read == NULL )
+ if( p_data == NULL )
{
/* seek within this stream if possible, else use plain old read and discard */
stream_sys_t *p_sys = s->p_sys;
access_t *p_access = p_sys->p_access;
- vlc_bool_t b_aseek;
- access2_Control( p_access, ACCESS_CAN_SEEK, &b_aseek );
- if( b_aseek )
- return AStreamSeekStream( s, p_sys->i_pos + i_read ) ? 0 : i_read;
+
+ /* seeking after EOF is not what we want */
+ if( !( p_access->info.b_eof ) )
+ {
+ bool b_aseek;
+ access_Control( p_access, ACCESS_CAN_SEEK, &b_aseek );
+ if( b_aseek )
+ return AStreamSeekStream( s, p_sys->i_pos + i_read ) ? 0 : i_read;
+ }
}
-#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
{
int i_off = (tk->i_start + p_sys->stream.i_offset) %
STREAM_CACHE_TRACK_SIZE;
- int i_current =
- __MIN( tk->i_end - tk->i_start - p_sys->stream.i_offset,
- STREAM_CACHE_TRACK_SIZE - i_off );
+ unsigned int i_current =
+ __MAX(0,__MIN( tk->i_end - tk->i_start - p_sys->stream.i_offset,
+ STREAM_CACHE_TRACK_SIZE - i_off ));
int i_copy = __MIN( i_current, i_read - i_data );
if( i_copy <= 0 ) break; /* EOF */
if( tk->i_start + p_sys->stream.i_offset >= tk->i_end ||
p_sys->stream.i_used >= p_sys->stream.i_read_size )
{
+ 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( p_sys->record.b_active )
+ {
+ if( i_data > 0 && p_record != NULL)
+ ARecordWrite( s, p_record, i_data );
+ if( !p_read )
+ free( p_record );
+ }
+
return i_data;
}
-static int AStreamPeekStream( stream_t *s, uint8_t **pp_peek, int i_read )
+static int AStreamPeekStream( stream_t *s, const uint8_t **pp_peek, unsigned int i_read )
{
stream_sys_t *p_sys = s->p_sys;
stream_track_t *tk = &p_sys->stream.tk[p_sys->stream.i_tk];
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
{
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 )
/* msg_Dbg( s, "AStreamRefillStream: read=%d", i_read ); */
if( i_read < 0 )
{
- msleep( STREAM_DATA_WAIT );
continue;
}
else if( i_read == 0 )
{
- if( !b_read ) return VLC_EGENERIC;
+ if( !b_read )
+ return VLC_EGENERIC;
return VLC_SUCCESS;
}
- b_read = VLC_TRUE;
+ b_read = true;
/* Update end */
tk->i_end += i_read;
int64_t i_first = 0;
int64_t i_start;
- int64_t i_prebuffer = p_sys->b_quick ? STREAM_CACHE_TRACK_SIZE /100 :
- ( (p_access->info.i_title > 1 || p_access->info.i_seekpoint > 1) ?
- STREAM_CACHE_PREBUFFER_SIZE : STREAM_CACHE_TRACK_SIZE / 3 );
msg_Dbg( s, "pre buffering" );
i_start = mdate();
int64_t i_date = mdate();
int i_read;
- if( s->b_die || tk->i_end >= i_prebuffer ||
- (i_first > 0 && i_first + STREAM_CACHE_PREBUFFER_LENGTH < i_date) )
+ if( s->b_die || tk->i_end >= 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_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;
}
i_read = __MIN( p_sys->stream.i_read_size, i_read );
i_read = AReadStream( s, &tk->p_buffer[tk->i_end], i_read );
if( i_read < 0 )
- {
- msleep( STREAM_DATA_WAIT );
continue;
- }
else if( i_read == 0 )
- {
- /* EOF */
- break;
- }
+ break; /* EOF */
if( i_first == 0 )
{
i_first = mdate();
- msg_Dbg( s, "received first data for our buffer");
+ msg_Dbg( s, "received first data after %d ms",
+ (int)((i_first-i_start)/1000) );
}
tk->i_end += i_read;
}
}
-
/****************************************************************************
* stream_ReadLine:
****************************************************************************/
/**
* 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)
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 >= 3 )
+ {
+ 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 ) )
+ {
+ psz_encoding = "UTF-16LE";
+ s->b_little_endian = true;
+ s->i_char_width = 2;
+ i_bom_size = 2;
+ }
+ else if( !memcmp( p_data, "\xFE\xFF", 2 ) )
+ {
+ psz_encoding = "UTF-16BE";
+ s->i_char_width = 2;
+ 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 );
+ }
+ }
+ }
+
+ 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;
+ }
+ }
+
+ 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 )
+ 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 )
+ 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 )
+ 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;
}
/****************************************************************************
* Access reading/seeking wrappers to handle concatenated streams.
****************************************************************************/
-static int AReadStream( stream_t *s, void *p_read, int i_read )
+static int AReadStream( stream_t *s, void *p_read, unsigned int i_read )
{
stream_sys_t *p_sys = s->p_sys;
access_t *p_access = p_sys->p_access;
+ 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_access->b_die )
+ vlc_object_kill( s );
+ 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;
}
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 )
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( 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) )
+ {
+ 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;
}
- p_block = p_sys->p_list_access->pf_block( p_access );
+ p_block = p_sys->p_list_access->pf_block( p_sys->p_list_access );
+ if( p_access->b_die )
+ vlc_object_kill( s );
b_eof = p_sys->p_list_access->info.b_eof;
if( pb_eof ) *pb_eof = b_eof;
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 )
+ {
+ int i_read = stream_Read( s, p_bk->p_buffer, i_size );
+ if( i_read > 0 )
+ {
+ p_bk->i_buffer = i_read;
+ return p_bk;
+ }
+ block_Release( p_bk );
+ }
+ return NULL;
+}
projects / vlc / blobdiff