#endif
#include <dirent.h>
+#include <assert.h>
#include <vlc_common.h>
#include <vlc_strings.h>
#include <vlc_osd.h>
#include <vlc_charset.h>
-#include <assert.h>
+#include <libvlc.h>
+
+#include "access.h"
+#include "stream.h"
#include "input_internal.h"
-#undef STREAM_DEBUG
+// #define STREAM_DEBUG 1
/* TODO:
* - tune the 2 methods (block/stream)
* - compute cost for seek
* - improve stream mode seeking with closest segments
* - ...
- * - Maybe remove (block/stream) in favour of immediate
*/
/* Two methods:
# 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_read_method_t
+typedef enum
{
- STREAM_METHOD_IMMEDIATE,
STREAM_METHOD_BLOCK,
STREAM_METHOD_STREAM
} stream_read_method_t;
} stream;
- /* Method 3: for pf_read */
- struct
- {
- int64_t i_end;
- uint8_t *p_buffer;
- } immediate;
-
/* Peek temporary buffer */
unsigned int i_peek;
uint8_t *p_peek;
access_entry_t **list;
int i_list_index;
access_t *p_list_access;
-
- /* 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 void AStreamPrebufferStream( stream_t *s );
static int AReadStream( stream_t *s, void *p_read, unsigned int i_read );
-/* Method 3 */
-static int AStreamReadImmediate( stream_t *s, void *p_read, unsigned int i_read );
-static int AStreamPeekImmediate( stream_t *s, const uint8_t **pp_peek, unsigned int i_read );
-static int AStreamSeekImmediate( stream_t *s, int64_t i_pos );
-
/* 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 );
/****************************************************************************
- * Method 3 helpers:
+ * stream_CommonNew: create an empty stream structure
****************************************************************************/
-
-static inline int64_t stream_buffered_size( stream_t *s )
+stream_t *stream_CommonNew( vlc_object_t *p_obj )
{
- return s->p_sys->immediate.i_end;
-}
+ stream_t *s = (stream_t *)vlc_custom_create( p_obj, sizeof(*s),
+ VLC_OBJECT_GENERIC, "stream" );
-static inline void stream_buffer_empty( stream_t *s, int length )
-{
- length = __MAX( stream_buffered_size( s ), length );
- if( length )
+ if( !s )
+ return NULL;
+
+ s->p_text = malloc( sizeof(*s->p_text) );
+ if( !s->p_text )
{
- memmove( s->p_sys->immediate.p_buffer,
- s->p_sys->immediate.p_buffer + length,
- stream_buffered_size( s ) - length );
+ vlc_object_release( s );
+ return NULL;
}
- s->p_sys->immediate.i_end -= length;
-}
-static inline void stream_buffer_fill( stream_t *s, int length )
-{
- s->p_sys->immediate.i_end += length;
-}
+ /* 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;
-static inline uint8_t * stream_buffer( stream_t *s )
+ return s;
+}
+void stream_CommonDelete( stream_t *s )
{
- return s->p_sys->immediate.p_buffer;
+ if( s->p_text )
+ {
+ if( s->p_text->conv != (vlc_iconv_t)(-1) )
+ vlc_iconv_close( s->p_text->conv );
+ free( s->p_text );
+ }
+ free( s->psz_path );
+ vlc_object_release( s );
}
/****************************************************************************
return NULL;
}
- if( !( p_res = stream_AccessNew( p_access, true ) ) )
+ if( !( p_res = stream_AccessNew( p_access, NULL ) ) )
{
access_Delete( p_access );
return NULL;
return p_res;
}
-stream_t *stream_AccessNew( access_t *p_access, bool b_quick )
+stream_t *stream_AccessNew( access_t *p_access, char **ppsz_list )
{
- stream_t *s = 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->psz_path = strdup( p_access->psz_path );
+ s->p_sys = p_sys = malloc( sizeof( *p_sys ) );
+ if( !s->psz_path || !s->p_sys )
+ {
+ stream_CommonDelete( s );
+ return NULL;
+ }
/* 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 )
- 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;
if( p_access->pf_block )
p_sys->method = STREAM_METHOD_BLOCK;
- else if( var_CreateGetBool( s, "use-stream-immediate" ) )
- p_sys->method = STREAM_METHOD_IMMEDIATE;
else
p_sys->method = STREAM_METHOD_STREAM;
- p_sys->record.b_active = false;
-
p_sys->i_pos = p_access->info.i_pos;
/* Stats */
p_sys->stat.i_seek_count = 0;
p_sys->stat.i_seek_time = 0;
- p_sys->i_list = 0;
- p_sys->list = 0;
+ TAB_INIT( p_sys->i_list, p_sys->list );
p_sys->i_list_index = 0;
- p_sys->p_list_access = 0;
-
- p_sys->b_quick = b_quick;
+ p_sys->p_list_access = NULL;
/* Get the additional list of inputs if any (for concatenation) */
- if( (psz_list = var_CreateGetString( s, "input-list" )) && *psz_list )
+ if( ppsz_list && ppsz_list[0] )
{
- access_entry_t *p_entry = malloc( sizeof(access_entry_t) );
- if( p_entry == NULL )
+ access_entry_t *p_entry = malloc( sizeof(*p_entry) );
+ if( !p_entry )
goto error;
- char *psz_name, *psz_parser = psz_name = psz_list;
- p_sys->p_list_access = p_access;
p_entry->i_size = p_access->info.i_size;
p_entry->psz_path = strdup( p_access->psz_path );
- if( p_entry->psz_path == NULL )
+ if( !p_entry->psz_path )
{
free( p_entry );
goto error;
}
+ p_sys->p_list_access = p_access;
TAB_APPEND( p_sys->i_list, p_sys->list, p_entry );
msg_Dbg( p_access, "adding file `%s', (%"PRId64" bytes)",
p_entry->psz_path, p_access->info.i_size );
- while( psz_name && *psz_name )
+ for( int i = 0; ppsz_list[i] != NULL; i++ )
{
- psz_parser = strchr( psz_name, ',' );
- if( psz_parser ) *psz_parser = 0;
+ char *psz_name = strdup( ppsz_list[i] );
- psz_name = strdup( psz_name );
- if( psz_name )
- {
- access_t *p_tmp = access_New( p_access, p_access->psz_access,
- "", psz_name );
+ if( !psz_name )
+ break;
- if( !p_tmp )
- {
- psz_name = psz_parser;
- if( psz_name ) psz_name++;
- continue;
- }
+ access_t *p_tmp = access_New( p_access,
+ p_access->psz_access, "", psz_name );
+ if( !p_tmp )
+ continue;
- msg_Dbg( p_access, "adding file `%s', (%"PRId64" bytes)",
- psz_name, p_tmp->info.i_size );
+ msg_Dbg( p_access, "adding file `%s', (%"PRId64" bytes)",
+ psz_name, p_tmp->info.i_size );
- p_entry = malloc( sizeof(access_entry_t) );
- if( p_entry == NULL )
- goto error;
+ p_entry = malloc( sizeof(*p_entry) );
+ if( p_entry )
+ {
p_entry->i_size = p_tmp->info.i_size;
p_entry->psz_path = psz_name;
TAB_APPEND( p_sys->i_list, p_sys->list, p_entry );
-
- access_Delete( p_tmp );
}
-
- psz_name = psz_parser;
- if( psz_name ) psz_name++;
+ access_Delete( p_tmp );
}
}
- FREENULL( psz_list );
/* Peek */
p_sys->i_peek = 0;
goto error;
}
}
- else if( p_sys->method == STREAM_METHOD_IMMEDIATE )
- {
- msg_Dbg( s, "Using AStream*Immediate" );
-
- s->pf_read = AStreamReadImmediate;
- s->pf_peek = AStreamPeekImmediate;
-
- /* Allocate/Setup our tracks (useful to peek)*/
- p_sys->immediate.i_end = 0;
- p_sys->immediate.p_buffer = malloc( STREAM_CACHE_SIZE );
-
- msg_Dbg( s, "p_buffer %p-%p",
- p_sys->immediate.p_buffer,
- &p_sys->immediate.p_buffer[STREAM_CACHE_SIZE] );
-
- if( p_sys->immediate.p_buffer == NULL )
- {
- msg_Err( s, "Out of memory when allocating stream cache (%d bytes)",
- STREAM_CACHE_SIZE );
- goto error;
- }
- }
else
{
int i;
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 );
- if( p_sys->stream.i_read_size <= 0 )
- p_sys->stream.i_read_size = STREAM_READ_ATONCE;
- else if( p_sys->stream.i_read_size <= 256 )
- p_sys->stream.i_read_size = 256;
+ p_sys->stream.i_read_size = STREAM_READ_ATONCE;
+#if STREAM_READ_ATONCE < 256
+# error "Invalid STREAM_READ_ATONCE value"
+#endif
for( i = 0; i < STREAM_CACHE_TRACK; i++ )
{
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_release( s );
+ stream_CommonDelete( s );
return NULL;
}
vlc_object_detach( s );
- 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 if( p_sys->method == STREAM_METHOD_IMMEDIATE )
- free( p_sys->immediate.p_buffer );
else
free( p_sys->stream.p_buffer );
free( p_sys->list );
free( p_sys );
- vlc_object_release( s );
+ stream_CommonDelete( s );
}
static void UStreamDestroy( stream_t *s )
}
/****************************************************************************
- * stream_AccessReset:
+ * AStreamControlReset:
****************************************************************************/
-void stream_AccessReset( stream_t *s )
+static void AStreamControlReset( stream_t *s )
{
stream_sys_t *p_sys = s->p_sys;
/* Do the prebuffering */
AStreamPrebufferBlock( s );
}
- else if( p_sys->method == STREAM_METHOD_IMMEDIATE )
- {
- stream_buffer_empty( s, stream_buffered_size( s ) );
- }
else
{
int i;
}
/****************************************************************************
- * stream_AccessUpdate:
+ * AStreamControlUpdate:
****************************************************************************/
-void stream_AccessUpdate( stream_t *s )
+static void AStreamControlUpdate( stream_t *s )
{
stream_sys_t *p_sys = s->p_sys;
stream_sys_t *p_sys = s->p_sys;
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;
+ bool *p_bool;
+ int64_t *pi_64, i_64;
+ int i_int;
switch( i_query )
{
{
case STREAM_METHOD_BLOCK:
return AStreamSeekBlock( s, i_64 );
- case STREAM_METHOD_IMMEDIATE:
- return AStreamSeekImmediate( s, i_64 );
case STREAM_METHOD_STREAM:
return AStreamSeekStream( s, i_64 );
default:
return VLC_EGENERIC;
}
- case STREAM_GET_MTU:
- return VLC_EGENERIC;
-
case STREAM_CONTROL_ACCESS:
+ {
i_int = (int) va_arg( args, int );
if( i_int != ACCESS_SET_PRIVATE_ID_STATE &&
i_int != ACCESS_SET_PRIVATE_ID_CA &&
- i_int != ACCESS_GET_PRIVATE_ID_STATE )
+ i_int != ACCESS_GET_PRIVATE_ID_STATE &&
+ i_int != ACCESS_SET_TITLE &&
+ i_int != ACCESS_SET_SEEKPOINT )
{
msg_Err( s, "Hey, what are you thinking ?"
"DON'T USE STREAM_CONTROL_ACCESS !!!" );
return VLC_EGENERIC;
}
- return access_vaControl( p_access, i_int, args );
+ int i_ret = access_vaControl( p_access, i_int, args );
+ if( i_int == ACCESS_SET_TITLE || i_int == ACCESS_SET_SEEKPOINT )
+ AStreamControlReset( s );
+ return i_ret;
+ }
+
+ case STREAM_UPDATE_SIZE:
+ AStreamControlUpdate( s );
+ return VLC_SUCCESS;
case STREAM_GET_CONTENT_TYPE:
return access_Control( p_access, ACCESS_GET_CONTENT_TYPE,
va_arg( args, char ** ) );
case STREAM_SET_RECORD_STATE:
- 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_EGENERIC;
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();
+ 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;
/* 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;
stream_sys_t *p_sys = s->p_sys;
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_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 */
}
}
- 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;
}
}
while( p_sys->block.i_start + p_sys->block.i_size < i_pos );
- p_sys->block.i_offset = i_pos - p_sys->i_pos;
+ p_sys->block.i_offset += i_pos - p_sys->i_pos;
p_sys->i_pos = i_pos;
return VLC_SUCCESS;
static int AStreamRefillBlock( stream_t *s )
{
stream_sys_t *p_sys = s->p_sys;
- int64_t i_start, i_stop;
block_t *b;
/* Release data */
}
/* Now read a new block */
- i_start = mdate();
+ const int64_t i_start = mdate();
for( ;; )
{
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;
}
+ p_sys->stat.i_read_time += mdate() - i_start;
while( b )
{
- i_stop = mdate();
-
/* Append the block */
p_sys->block.i_size += b->i_buffer;
*p_sys->block.pp_last = b;
/* 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;
}
stream_track_t *tk = &p_sys->stream.tk[p_sys->stream.i_tk];
uint8_t *p_data = (uint8_t *)p_read;
- uint8_t *p_record = p_data;
unsigned int i_data = 0;
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_data == NULL )
{
/* seek within this stream if possible, else use plain old read and discard */
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;
}
/* 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;
static void AStreamPrebufferStream( stream_t *s )
{
stream_sys_t *p_sys = s->p_sys;
- access_t *p_access = p_sys->p_access;
int64_t i_first = 0;
int64_t i_start;
- 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;
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;
}
}
-/****************************************************************************
- * Method 3:
- ****************************************************************************/
-
-static int AStreamReadImmediate( 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;
- uint8_t *p_record = p_data;
- unsigned int i_data;
-
-#ifdef STREAM_DEBUG
- msg_Dbg( s, "AStreamReadImmediate p_read=%p i_read=%d",
- p_read, i_read );
-#endif
-
- if( p_sys->record.b_active && !p_data )
- p_record = p_data = malloc( i_read );
-
- /* First, check if we already have some data in the buffer,
- * that we could copy directly */
- i_data = __MIN( stream_buffered_size( s ), i_read );
- if( i_data > 0 )
- {
-#ifdef STREAM_DEBUG
- msg_Dbg( s, "AStreamReadImmediate: copy %u from %p", i_data, stream_buffer( s ) );
-#endif
-
- assert( i_data <= STREAM_CACHE_SIZE );
-
- if( p_data )
- {
- memcpy( p_data, stream_buffer( s ), i_data );
- p_data += i_data;
- }
- }
-
- /* Now that we've read our buffer we don't need its i_copy bytes */
- stream_buffer_empty( s, i_data );
-
- /* Now check if we have still to really read some data */
- while( i_data < i_read )
- {
- const unsigned int i_to_read = i_read - i_data;
- int i_result;
-
- if( p_data )
- {
- i_result = AReadStream( s, p_data, i_to_read );
- }
- else
- {
- void *p_dummy = malloc( i_to_read );
-
- if( !p_dummy )
- break;
-
- i_result = AReadStream( s, p_dummy, i_to_read );
-
- free( p_dummy );
- }
- if( i_result <= 0 )
- break;
-
- p_sys->i_pos += i_data;
- if( p_data )
- p_data += i_result;
- i_data += i_result;
- }
-
- 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 AStreamPeekImmediate( stream_t *s, const uint8_t **pp_peek, unsigned int i_read )
-{
-#ifdef STREAM_DEBUG
- msg_Dbg( s, "AStreamPeekImmediate: %d size=%"PRId64,
- i_read, size_buffered_size( s ) );
-#endif
-
- /* Avoid problem, but that shouldn't happen
- * FIXME yes it can */
- if( i_read > STREAM_CACHE_SIZE / 2 )
- i_read = STREAM_CACHE_SIZE / 2;
-
- int i_to_read = i_read - stream_buffered_size( s );
- if( i_to_read > 0 )
- {
-#ifdef STREAM_DEBUG
- msg_Dbg( s, "AStreamPeekImmediate: Reading %d",
- i_to_read );
-#endif
- i_to_read = AReadStream( s, stream_buffer( s ) + stream_buffered_size( s ),
- i_to_read );
-
- if( i_to_read > 0 )
- stream_buffer_fill( s, i_to_read );
- }
-
- *pp_peek = stream_buffer( s );
-
- return __MIN( stream_buffered_size( s ), i_read );
-}
-
-static int AStreamSeekImmediate( stream_t *s, int64_t i_pos )
-{
- stream_sys_t *p_sys = s->p_sys;
- access_t *p_access = p_sys->p_access;
- bool b_aseek;
-
-#ifdef STREAM_DEBUG
- msg_Dbg( s, "AStreamSeekImmediate to %"PRId64" pos=%"PRId64
- i_pos, p_sys->i_pos );
-#endif
-
- access_Control( p_access, ACCESS_CAN_SEEK, &b_aseek );
- if( !b_aseek )
- {
- /* We can't do nothing */
- msg_Dbg( s, "AStreamSeekImmediate: can't seek" );
- return VLC_EGENERIC;
- }
-
- /* Just reset our buffer */
- stream_buffer_empty( s, stream_buffered_size( s ) );
-
- if( ASeek( s, i_pos ) )
- return VLC_EGENERIC;
-
- return VLC_SUCCESS;
-}
-
/****************************************************************************
* stream_ReadLine:
****************************************************************************/
else if( !memcmp( p_data, "\xFF\xFE", 2 ) )
{
psz_encoding = "UTF-16LE";
- s->b_little_endian = true;
- s->i_char_width = 2;
+ s->p_text->b_little_endian = true;
+ s->p_text->i_char_width = 2;
i_bom_size = 2;
}
else if( !memcmp( p_data, "\xFE\xFF", 2 ) )
{
psz_encoding = "UTF-16BE";
- s->i_char_width = 2;
+ 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 );
}
}
- 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 ) )
}
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 )
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 )
goto error;
i_data = stream_Read( s, &p_line[i_line], STREAM_PROBE_LINE );
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;
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;
}
int i_total = 0;
if( s->p_parent && s->p_parent->p_parent &&
- s->p_parent->p_parent->i_object_type == VLC_OBJECT_INPUT )
+ vlc_internals( s->p_parent->p_parent )->i_object_type == VLC_OBJECT_INPUT )
p_input = (input_thread_t *)s->p_parent->p_parent;
if( !p_sys->i_list )
int i_total = 0;
if( s->p_parent && s->p_parent->p_parent &&
- s->p_parent->p_parent->i_object_type == VLC_OBJECT_INPUT )
+ vlc_internals( s->p_parent->p_parent )->i_object_type == VLC_OBJECT_INPUT )
p_input = (input_thread_t *)s->p_parent->p_parent;
if( !p_sys->i_list )
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;
projects / vlc / blobdiff