# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
#include "input_internal.h"
{
access_t *p_access;
- vlc_bool_t b_block; /* Block method (1) or stream */
+ bool b_block; /* Block method (1) or stream */
int64_t i_pos; /* Current reading offset */
/* Stat for both method */
struct
{
- vlc_bool_t b_fastseek; /* From access */
+ bool b_fastseek; /* From access */
/* Stat about reading data */
int64_t i_read_count;
access_t *p_list_access;
/* Preparse mode ? */
- vlc_bool_t b_quick;
+ bool b_quick;
};
/* Method 1: */
static int AStreamPeekBlock( stream_t *s, const uint8_t **p_peek, int i_read );
static int AStreamSeekBlock( stream_t *s, int64_t i_pos );
static void AStreamPrebufferBlock( stream_t *s );
-static block_t *AReadBlock( stream_t *s, vlc_bool_t *pb_eof );
+static block_t *AReadBlock( stream_t *s, bool *pb_eof );
/* Method 2 */
static int AStreamReadStream( stream_t *s, void *p_read, int i_read );
MRLSplit( psz_dup, &psz_access, &psz_demux, &psz_path );
/* Now try a real access */
- p_access = access2_New( p_parent, psz_access, psz_demux, psz_path, 0 );
+ p_access = access_New( p_parent, psz_access, psz_demux, psz_path );
if( p_access == NULL )
{
return NULL;
}
- if( !( p_res = stream_AccessNew( p_access, VLC_TRUE ) ) )
+ if( !( p_res = stream_AccessNew( p_access, true ) ) )
{
- access2_Delete( p_access );
+ access_Delete( p_access );
return NULL;
}
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_stream_create( VLC_OBJECT(p_access) );
stream_sys_t *p_sys;
/* UTF16 and UTF32 text file conversion */
s->i_char_width = 1;
- s->b_little_endian = VLC_FALSE;
+ s->b_little_endian = false;
s->conv = (vlc_iconv_t)(-1);
/* Common field */
p_sys->p_access = p_access;
- p_sys->b_block = p_access->pf_block ? VLC_TRUE : VLC_FALSE;
+ p_sys->b_block = p_access->pf_block ? true : false;
p_sys->i_pos = p_access->info.i_pos;
/* Stats */
- access2_Control( p_access, ACCESS_CAN_FASTSEEK, &p_sys->stat.b_fastseek );
+ access_Control( p_access, ACCESS_CAN_FASTSEEK, &p_sys->stat.b_fastseek );
p_sys->stat.i_bytes = 0;
p_sys->stat.i_read_time = 0;
p_sys->stat.i_read_count = 0;
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,
- "", 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) );
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;
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;
if( p_sys->b_block ) block_ChainRelease( p_sys->block.p_first );
else free( p_sys->stream.p_buffer );
- if( p_sys->p_peek ) free( p_sys->p_peek );
+ free( p_sys->p_peek );
if( p_sys->p_list_access && p_sys->p_list_access != p_sys->p_access )
- access2_Delete( p_sys->p_list_access );
+ access_Delete( p_sys->p_list_access );
while( p_sys->i_list-- )
{
free( p_sys->list[p_sys->i_list]->psz_path );
free( p_sys->list[p_sys->i_list] );
- if( !p_sys->i_list ) free( p_sys->list );
}
- free( s->p_sys );
+ free( p_sys->list );
+ free( p_sys );
+
vlc_object_release( s );
}
access_t *p_access = (access_t*)vlc_object_find( s, VLC_OBJECT_ACCESS, FIND_PARENT );
AStreamDestroy( s );
vlc_object_release( p_access );
- access2_Delete( p_access );
+ access_Delete( p_access );
}
/****************************************************************************
stream_sys_t *p_sys = s->p_sys;
access_t *p_access = p_sys->p_access;
- vlc_bool_t *p_bool;
+ bool *p_bool;
int64_t *pi_64, i_64;
int i_int;
break;
case STREAM_CAN_SEEK:
- p_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t * );
- access2_Control( p_access, ACCESS_CAN_SEEK, p_bool );
+ p_bool = (bool*)va_arg( args, bool * );
+ access_Control( p_access, ACCESS_CAN_SEEK, p_bool );
break;
case STREAM_CAN_FASTSEEK:
- p_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t * );
- access2_Control( p_access, ACCESS_CAN_FASTSEEK, p_bool );
+ p_bool = (bool*)va_arg( args, bool * );
+ access_Control( p_access, ACCESS_CAN_FASTSEEK, p_bool );
break;
case STREAM_GET_POSITION:
"DON'T USE STREAM_CONTROL_ACCESS !!!" );
return VLC_EGENERIC;
}
- return access2_vaControl( p_access, i_int, args );
+ return access_vaControl( p_access, i_int, args );
case STREAM_GET_CONTENT_TYPE:
- return access2_Control( p_access, ACCESS_GET_CONTENT_TYPE,
+ return access_Control( p_access, ACCESS_GET_CONTENT_TYPE,
va_arg( args, char ** ) );
default:
for( ;; )
{
int64_t i_date = mdate();
- vlc_bool_t b_eof;
+ bool b_eof;
block_t *b;
if( s->b_die || p_sys->block.i_size > STREAM_CACHE_PREBUFFER_SIZE ||
/* Update stat */
p_sys->stat.i_bytes = p_sys->block.i_size;
p_sys->stat.i_read_time = i_date - i_start;
- i_byterate = ( I64C(1000000) * p_sys->stat.i_bytes ) /
+ i_byterate = ( INT64_C(1000000) * p_sys->stat.i_bytes ) /
(p_sys->stat.i_read_time + 1);
- msg_Dbg( s, "prebuffering done "I64Fd" bytes in "I64Fd"s - "
- I64Fd" kbytes/s",
+ msg_Dbg( s, "prebuffering done %"PRId64" bytes in %"PRId64"s - "
+ "%"PRId64" kbytes/s",
p_sys->stat.i_bytes,
- p_sys->stat.i_read_time / I64C(1000000),
+ p_sys->stat.i_read_time / INT64_C(1000000),
i_byterate / 1024 );
break;
}
/* seek within this stream if possible, else use plain old read and discard */
stream_sys_t *p_sys = s->p_sys;
access_t *p_access = p_sys->p_access;
- vlc_bool_t b_aseek;
- access2_Control( p_access, ACCESS_CAN_SEEK, &b_aseek );
+ bool b_aseek;
+ access_Control( p_access, ACCESS_CAN_SEEK, &b_aseek );
if( b_aseek )
return AStreamSeekBlock( s, p_sys->i_pos + i_read ) ? 0 : i_read;
}
p_sys->block.i_offset = 0;
p_sys->block.p_current = p_sys->block.p_current->p_next;
}
- /*Get a new block */
- if( AStreamRefillBlock( s ) )
+ /*Get a new block if needed */
+ if( !p_sys->block.p_current && AStreamRefillBlock( s ) )
{
break;
}
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 )
{
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 );
}
}
else
{
/* Read enough data */
- while( p_sys->block.i_start + p_sys->block.i_size <= i_pos )
+ while( p_sys->block.i_start + p_sys->block.i_size < i_pos )
{
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 < i_pos )
{
p_sys->i_pos += p_sys->block.p_current->i_buffer;
p_sys->block.p_current = p_sys->block.p_current->p_next;
i_start = mdate();
for( ;; )
{
- vlc_bool_t b_eof;
+ bool b_eof;
if( s->b_die ) return VLC_EGENERIC;
/* 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;
+ }
}
#ifdef STREAM_DEBUG
- msg_Dbg( s, "AStreamReadStream: %d pos="I64Fd" tk=%d start="I64Fd
- " offset=%d end="I64Fd,
+ 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
if( tk->i_start >= tk->i_end ) return 0; /* EOF */
#ifdef STREAM_DEBUG
- msg_Dbg( s, "AStreamPeekStream: %d pos="I64Fd" tk=%d "
- "start="I64Fd" offset=%d end="I64Fd,
+ 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;
#ifdef STREAM_DEBUG
- msg_Dbg( s, "AStreamSeekStream: to "I64Fd" pos="I64Fd
- " tk=%d start="I64Fd" offset=%d end="I64Fd,
+ 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,
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 )
{
#ifdef STREAM_DEBUG
- msg_Dbg( s, "AStreamSeekStream: reusing %d start="I64Fd
- " end="I64Fd, i, tk->i_start, tk->i_end );
+ 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 */
}
}
- 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 */
if( !b_read ) return VLC_EGENERIC;
return VLC_SUCCESS;
}
- b_read = VLC_TRUE;
+ b_read = true;
/* Update end */
tk->i_end += i_read;
/* 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 "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;
}
{
psz_encoding = strdup( "UTF-32LE" );
s->i_char_width = 4;
- s->b_little_endian = VLC_TRUE;
+ s->b_little_endian = true;
i_bom_size = 4;
}
else
{
psz_encoding = strdup( "UTF-16LE" );
- s->b_little_endian = VLC_TRUE;
+ s->b_little_endian = true;
s->i_char_width = 2;
i_bom_size = 2;
}
if( s->i_char_width == 2 )
{
- if( s->b_little_endian == VLC_TRUE)
+ if( s->b_little_endian == true)
{
/* UTF-16LE: 0A 00 <LF> */
while( p <= p_last && ( p[0] != 0x0A || p[1] != 0x00 ) )
}
else if( s->i_char_width == 4 )
{
- if( s->b_little_endian == VLC_TRUE)
+ if( s->b_little_endian == true)
{
/* UTF-32LE: 0A 00 00 00 <LF> */
while( p <= p_last && ( p[0] != 0x0A || p[1] != 0x00 ||
msg_Err( s, "iconv failed" );
msg_Dbg( s, "original: %d, in %d, out %d", i_line, (int)i_in, (int)i_out );
}
- if( p_line ) free( p_line );
+ free( p_line );
p_line = psz_new_line;
i_line = (size_t)i_line - i_out; /* does not include \0 */
}
i_read = p_access->pf_read( p_access, p_read, i_read );
if( p_input )
{
- vlc_object_yield( 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 );
(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 );
- vlc_object_release( p_input );
}
return i_read;
}
msg_Dbg( s, "opening input `%s'", psz_name );
- p_list_access = access2_New( s, p_access->psz_access, "", 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;
/* Update read bytes in input */
if( p_input )
{
- vlc_object_yield( 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 );
- vlc_object_release( p_input );
}
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 &&
{
p_block = p_access->pf_block( p_access );
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_object_yield( 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 );
(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 );
- vlc_object_release( p_input );
}
return p_block;
}
msg_Dbg( s, "opening input `%s'", psz_name );
- p_list_access = access2_New( s, p_access->psz_access, "", 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;
{
if( p_input )
{
- vlc_object_yield( 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_UpdateInteger( s, p_input->p->counters.p_read_packets,
1 , NULL);
vlc_mutex_unlock( &p_input->p->counters.counters_lock );
- vlc_object_release( p_input );
}
}
return p_block;
if( i != p_sys->i_list_index && i != 0 )
{
p_list_access =
- access2_New( s, p_access->psz_access, "", 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;
}
projects / vlc / blobdiff