# include "config.h"
#endif
-#include <vlc/vlc.h>
+#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;
- bool 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 */
/* Preparse mode ? */
bool b_quick;
+
+ /* */
+ struct
+ {
+ bool b_active;
+
+ FILE *f; /* TODO it could be replaced by access_output_t one day */
+ bool b_error;
+ } record;
};
/* Method 1: */
-static int AStreamReadBlock( stream_t *s, void *p_read, int i_read );
-static int AStreamPeekBlock( stream_t *s, const 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, bool *pb_eof );
/* Method 2 */
-static int AStreamReadStream( stream_t *s, void *p_read, int i_read );
-static int AStreamPeekStream( stream_t *s, const 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 )
+{
+ stream_t *s = (stream_t *)vlc_custom_create( p_obj, sizeof(*s),
+ VLC_OBJECT_GENERIC, "stream" );
+
+ if( !s )
+ return NULL;
+
+ s->p_text = malloc( sizeof(*s->p_text) );
+ if( !s->p_text )
+ {
+ vlc_object_release( s );
+ return NULL;
+ }
+
+ /* UTF16 and UTF32 text file conversion */
+ s->p_text->conv = (vlc_iconv_t)(-1);
+ s->p_text->i_char_width = 1;
+ s->p_text->b_little_endian = false;
+
+ return s;
+}
+void stream_CommonDelete( stream_t *s )
+{
+ if( s->p_text )
+ {
+ if( s->p_text->conv != (vlc_iconv_t)(-1) )
+ vlc_iconv_close( s->p_text->conv );
+ free( s->p_text );
+ }
+ vlc_object_release( s );
+}
/****************************************************************************
* stream_UrlNew: create a stream from a access
access_t *p_access;
stream_t *p_res;
- if( !psz_url ) return 0;
+ if( !psz_url )
+ return NULL;
- char psz_dup[strlen (psz_url) + 1];
- strcpy (psz_dup, psz_url);;
- MRLSplit( psz_dup, &psz_access, &psz_demux, &psz_path );
+ 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 = access_New( p_parent, psz_access, psz_demux, psz_path );
stream_t *stream_AccessNew( access_t *p_access, bool b_quick )
{
- stream_t *s = vlc_stream_create( VLC_OBJECT(p_access) );
+ stream_t *s = stream_CommonNew( VLC_OBJECT(p_access) );
stream_sys_t *p_sys;
char *psz_list = NULL;
- if( !s ) return NULL;
+ if( !s )
+ return NULL;
+
+ s->p_sys = p_sys = malloc( sizeof( stream_sys_t ) );
+ if( !p_sys )
+ {
+ stream_CommonDelete( s );
+ return NULL;
+ }
/* Attach it now, needed for b_die */
vlc_object_attach( s, p_access );
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 ? true : 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 */
{
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->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;
}
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 );
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_tk = 0;
p_sys->stream.p_buffer = malloc( STREAM_CACHE_SIZE );
if( p_sys->stream.p_buffer == NULL )
- {
- msg_Err( s, "Out of memory when allocating stream cache (%d bytes)",
- STREAM_CACHE_SIZE );
goto error;
- }
p_sys->stream.i_used = 0;
access_Control( p_access, ACCESS_GET_MTU,
&p_sys->stream.i_read_size );
return s;
error:
- if( p_sys->b_block )
+ if( p_sys->method == STREAM_METHOD_BLOCK )
{
/* Nothing yet */
}
free( psz_list );
free( s->p_sys );
vlc_object_detach( s );
- vlc_object_release( s );
+ stream_CommonDelete( 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 );
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( s->p_sys );
- vlc_object_release( s );
+ free( p_sys->list );
+ free( p_sys );
+
+ stream_CommonDelete( 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 );
- vlc_object_release( 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;
access_t *p_access = p_sys->p_access;
bool *p_bool;
+ bool b_bool;
+ const char *psz_string;
int64_t *pi_64, i_64;
int i_int;
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;
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:
i_start = mdate();
for( ;; )
{
- int64_t i_date = mdate();
+ const int64_t i_date = mdate();
bool b_eof;
block_t *b;
- if( s->b_die || p_sys->block.i_size > STREAM_CACHE_PREBUFFER_SIZE ||
- ( i_first > 0 && i_first + STREAM_CACHE_PREBUFFER_LENGTH < i_date ) )
+ if( s->b_die || p_sys->block.i_size > STREAM_CACHE_PREBUFFER_SIZE )
{
int64_t i_byterate;
/* 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 %"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;
}
b = b->p_next;
}
- if( p_access->info.b_prebuffered )
- {
- /* Access has already prebufferred - update stats and exit */
- p_sys->stat.i_bytes = p_sys->block.i_size;
- p_sys->stat.i_read_time = mdate() - i_start;
- break;
- }
-
if( i_first == 0 )
{
i_first = mdate();
- msg_Dbg( s, "received first data for our buffer");
+ msg_Dbg( s, "received first data after %d ms",
+ (int)((i_first-i_start)/1000) );
}
-
}
p_sys->block.p_current = p_sys->block.p_first;
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;
{
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 )
}
}
+ 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, const 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 );
}
else
{
- /* Read enough data */
- while( p_sys->block.i_start + p_sys->block.i_size < i_pos )
+ do
{
+ /* Read and skip enough data */
if( AStreamRefillBlock( s ) )
return VLC_EGENERIC;
while( p_sys->block.p_current &&
- p_sys->i_pos + p_sys->block.p_current->i_buffer < 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;
{
bool b_eof;
- if( s->b_die ) return VLC_EGENERIC;
-
+ 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;
}
while( b )
****************************************************************************/
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_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;
- 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;
+
+ /* seeking after EOF is not what we want */
+ if( !( p_access->info.b_eof ) )
+ {
+ bool b_aseek;
+ access_Control( p_access, ACCESS_CAN_SEEK, &b_aseek );
+ if( b_aseek )
+ return AStreamSeekStream( s, p_sys->i_pos + i_read ) ? 0 : i_read;
+ }
}
#ifdef STREAM_DEBUG
{
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, const 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];
/* 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 = true;
int64_t i_first = 0;
int64_t i_start;
- int64_t i_prebuffer = p_sys->b_quick ? STREAM_CACHE_TRACK_SIZE /100 :
- ( (p_access->info.i_title > 1 || p_access->info.i_seekpoint > 1) ?
- STREAM_CACHE_PREBUFFER_SIZE : STREAM_CACHE_TRACK_SIZE / 3 );
- msg_Dbg( s, "pre-buffering..." );
+ msg_Dbg( s, "pre buffering" );
i_start = mdate();
for( ;; )
{
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, "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:
****************************************************************************/
*/
#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;
/* BOM detection */
i_pos = stream_Tell( s );
- if( i_pos == 0 && i_data > 4 )
+ if( i_pos == 0 && i_data >= 3 )
{
int i_bom_size = 0;
- char *psz_encoding = NULL;
+ const char *psz_encoding = NULL;
- if( p_data[0] == 0xEF && p_data[1] == 0xBB && p_data[2] == 0xBF )
+ if( !memcmp( p_data, "\xEF\xBB\xBF", 3 ) )
{
- psz_encoding = strdup( "UTF-8" );
+ psz_encoding = "UTF-8";
i_bom_size = 3;
}
- else if( p_data[0] == 0x00 && p_data[1] == 0x00 )
+ else if( !memcmp( p_data, "\xFF\xFE", 2 ) )
{
- 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;
- }
+ psz_encoding = "UTF-16LE";
+ s->p_text->b_little_endian = true;
+ s->p_text->i_char_width = 2;
+ i_bom_size = 2;
}
- else if( p_data[0] == 0xFE && p_data[1] == 0xFF )
+ else if( !memcmp( p_data, "\xFE\xFF", 2 ) )
{
- psz_encoding = strdup( "UTF-16BE" );
- s->i_char_width = 2;
+ psz_encoding = "UTF-16BE";
+ s->p_text->i_char_width = 2;
i_bom_size = 2;
}
/* Open the converter if we need it */
if( psz_encoding != NULL )
{
- input_thread_t *p_input;
msg_Dbg( s, "%s BOM detected", psz_encoding );
- p_input = (input_thread_t *)vlc_object_find( s, VLC_OBJECT_INPUT, FIND_PARENT );
- if( s->i_char_width > 1 )
+ if( s->p_text->i_char_width > 1 )
{
- s->conv = vlc_iconv_open( "UTF-8", psz_encoding );
- if( s->conv == (vlc_iconv_t)-1 )
+ s->p_text->conv = vlc_iconv_open( "UTF-8", psz_encoding );
+ if( s->p_text->conv == (vlc_iconv_t)-1 )
{
msg_Err( s, "iconv_open failed" );
}
}
+
+ /* FIXME that's UGLY */
+ input_thread_t *p_input;
+ p_input = (input_thread_t *)vlc_object_find( s, VLC_OBJECT_INPUT, FIND_PARENT );
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 )
+ if( i_data % s->p_text->i_char_width )
{
/* keep i_char_width boundary */
- i_data = i_data - ( i_data % s->i_char_width );
+ i_data = i_data - ( i_data % s->p_text->i_char_width );
msg_Warn( s, "the read is not i_char_width compatible");
}
break;
/* Check if there is an EOL */
- if( s->i_char_width == 1 )
+ if( s->p_text->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;
+ const uint8_t *p_last = p + i_data - s->p_text->i_char_width;
- if( s->i_char_width == 2 )
+ if( s->p_text->i_char_width == 2 )
{
- if( s->b_little_endian == true)
+ 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( 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 )
{
}
else
{
- psz_eol = (char *)p + ( s->i_char_width - 1 );
+ psz_eol = (char *)p + ( s->p_text->i_char_width - 1 );
}
}
- if(psz_eol)
+ if( psz_eol )
{
i_data = (psz_eol - (char *)p_data) + 1;
- p_line = realloc( p_line, i_line + i_data + s->i_char_width ); /* add \0 */
+ p_line = realloc( p_line, i_line + i_data + s->p_text->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 - s->i_char_width; /* skip \n */;
+ i_line += i_data - s->p_text->i_char_width; /* skip \n */;
i_read += i_data;
/* We have our line */
}
/* Read data (+1 for easy \0 append) */
- p_line = realloc( p_line, i_line + STREAM_PROBE_LINE + s->i_char_width );
+ p_line = realloc( p_line, i_line + STREAM_PROBE_LINE + s->p_text->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;
if( i_read > 0 )
{
int j;
- for( j = 0; j < s->i_char_width; j++ )
+ for( j = 0; j < s->p_text->i_char_width; j++ )
{
p_line[i_line + j] = '\0';
}
- i_line += s->i_char_width; /* the added \0 */
- if( s->i_char_width > 1 )
+ i_line += s->p_text->i_char_width; /* the added \0 */
+ if( s->p_text->i_char_width > 1 )
{
size_t i_in = 0, i_out = 0;
const char * p_in = NULL;
/* 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 )
+ if( vlc_iconv( s->p_text->conv, &p_in, &i_in, &p_out, &i_out ) == (size_t)-1 )
{
msg_Err( s, "iconv failed" );
msg_Dbg( s, "original: %d, in %d, out %d", i_line, (int)i_in, (int)i_out );
}
error:
-
/* We failed to read any data, probably EOF */
free( p_line );
- if( s->conv != (vlc_iconv_t)(-1) ) vlc_iconv_close( s->conv );
+
+ /* */
+ if( s->p_text->conv != (vlc_iconv_t)(-1) )
+ vlc_iconv_close( s->p_text->conv );
+ s->p_text->conv = (vlc_iconv_t)(-1);
return NULL;
}
/****************************************************************************
* 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;
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 );
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 )
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 && p_access->p_libvlc->b_stats )
+ 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,
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;
va_list args;
int i_result;
- if ( s == NULL )
+ if( s == NULL )
return VLC_EGENERIC;
va_start( args, i_query );
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 )
+ 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 );
}
- if( p_bk ) block_Release( p_bk );
return NULL;
}
projects / vlc / blobdiff