/*****************************************************************************
* stream_demux.c
*****************************************************************************
- * Copyright (C) 1999-2008 the VideoLAN team
+ * Copyright (C) 1999-2008 VLC authors and VideoLAN
* $Id$
*
* Author: Laurent Aimar <fenrir _AT_ videolan _DOT_ org>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#ifdef HAVE_CONFIG_H
#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)
/* Demuxer */
char *psz_name;
es_out_t *out;
- demux_t *p_demux;
+ atomic_bool active;
+ vlc_thread_t thread;
+ vlc_mutex_t lock;
+ struct
+ {
+ double position;
+ int64_t length;
+ int64_t time;
+ } stats;
};
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 int DStreamControl( stream_t *, int i_query, va_list );
static void DStreamDelete ( stream_t * );
-static void* DStreamThread ( vlc_object_t * );
+static void* DStreamThread ( void * );
stream_t *stream_DemuxNew( demux_t *p_demux, const char *psz_demux, es_out_t *out )
p_sys->i_pos = 0;
p_sys->out = out;
- p_sys->p_demux = NULL;
p_sys->p_block = NULL;
p_sys->psz_name = strdup( psz_demux );
+ p_sys->stats.position = 0.;
+ p_sys->stats.length = 0;
+ p_sys->stats.time = 0;
/* decoder fifo */
if( ( p_sys->p_fifo = block_FifoNew() ) == NULL )
return NULL;
}
- vlc_object_attach( s, p_obj );
+ atomic_init( &p_sys->active, true );
+ vlc_mutex_init( &p_sys->lock );
- if( vlc_thread_create( s, "stream out", DStreamThread,
- VLC_THREAD_PRIORITY_INPUT ) )
+ if( vlc_clone( &p_sys->thread, DStreamThread, s, VLC_THREAD_PRIORITY_INPUT ) )
{
+ vlc_mutex_destroy( &p_sys->lock );
+ block_FifoRelease( p_sys->p_fifo );
stream_CommonDelete( s );
free( p_sys->psz_name );
free( p_sys );
block_FifoPut( p_sys->p_fifo, p_block );
}
+int stream_DemuxControlVa( stream_t *s, int query, va_list args )
+{
+ stream_sys_t *sys = s->p_sys;
+
+ switch( query )
+ {
+ case DEMUX_GET_POSITION:
+ vlc_mutex_lock( &sys->lock );
+ *va_arg( args, double * ) = sys->stats.position;
+ vlc_mutex_unlock( &sys->lock );
+ break;
+ case DEMUX_GET_LENGTH:
+ vlc_mutex_lock( &sys->lock );
+ *va_arg( args, int64_t * ) = sys->stats.length;
+ vlc_mutex_unlock( &sys->lock );
+ break;
+ case DEMUX_GET_TIME:
+ vlc_mutex_lock( &sys->lock );
+ *va_arg( args, int64_t * ) = sys->stats.time;
+ vlc_mutex_unlock( &sys->lock );
+ break;
+ default:
+ return VLC_EGENERIC;
+ }
+ return VLC_SUCCESS;
+}
+
static void DStreamDelete( stream_t *s )
{
stream_sys_t *p_sys = s->p_sys;
block_t *p_empty;
- vlc_object_kill( s );
-#warning FIXME: not thread-safe:
- if( p_sys->p_demux )
- vlc_object_kill( p_sys->p_demux );
- p_empty = block_New( s, 1 ); p_empty->i_buffer = 0;
+ atomic_store( &p_sys->active, false );
+ p_empty = block_Alloc( 0 );
block_FifoPut( p_sys->p_fifo, p_empty );
- vlc_thread_join( s );
+ vlc_join( p_sys->thread, NULL );
+ vlc_mutex_destroy( &p_sys->lock );
- if( p_sys->p_demux )
- demux_Delete( p_sys->p_demux );
if( p_sys->p_block )
block_Release( p_sys->p_block );
//msg_Dbg( s, "DStreamRead: wanted %d bytes", i_read );
- while( !s->b_die && !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( !s->b_die && !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:
}
}
-static void* DStreamThread( vlc_object_t* p_this )
+static void* DStreamThread( void *obj )
{
- stream_t *s = (stream_t *)p_this;
+ stream_t *s = (stream_t *)obj;
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, s->p_input, "", p_sys->psz_name, "", s, p_sys->out,
- false )) )
- {
+ p_demux = demux_New( s, s->p_input, "", p_sys->psz_name, "", s, p_sys->out,
+ false );
+ if( p_demux == NULL )
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 */
- while( !s->b_die && !p_demux->b_die )
+ mtime_t next_update = 0;
+ while( atomic_load( &p_sys->active ) )
{
- if( demux_Demux( p_demux ) <= 0 ) break;
+ if( p_demux->info.i_update || mdate() >= next_update )
+ {
+ double newpos;
+ int64_t newlen, newtime;
+
+ if( demux_Control( p_demux, DEMUX_GET_POSITION, &newpos ) )
+ newpos = 0.;
+ if( demux_Control( p_demux, DEMUX_GET_LENGTH, &newlen ) )
+ newlen = 0;
+ if( demux_Control( p_demux, DEMUX_GET_TIME, &newtime ) )
+ newtime = 0;
+
+ vlc_mutex_lock( &p_sys->lock );
+ p_sys->stats.position = newpos;
+ p_sys->stats.length = newlen;
+ p_sys->stats.time = newtime;
+ vlc_mutex_unlock( &p_sys->lock );
+
+ p_demux->info.i_update = 0;
+ next_update = mdate() + (CLOCK_FREQ / 4);
+ }
+
+ if( demux_Demux( p_demux ) <= 0 )
+ break;
}
- vlc_restorecancel( canc );
- vlc_object_kill( p_demux );
+ /* Explicit kludge: the stream is destroyed by the owner of the
+ * streamDemux, not here. */
+ p_demux->s = NULL;
+ demux_Delete( p_demux );
+
return NULL;
}
projects / vlc / blobdiff