#include "demux.h"
#include "stream.h"
#include "item.h"
+#include "ressource.h"
#include <vlc_sout.h>
#include "../stream_output/stream_output.h"
static void *RunAndDestroy ( vlc_object_t *p_this );
static input_thread_t * Create ( vlc_object_t *, input_item_t *,
- const char *, bool, sout_instance_t * );
+ const char *, bool, input_ressource_t * );
static int Init ( input_thread_t *p_input );
-static void WaitDie ( input_thread_t *p_input );
static void End ( input_thread_t *p_input );
static void MainLoop( input_thread_t *p_input );
*****************************************************************************/
static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item,
const char *psz_header, bool b_quick,
- sout_instance_t *p_sout )
+ input_ressource_t *p_ressource )
{
static const char input_name[] = "input";
input_thread_t *p_input = NULL; /* thread descriptor */
/* Init Common fields */
p_input->b_eof = false;
- p_input->b_can_pace_control = true;
+ p_input->p->b_can_pace_control = true;
p_input->p->i_start = 0;
- p_input->i_time = 0;
+ p_input->p->i_time = 0;
p_input->p->i_stop = 0;
p_input->p->i_run = 0;
p_input->p->i_title = 0;
p_input->p->title = NULL;
p_input->p->i_title_offset = p_input->p->i_seekpoint_offset = 0;
- p_input->i_state = INIT_S;
+ p_input->p->i_state = INIT_S;
p_input->p->i_rate = INPUT_RATE_DEFAULT;
p_input->p->b_recording = false;
memset( &p_input->p->bookmark, 0, sizeof(p_input->p->bookmark) );
p_input->p->p_es_out = NULL;
p_input->p->p_sout = NULL;
p_input->p->b_out_pace_control = false;
- p_input->i_pts_delay = 0;
+ p_input->p->i_pts_delay = 0;
p_input->p->i_cr_average = 0;
vlc_gc_incref( p_item ); /* Released in Destructor() */
p_input->p->i_slave = 0;
p_input->p->slave = NULL;
+ /* */
+ if( p_ressource )
+ p_input->p->p_ressource = p_ressource;
+ else
+ p_input->p->p_ressource = input_ressource_New();
+ input_ressource_SetInput( p_input->p->p_ressource, p_input );
+
/* Init control buffer */
vlc_mutex_init( &p_input->p->lock_control );
vlc_cond_init( &p_input->p->wait_control );
p_input->i_flags |= OBJECT_FLAGS_QUIET | OBJECT_FLAGS_NOINTERACT;
/* */
- if( p_sout )
- p_input->p->p_sout = p_sout;
-
memset( &p_input->p->counters, 0, sizeof( p_input->p->counters ) );
vlc_mutex_init( &p_input->p->counters.counters_lock );
stats_TimerDump( p_input, STATS_TIMER_INPUT_LAUNCHING );
stats_TimerClean( p_input, STATS_TIMER_INPUT_LAUNCHING );
-#ifdef ENABLE_SOUT
- if( p_input->p->p_sout )
- sout_DeleteInstance( p_input->p->p_sout );
-#endif
+
+ if( p_input->p->p_ressource )
+ input_ressource_Delete( p_input->p->p_ressource );
+
vlc_gc_decref( p_input->p->p_item );
vlc_mutex_destroy( &p_input->p->counters.counters_lock );
/* */
input_thread_t *__input_CreateThreadExtended( vlc_object_t *p_parent,
input_item_t *p_item,
- const char *psz_log, sout_instance_t *p_sout )
+ const char *psz_log, input_ressource_t *p_ressource )
{
input_thread_t *p_input;
- p_input = Create( p_parent, p_item, psz_log, false, p_sout );
+ p_input = Create( p_parent, p_item, psz_log, false, p_ressource );
if( !p_input )
return NULL;
/* Create thread and wait for its readiness. */
if( vlc_thread_create( p_input, "input", Run,
- VLC_THREAD_PRIORITY_INPUT, false ) )
+ VLC_THREAD_PRIORITY_INPUT ) )
{
input_ChangeState( p_input, ERROR_S );
msg_Err( p_input, "cannot create input thread" );
else
{
if( vlc_thread_create( p_input, "input", RunAndDestroy,
- VLC_THREAD_PRIORITY_INPUT, false ) )
+ VLC_THREAD_PRIORITY_INPUT ) )
{
input_ChangeState( p_input, ERROR_S );
msg_Err( p_input, "cannot create input thread" );
input_ControlPush( p_input, INPUT_CONTROL_SET_DIE, NULL );
}
-sout_instance_t *input_DetachSout( input_thread_t *p_input )
+input_ressource_t *input_DetachRessource( input_thread_t *p_input )
{
assert( p_input->b_dead );
- sout_instance_t *p_sout = p_input->p->p_sout;
- vlc_object_detach( p_sout );
+
+ input_ressource_t *p_ressource = p_input->p->p_ressource;
+ input_ressource_SetInput( p_ressource, NULL );
+
+ p_input->p->p_ressource = NULL;
p_input->p->p_sout = NULL;
- return p_sout;
+
+ return p_ressource;
}
/**
vlc_list_t *p_list;
int i;
+ /* FIXME ObjectKillChildrens seems a very bad idea in fact */
if( p_obj->i_object_type == VLC_OBJECT_VOUT ||
p_obj->i_object_type == VLC_OBJECT_AOUT ||
- p_obj == VLC_OBJECT(p_input->p->p_sout) )
+ p_obj == VLC_OBJECT(p_input->p->p_sout) ||
+ p_obj->i_object_type == VLC_OBJECT_DECODER ||
+ p_obj->i_object_type == VLC_OBJECT_PACKETIZER )
return;
vlc_object_kill( p_obj );
const int canc = vlc_savecancel();
if( Init( p_input ) )
- {
- /* If we failed, wait before we are killed, and exit */
- WaitDie( p_input );
goto exit;
- }
MainLoop( p_input );
- /* Wait until we are asked to die */
- if( !p_input->b_die )
- WaitDie( p_input );
-
/* Clean up */
End( p_input );
exit:
- p_input->b_dead = true;
+ /* Tell we're dead */
+ input_SendEventDead( p_input );
vlc_restorecancel( canc );
return NULL;
}
*pb_changed = false;
- if( ( p_input->p->i_stop > 0 && p_input->i_time >= p_input->p->i_stop ) ||
+ if( ( p_input->p->i_stop > 0 && p_input->p->i_time >= p_input->p->i_stop ) ||
( p_input->p->i_run > 0 && *pi_start_mdate+p_input->p->i_run < mdate() ) )
i_ret = 0; /* EOF */
else
if( demux_Control( p_input->p->input.p_demux,
DEMUX_GET_TIME, &i_time ) )
i_time = 0;
+ p_input->p->i_time = i_time;
if( demux_Control( p_input->p->input.p_demux,
DEMUX_GET_LENGTH, &i_length ) )
/* Demux data */
b_force_update = false;
i_wakeup = 0;
- /* FIXME if p_input->i_state == PAUSE_S the access/access_demux
+ /* FIXME if p_input->p->i_state == PAUSE_S the access/access_demux
* is paused -> this may cause problem with some of them
* The same problem can be seen when seeking while paused */
- b_paused = p_input->i_state == PAUSE_S &&
+ b_paused = p_input->p->i_state == PAUSE_S &&
!es_out_GetBuffering( p_input->p->p_es_out );
if( !b_paused )
#ifdef ENABLE_SOUT
static int InitSout( input_thread_t * p_input )
{
- char *psz;
-
- if( p_input->b_preparsing ) return VLC_SUCCESS;
+ if( p_input->b_preparsing )
+ return VLC_SUCCESS;
/* Find a usable sout and attach it to p_input */
- psz = var_GetNonEmptyString( p_input, "sout" );
+ char *psz = var_GetNonEmptyString( p_input, "sout" );
if( psz && strncasecmp( p_input->p->p_item->psz_uri, "vlc:", 4 ) )
{
- /* Check the validity of the provided sout */
- if( p_input->p->p_sout )
- {
- if( strcmp( p_input->p->p_sout->psz_sout, psz ) )
- {
- msg_Dbg( p_input, "destroying unusable sout" );
-
- sout_DeleteInstance( p_input->p->p_sout );
- p_input->p->p_sout = NULL;
- }
- }
-
- if( p_input->p->p_sout )
- {
- /* Reuse it */
- msg_Dbg( p_input, "sout keep: reusing sout" );
- msg_Dbg( p_input, "sout keep: you probably want to use "
- "gather stream_out" );
- vlc_object_attach( p_input->p->p_sout, p_input );
- }
- else
+ p_input->p->p_sout = input_ressource_RequestSout( p_input->p->p_ressource, NULL, psz );
+ if( !p_input->p->p_sout )
{
- /* Create a new one */
- p_input->p->p_sout = sout_NewInstance( p_input, psz );
- if( !p_input->p->p_sout )
- {
- input_ChangeState( p_input, ERROR_S );
- msg_Err( p_input, "cannot start stream output instance, " \
- "aborting" );
- free( psz );
- return VLC_EGENERIC;
- }
+ input_ChangeState( p_input, ERROR_S );
+ msg_Err( p_input, "cannot start stream output instance, " \
+ "aborting" );
+ free( psz );
+ return VLC_EGENERIC;
}
if( libvlc_stats( p_input ) )
{
1000000;
}
}
- else if( p_input->p->p_sout )
+ else
{
- msg_Dbg( p_input, "destroying useless sout" );
-
- sout_DeleteInstance( p_input->p->p_sout );
- p_input->p->p_sout = NULL;
+ input_ressource_RequestSout( p_input->p->p_ressource, NULL, NULL );
}
free( psz );
}
/* Global flag */
- p_input->b_can_pace_control = p_master->b_can_pace_control;
+ p_input->p->b_can_pace_control = p_master->b_can_pace_control;
p_input->p->b_can_pause = p_master->b_can_pause;
p_input->p->b_can_rate_control = p_master->b_can_rate_control;
/* Fix pts delay */
- if( p_input->i_pts_delay < 0 )
- p_input->i_pts_delay = 0;
+ if( p_input->p->i_pts_delay < 0 )
+ p_input->p->i_pts_delay = 0;
/* If the desynchronisation requested by the user is < 0, we need to
* cache more data. */
const int i_desynch = var_GetInteger( p_input, "audio-desync" );
if( i_desynch < 0 )
- p_input->i_pts_delay -= i_desynch * 1000;
+ p_input->p->i_pts_delay -= i_desynch * 1000;
/* Update cr_average depending on the caching */
- p_input->p->i_cr_average *= (10 * p_input->i_pts_delay / 200000);
+ p_input->p->i_cr_average *= (10 * p_input->p->i_pts_delay / 200000);
p_input->p->i_cr_average /= 10;
if( p_input->p->i_cr_average < 10 )
p_input->p->i_cr_average = 10;
{
p_input->p->b_out_pace_control = (p_input->p->p_sout->i_out_pace_nocontrol > 0);
- if( p_input->b_can_pace_control && p_input->p->b_out_pace_control )
+ if( p_input->p->b_can_pace_control && p_input->p->b_out_pace_control )
{
/* We don't want a high input priority here or we'll
* end-up sucking up all the CPU time */
es_out_Delete( p_input->p->p_es_out );
if( p_input->p->p_es_out_display )
es_out_Delete( p_input->p->p_es_out_display );
-#ifdef ENABLE_SOUT
- if( p_input->p->p_sout )
+ if( p_input->p->p_ressource )
{
- vlc_object_detach( p_input->p->p_sout );
- sout_DeleteInstance( p_input->p->p_sout );
+ if( p_input->p->p_sout )
+ input_ressource_RequestSout( p_input->p->p_ressource,
+ p_input->p->p_sout, NULL );
+ input_ressource_SetInput( p_input->p->p_ressource, NULL );
}
-#endif
if( !p_input->b_preparsing && libvlc_stats( p_input ) )
{
return VLC_EGENERIC;
}
-/*****************************************************************************
- * WaitDie: Wait until we are asked to die.
- *****************************************************************************
- * This function is called when an error occurred during thread main's loop.
- *****************************************************************************/
-static void WaitDie( input_thread_t *p_input )
-{
- input_ChangeState( p_input, p_input->b_error ? ERROR_S : END_S );
-
- /* Wait a die order */
- vlc_object_lock( p_input );
- while( vlc_object_alive( p_input ) )
- vlc_object_wait( p_input );
- vlc_object_unlock( p_input );
-}
-
/*****************************************************************************
* End: end the input thread
*****************************************************************************/
CL_CO( sout_sent_packets );
CL_CO( sout_sent_bytes );
CL_CO( sout_send_bitrate );
-
- vlc_object_detach( p_input->p->p_sout );
}
#undef CL_CO
}
TAB_CLEAN( p_input->p->i_attachment, p_input->p->attachment );
}
- /* Tell we're dead */
- p_input->b_dead = true;
+ /* */
+ input_ressource_RequestSout( p_input->p->p_ressource,
+ p_input->p->p_sout, NULL );
+ input_ressource_SetInput( p_input->p->p_ressource, NULL );
}
/*****************************************************************************
if( i_ret )
{
msg_Warn( p_input, "cannot set pause state" );
- i_state = p_input->i_state;
+ i_state = p_input->p->i_state;
}
}
if( i_ret )
{
msg_Warn( p_input, "cannot set pause state at es_out level" );
- i_state = p_input->i_state;
+ i_state = p_input->p->i_state;
}
}
}
case INPUT_CONTROL_SET_STATE:
- if( ( val.i_int == PLAYING_S && p_input->i_state == PAUSE_S ) ||
- ( val.i_int == PAUSE_S && p_input->i_state == PAUSE_S ) )
+ if( ( val.i_int == PLAYING_S && p_input->p->i_state == PAUSE_S ) ||
+ ( val.i_int == PAUSE_S && p_input->p->i_state == PAUSE_S ) )
{
ControlUnpause( p_input, i_control_date );
b_force_update = true;
}
- else if( val.i_int == PAUSE_S && p_input->i_state == PLAYING_S /* &&
+ else if( val.i_int == PAUSE_S && p_input->p->i_state == PLAYING_S /* &&
p_input->p->b_can_pause */ )
{
ControlPause( p_input, i_control_date );
b_force_update = true;
/* Correct "state" value */
- input_ChangeState( p_input, p_input->i_state );
+ input_ChangeState( p_input, p_input->p->i_state );
}
else if( val.i_int != PLAYING_S && val.i_int != PAUSE_S )
{
i_rate = INPUT_RATE_DEFAULT;
}
if( i_rate != p_input->p->i_rate &&
- !p_input->b_can_pace_control && p_input->p->b_can_rate_control )
+ !p_input->p->b_can_pace_control && p_input->p->b_can_rate_control )
{
int i_ret;
if( p_input->p->input.p_access )
if( p_input->p->input.b_rescale_ts )
{
- const int i_rate_source = (p_input->b_can_pace_control || p_input->p->b_can_rate_control ) ? i_rate : INPUT_RATE_DEFAULT;
+ const int i_rate_source = (p_input->p->b_can_pace_control || p_input->p->b_can_rate_control ) ? i_rate : INPUT_RATE_DEFAULT;
es_out_SetRate( p_input->p->p_es_out, i_rate_source, i_rate );
}
break;
case INPUT_CONTROL_SET_FRAME_NEXT:
- if( p_input->i_state == PAUSE_S )
+ if( p_input->p->i_state == PAUSE_S )
{
es_out_SetFrameNext( p_input->p->p_es_out );
}
- else if( p_input->i_state == PLAYING_S )
+ else if( p_input->p->i_state == PLAYING_S )
{
ControlPause( p_input, i_control_date );
}
/* Get infos from access_demux */
demux_Control( in->p_demux,
DEMUX_GET_PTS_DELAY, &i_pts_delay );
- p_input->i_pts_delay = __MAX( p_input->i_pts_delay, i_pts_delay );
+ p_input->p->i_pts_delay = __MAX( p_input->p->i_pts_delay, i_pts_delay );
in->b_title_demux = true;
if( demux_Control( in->p_demux, DEMUX_GET_TITLE_INFO,
{
access_Control( in->p_access,
ACCESS_GET_PTS_DELAY, &i_pts_delay );
- p_input->i_pts_delay = __MAX( p_input->i_pts_delay, i_pts_delay );
+ p_input->p->i_pts_delay = __MAX( p_input->p->i_pts_delay, i_pts_delay );
in->b_title_demux = false;
if( access_Control( in->p_access, ACCESS_GET_TITLE_INFO,
{
int64_t i_time;
int i;
- bool b_set_time = true;
if( demux_Control( p_input->p->input.p_demux, DEMUX_GET_TIME, &i_time ) )
{
- /* msg_Err( p_input, "demux doesn't like DEMUX_GET_TIME" ); */
- b_set_time = false;
+ msg_Err( p_input, "demux doesn't like DEMUX_GET_TIME" );
+ return;
}
for( i = 0; i < p_input->p->i_slave; i++ )
if( in->b_eof )
continue;
- if( b_set_time && demux_Control( in->p_demux, DEMUX_SET_NEXT_DEMUX_TIME, i_time ) )
+ if( demux_Control( in->p_demux, DEMUX_SET_NEXT_DEMUX_TIME, i_time ) )
{
for( ;; )
{
/* */
static void input_ChangeState( input_thread_t *p_input, int i_state )
{
- const bool b_changed = p_input->i_state != i_state;
+ const bool b_changed = p_input->p->i_state != i_state;
- p_input->i_state = i_state;
+ p_input->p->i_state = i_state;
if( i_state == ERROR_S )
p_input->b_error = true;
else if( i_state == END_S )
void input_UpdateStatistic( input_thread_t *p_input,
input_statistic_t i_type, int i_delta )
{
- assert( p_input->i_state != INIT_S );
+ assert( p_input->p->i_state != INIT_S );
vlc_mutex_lock( &p_input->p->counters.counters_lock);
switch( i_type )
projects / vlc / blobdiff