#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
+#include <limits.h>
#include "demux.h"
#include <libvlc.h>
/****************************************************************************
* stream_Demux*: create a demuxer for an outpout stream (allow demuxer chain)
****************************************************************************/
-typedef struct
+struct stream_sys_t
{
/* Data buffer */
block_fifo_t *p_fifo;
block_t *p_block;
- int64_t i_pos;
+ uint64_t i_pos;
/* Demuxer */
char *psz_name;
es_out_t *out;
demux_t *p_demux;
-} d_stream_sys_t;
+};
static int DStreamRead ( stream_t *, void *p_read, unsigned int i_read );
static int DStreamPeek ( stream_t *, const uint8_t **pp_peek, unsigned int i_peek );
static void* DStreamThread ( vlc_object_t * );
-stream_t *__stream_DemuxNew( vlc_object_t *p_obj, const char *psz_demux,
- es_out_t *out )
+stream_t *stream_DemuxNew( demux_t *p_demux, const char *psz_demux, es_out_t *out )
{
+ vlc_object_t *p_obj = VLC_OBJECT(p_demux);
/* We create a stream reader, and launch a thread */
- stream_t *s;
- d_stream_sys_t *p_sys;
+ stream_t *s;
+ stream_sys_t *p_sys;
s = stream_CommonNew( p_obj );
if( s == NULL )
return NULL;
+ s->p_input = p_demux->p_input;
+ s->psz_path = strdup(""); /* N/A */
s->pf_read = DStreamRead;
s->pf_peek = DStreamPeek;
s->pf_control= DStreamControl;
s->pf_destroy= DStreamDelete;
- s->p_sys = malloc( sizeof( d_stream_sys_t) );
- if( s->p_sys == NULL )
+ s->p_sys = p_sys = malloc( sizeof( *p_sys) );
+ if( !s->psz_path || !s->p_sys )
{
stream_CommonDelete( s );
return NULL;
}
- p_sys = (d_stream_sys_t*)s->p_sys;
p_sys->i_pos = 0;
p_sys->out = out;
return NULL;
}
+ vlc_object_attach( s, p_obj );
+
if( vlc_thread_create( s, "stream out", DStreamThread,
- VLC_THREAD_PRIORITY_INPUT, false ) )
+ VLC_THREAD_PRIORITY_INPUT ) )
{
stream_CommonDelete( s );
free( p_sys->psz_name );
void stream_DemuxSend( stream_t *s, block_t *p_block )
{
- d_stream_sys_t *p_sys = (d_stream_sys_t*)s->p_sys;
- if( p_block ) block_FifoPut( p_sys->p_fifo, p_block );
+ stream_sys_t *p_sys = s->p_sys;
+ if( p_block )
+ block_FifoPut( p_sys->p_fifo, p_block );
}
static void DStreamDelete( stream_t *s )
{
- d_stream_sys_t *p_sys = (d_stream_sys_t*)s->p_sys;
+ stream_sys_t *p_sys = s->p_sys;
block_t *p_empty;
vlc_object_kill( s );
block_FifoPut( p_sys->p_fifo, p_empty );
vlc_thread_join( s );
- if( p_sys->p_demux ) demux_Delete( p_sys->p_demux );
- if( p_sys->p_block ) block_Release( p_sys->p_block );
+ if( p_sys->p_demux )
+ demux_Delete( p_sys->p_demux );
+ if( p_sys->p_block )
+ block_Release( p_sys->p_block );
block_FifoRelease( p_sys->p_fifo );
free( p_sys->psz_name );
free( p_sys );
-
stream_CommonDelete( s );
}
static int DStreamRead( stream_t *s, void *p_read, unsigned int i_read )
{
- d_stream_sys_t *p_sys = (d_stream_sys_t*)s->p_sys;
+ stream_sys_t *p_sys = s->p_sys;
uint8_t *p_out = p_read;
int i_out = 0;
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 DStreamPeek( stream_t *s, const uint8_t **pp_peek, unsigned int i_peek )
{
- d_stream_sys_t *p_sys = (d_stream_sys_t*)s->p_sys;
+ stream_sys_t *p_sys = s->p_sys;
block_t **pp_block = &p_sys->p_block;
int i_out = 0;
*pp_peek = 0;
static int DStreamControl( stream_t *s, int i_query, va_list args )
{
- d_stream_sys_t *p_sys = (d_stream_sys_t*)s->p_sys;
- int64_t *p_i64;
+ stream_sys_t *p_sys = s->p_sys;
+ uint64_t *p_i64;
bool *p_b;
- int *p_int;
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;
}
- case STREAM_GET_MTU:
- p_int = (int*) va_arg( args, int * );
- *p_int = 0;
- return VLC_SUCCESS;
-
case STREAM_CONTROL_ACCESS:
case STREAM_GET_CONTENT_TYPE:
case STREAM_SET_RECORD_STATE:
static void* DStreamThread( vlc_object_t* p_this )
{
stream_t *s = (stream_t *)p_this;
- d_stream_sys_t *p_sys = (d_stream_sys_t*)s->p_sys;
+ stream_sys_t *p_sys = s->p_sys;
demux_t *p_demux;
int canc = vlc_savecancel();
/* Create the demuxer */
- if( !(p_demux = demux_New( s, "", p_sys->psz_name, "", s, p_sys->out,
+ if( !(p_demux = demux_New( s, s->p_input, "", p_sys->psz_name, "", s, p_sys->out,
false )) )
{
return NULL;
}
+ /* stream_Demux cannot apply DVB filters.
+ * Get all programs and let the E/S output sort them out. */
+ demux_Control( p_demux, DEMUX_SET_GROUP, -1, NULL );
p_sys->p_demux = p_demux;
/* Main loop */
projects / vlc / blobdiff