#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
+#include <limits.h>
#include "demux.h"
#include <libvlc.h>
block_fifo_t *p_fifo;
block_t *p_block;
- int64_t i_pos;
+ uint64_t i_pos;
/* Demuxer */
char *psz_name;
return NULL;
}
+ vlc_object_attach( s, p_obj );
+
if( vlc_thread_create( s, "stream out", DStreamThread,
VLC_THREAD_PRIORITY_INPUT ) )
{
block_FifoRelease( p_sys->p_fifo );
free( p_sys->psz_name );
free( p_sys );
-
stream_CommonDelete( s );
}
i_copy = __MIN( i_read, p_block->i_buffer );
if( p_out && i_copy ) memcpy( p_out, p_block->p_buffer, i_copy );
i_read -= i_copy;
+ p_out += i_copy;
i_out += i_copy;
p_block->i_buffer -= i_copy;
p_block->p_buffer += i_copy;
static int DStreamControl( stream_t *s, int i_query, va_list args )
{
stream_sys_t *p_sys = s->p_sys;
- int64_t *p_i64;
+ uint64_t *p_i64;
bool *p_b;
switch( i_query )
{
case STREAM_GET_SIZE:
- p_i64 = (int64_t*) va_arg( args, int64_t * );
+ p_i64 = va_arg( args, uint64_t * );
*p_i64 = 0;
return VLC_SUCCESS;
return VLC_SUCCESS;
case STREAM_GET_POSITION:
- p_i64 = (int64_t*) va_arg( args, int64_t * );
+ p_i64 = va_arg( args, uint64_t * );
*p_i64 = p_sys->i_pos;
return VLC_SUCCESS;
case STREAM_SET_POSITION:
{
- int64_t i64 = (int64_t)va_arg( args, int64_t );
- int i_skip;
- if( i64 < p_sys->i_pos ) return VLC_EGENERIC;
- i_skip = i64 - p_sys->i_pos;
+ uint64_t i64 = va_arg( args, uint64_t );
+ if( i64 < p_sys->i_pos )
+ return VLC_EGENERIC;
+ uint64_t i_skip = i64 - p_sys->i_pos;
while( i_skip > 0 )
{
- int i_read = DStreamRead( s, NULL, (long)i_skip );
- if( i_read <= 0 ) return VLC_EGENERIC;
+ int i_read = DStreamRead( s, NULL, __MIN(i_skip, INT_MAX) );
+ if( i_read <= 0 )
+ return VLC_EGENERIC;
i_skip -= i_read;
}
return VLC_SUCCESS;