#include "demux.h"
#include <libvlc.h>
#include <vlc_codec.h>
+#include <vlc_atomic.h>
/****************************************************************************
* stream_Demux*: create a demuxer for an outpout stream (allow demuxer chain)
char *psz_name;
es_out_t *out;
+ atomic_bool active;
vlc_thread_t thread;
vlc_mutex_t lock;
struct
return NULL;
}
+ atomic_init( &p_sys->active, true );
vlc_mutex_init( &p_sys->lock );
if( vlc_clone( &p_sys->thread, DStreamThread, s, VLC_THREAD_PRIORITY_INPUT ) )
stream_sys_t *p_sys = s->p_sys;
block_t *p_empty;
- vlc_object_kill( s );
+ atomic_store( &p_sys->active, false );
p_empty = block_Alloc( 0 );
block_FifoPut( p_sys->p_fifo, p_empty );
vlc_join( p_sys->thread, NULL );
//msg_Dbg( s, "DStreamRead: wanted %d bytes", i_read );
- while( vlc_object_alive( s ) && !s->b_error && i_read )
+ while( atomic_load( &p_sys->active ) && !s->b_error && i_read )
{
block_t *p_block = p_sys->p_block;
int i_copy;
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;
+ if ( p_out ) p_out += i_copy;
i_out += i_copy;
p_block->i_buffer -= i_copy;
p_block->p_buffer += i_copy;
//msg_Dbg( s, "DStreamPeek: wanted %d bytes", i_peek );
- while( vlc_object_alive( s ) && !s->b_error && i_peek )
+ while( atomic_load( &p_sys->active ) && !s->b_error && i_peek )
{
int i_copy;
{
stream_sys_t *p_sys = s->p_sys;
uint64_t *p_i64;
- bool *p_b;
switch( i_query )
{
return VLC_SUCCESS;
case STREAM_CAN_SEEK:
- p_b = (bool*) va_arg( args, bool * );
- *p_b = false;
- return VLC_SUCCESS;
-
case STREAM_CAN_FASTSEEK:
- p_b = (bool*) va_arg( args, bool * );
- *p_b = false;
+ case STREAM_CAN_PAUSE:
+ case STREAM_CAN_CONTROL_PACE:
+ *va_arg( args, bool * ) = false;
return VLC_SUCCESS;
case STREAM_GET_POSITION:
return VLC_SUCCESS;
}
- case STREAM_CONTROL_ACCESS:
+ case STREAM_GET_PTS_DELAY:
+ *va_arg( args, int64_t * ) = DEFAULT_PTS_DELAY;
+ return VLC_SUCCESS;
+
+ case STREAM_GET_TITLE_INFO:
+ case STREAM_GET_TITLE:
+ case STREAM_GET_SEEKPOINT:
+ case STREAM_GET_META:
case STREAM_GET_CONTENT_TYPE:
+ case STREAM_GET_SIGNAL:
+ case STREAM_SET_PAUSE_STATE:
+ case STREAM_SET_TITLE:
+ case STREAM_SET_SEEKPOINT:
case STREAM_SET_RECORD_STATE:
+ case STREAM_SET_PRIVATE_ID_STATE:
+ case STREAM_SET_PRIVATE_ID_CA:
+ case STREAM_GET_PRIVATE_ID_STATE:
return VLC_EGENERIC;
default:
/* Main loop */
mtime_t next_update = 0;
- while( vlc_object_alive( s ) )
+ while( atomic_load( &p_sys->active ) )
{
if( p_demux->info.i_update || mdate() >= next_update )
{
break;
}
+ /* Explicit kludge: the stream is destroyed by the owner of the
+ * streamDemux, not here. */
+ p_demux->s = NULL;
demux_Delete( p_demux );
return NULL;