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;
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 = p_sys = malloc( sizeof( *p_sys) );
- if( s->p_sys == NULL )
+ if( !s->psz_path || !s->p_sys )
{
stream_CommonDelete( s );
return NULL;
return NULL;
}
+ vlc_object_attach( s, p_obj );
+
if( vlc_thread_create( s, "stream out", DStreamThread,
VLC_THREAD_PRIORITY_INPUT ) )
{
+ vlc_object_detach( s );
stream_CommonDelete( s );
free( p_sys->psz_name );
free( p_sys );
block_FifoRelease( p_sys->p_fifo );
free( p_sys->psz_name );
free( p_sys );
-
+ vlc_object_detach( s );
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;
stream_sys_t *p_sys = s->p_sys;
int64_t *p_i64;
bool *p_b;
- int *p_int;
switch( i_query )
{
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:
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 */