#include <ctype.h>
#include <limits.h>
#include <assert.h>
+#include <errno.h>
#include "input_internal.h"
#include "event.h"
/* TODO */
//static void InputGetAttachments( input_thread_t *, input_source_t * );
-static void SlaveDemux( input_thread_t *p_input );
+static void SlaveDemux( input_thread_t *p_input, bool *pb_demux_polled );
static void SlaveSeek( input_thread_t *p_input );
static void InputMetaUser( input_thread_t *p_input, vlc_meta_t *p_meta );
* MainLoopDemux
* It asks the demuxer to demux some data
*/
-static void MainLoopDemux( input_thread_t *p_input, bool *pb_changed, mtime_t i_start_mdate )
+static void MainLoopDemux( input_thread_t *p_input, bool *pb_changed, bool *pb_demux_polled, mtime_t i_start_mdate )
{
int i_ret;
*pb_changed = false;
+ *pb_demux_polled = p_input->p->input.p_demux->pf_demux != NULL;
if( ( p_input->p->i_stop > 0 && p_input->p->i_time >= p_input->p->i_stop ) ||
( p_input->p->i_run > 0 && i_start_mdate+p_input->p->i_run < mdate() ) )
if( i_ret > 0 && p_input->p->i_slave > 0 )
{
- SlaveDemux( p_input );
+ bool b_demux_polled;
+ SlaveDemux( p_input, &b_demux_polled );
+
+ *pb_demux_polled |= b_demux_polled;
}
}
mtime_t i_deadline;
mtime_t i_wakeup;
bool b_paused;
+ bool b_demux_polled;
/* Demux data */
b_force_update = false;
b_paused = p_input->p->i_state == PAUSE_S &&
!es_out_GetBuffering( p_input->p->p_es_out );
+ b_demux_polled = true;
if( !b_paused )
{
if( !p_input->p->input.b_eof )
{
- MainLoopDemux( p_input, &b_force_update, i_start_mdate );
+ MainLoopDemux( p_input, &b_force_update, &b_demux_polled, i_start_mdate );
i_wakeup = es_out_GetWakeup( p_input->p->p_es_out );
}
/* */
do {
i_deadline = i_wakeup;
- if( b_paused )
+ if( b_paused || !b_demux_polled )
i_deadline = __MIN( i_intf_update, i_statistic_update );
/* Handle control */
i_statistic_update = i_current + INT64_C(1000000);
}
- /* Check if i_wakeup is still valid */
+ /* Update the wakeup time */
if( i_wakeup != 0 )
- {
- mtime_t i_new_wakeup = es_out_GetWakeup( p_input->p->p_es_out );
- if( !i_new_wakeup )
- i_wakeup = 0;
- }
+ i_wakeup = es_out_GetWakeup( p_input->p->p_es_out );
} while( i_current < i_wakeup );
}
p_input->p->i_run = 0;
}
- const mtime_t i_length = var_GetTime( p_input, "length" );
if( p_input->p->i_start > 0 )
{
- if( p_input->p->i_start >= i_length )
- {
- msg_Warn( p_input, "invalid start-time ignored" );
- }
- else
- {
- vlc_value_t s;
+ vlc_value_t s;
- msg_Dbg( p_input, "starting at time: %ds",
- (int)( p_input->p->i_start / INT64_C(1000000) ) );
+ msg_Dbg( p_input, "starting at time: %ds",
+ (int)( p_input->p->i_start / INT64_C(1000000) ) );
- s.i_time = p_input->p->i_start;
- input_ControlPush( p_input, INPUT_CONTROL_SET_TIME, &s );
- }
+ s.i_time = p_input->p->i_start;
+ input_ControlPush( p_input, INPUT_CONTROL_SET_TIME, &s );
}
if( p_input->p->i_stop > 0 && p_input->p->i_stop <= p_input->p->i_start )
{
if( i_ret )
{
msg_Warn( p_input, "cannot set pause state" );
- i_state = p_input->p->i_state;
+ return;
}
}
/* */
- if( !i_ret )
+ i_ret = es_out_SetPauseState( p_input->p->p_es_out,
+ p_input->p->b_can_pause, true,
+ i_control_date );
+ if( i_ret )
{
- i_ret = es_out_SetPauseState( p_input->p->p_es_out, p_input->p->b_can_pause, true, i_control_date );
- if( i_ret )
- {
- msg_Warn( p_input, "cannot set pause state at es_out level" );
- i_state = p_input->p->i_state;
- }
+ msg_Warn( p_input, "cannot set pause state at es_out level" );
+ return;
}
/* Switch to new state */
input_ChangeState( p_input, i_state );
-
}
static void ControlUnpause( input_thread_t *p_input, mtime_t i_control_date )
int64_t i_length;
/* Emulate it with a SET_POS */
- demux_Control( p_input->p->input.p_demux,
- DEMUX_GET_LENGTH, &i_length );
- if( i_length > 0 )
+ if( !demux_Control( p_input->p->input.p_demux,
+ DEMUX_GET_LENGTH, &i_length ) && i_length > 0 )
{
double f_pos = (double)i_time / (double)i_length;
i_ret = demux_Control( p_input->p->input.p_demux,
}
case INPUT_CONTROL_SET_STATE:
- 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 ) )
+ if( val.i_int != PLAYING_S && val.i_int != PAUSE_S )
+ msg_Err( p_input, "invalid state in INPUT_CONTROL_SET_STATE" );
+ else if( p_input->p->i_state == PAUSE_S )
{
ControlUnpause( p_input, i_control_date );
/* Correct "state" value */
input_ChangeState( p_input, p_input->p->i_state );
}
- else if( val.i_int != PLAYING_S && val.i_int != PAUSE_S )
- {
- msg_Err( p_input, "invalid state in INPUT_CONTROL_SET_STATE" );
- }
break;
case INPUT_CONTROL_SET_RATE:
#endif
)
{ /* host specified -> only localhost is supported */
- static const unsigned localhostLen = 9; /* strlen("localhost") */
- if (!strncmp( psz_path, "localhost" DIR_SEP, localhostLen + 1))
- psz_path += localhostLen;
- else
+ static const size_t i_localhost = sizeof("localhost")-1;
+ if( strncmp( psz_path, "localhost/", i_localhost + 1) != 0 )
{
msg_Err( p_input, "cannot open remote file `%s://%s'",
- psz_access, psz_path );
- msg_Info( p_input, "Did you mean `%s:///%s'?",
psz_access, psz_path );
+ msg_Info( p_input, "Did you mean `%s:///%s'?",
+ psz_access, psz_path );
goto error;
}
+ psz_path += i_localhost;
}
/* Remove HTML anchor if present (not supported). */
char *p = strchr( psz_path, '#' );
}
/* Try access_demux first */
- in->p_demux = demux_New( p_input, psz_access, psz_demux, psz_path,
+ in->p_demux = demux_New( p_input, p_input, psz_access, psz_demux, psz_path,
NULL, p_input->p->p_es_out, false );
}
else
if( in->p_demux )
{
/* Get infos from access_demux */
- demux_Control( in->p_demux,
- DEMUX_GET_PTS_DELAY, &in->i_pts_delay );
+ int i_ret = demux_Control( in->p_demux,
+ DEMUX_GET_PTS_DELAY, &in->i_pts_delay );
+ assert( !i_ret );
in->i_pts_delay = __MAX( 0, __MIN( in->i_pts_delay, INPUT_PTS_DELAY_MAX ) );
&in->b_can_pace_control ) )
in->b_can_pace_control = false;
+ assert( in->p_demux->pf_demux != NULL || !in->b_can_pace_control );
+
if( !in->b_can_pace_control )
{
if( demux_Control( in->p_demux, DEMUX_CAN_CONTROL_RATE,
else
{
/* Now try a real access */
- in->p_access = access_New( p_input, psz_access, psz_demux, psz_path );
+ in->p_access = access_New( p_input, p_input, psz_access, psz_demux, psz_path );
if( in->p_access == NULL )
{
if( vlc_object_alive( p_input ) )
{
psz_real_path = psz_path;
}
- in->p_demux = demux_New( p_input, psz_access, psz_demux,
+ in->p_demux = demux_New( p_input, p_input, psz_access, psz_demux,
psz_real_path,
in->p_stream, p_input->p->p_es_out,
p_input->b_preparsing );
}
goto error;
}
+ assert( in->p_demux->pf_demux != NULL );
/* Get title from demux */
if( !p_input->b_preparsing && in->i_title <= 0 )
if( !b_bool )
return;
- demux_meta_t *p_demux_meta = p_demux->p_private = calloc( 1, sizeof(*p_demux_meta) );
+ demux_meta_t *p_demux_meta =
+ vlc_custom_create( p_demux, sizeof( *p_demux_meta ),
+ VLC_OBJECT_GENERIC, "demux meta" );
if( !p_demux_meta )
return;
+ p_demux_meta->p_demux = p_demux;
- module_t *p_id3 = module_need( p_demux, "meta reader", NULL, false );
+ module_t *p_id3 = module_need( p_demux_meta, "meta reader", NULL, false );
if( p_id3 )
{
if( p_demux_meta->p_meta )
}
module_unneed( p_demux, p_id3 );
}
- free( p_demux_meta );
+ vlc_object_release( p_demux_meta );
}
-static void SlaveDemux( input_thread_t *p_input )
+static void SlaveDemux( input_thread_t *p_input, bool *pb_demux_polled )
{
int64_t i_time;
int i;
+ *pb_demux_polled = false;
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" );
for( i = 0; i < p_input->p->i_slave; i++ )
{
input_source_t *in = p_input->p->slave[i];
- int i_ret = 1;
+ int i_ret;
if( in->b_eof )
continue;
+ const bool b_demux_polled = in->p_demux->pf_demux != NULL;
+ if( !b_demux_polled )
+ continue;
+
+ *pb_demux_polled = true;
+
+ /* Call demux_Demux until we have read enough data */
if( demux_Control( in->p_demux, DEMUX_SET_NEXT_DEMUX_TIME, i_time ) )
{
for( ;; )
}
if( i_stime >= i_time )
+ {
+ i_ret = 1;
break;
+ }
if( ( i_ret = demux_Demux( in->p_demux ) ) <= 0 )
break;
*****************************************************************************/
static void InputUpdateMeta( input_thread_t *p_input, vlc_meta_t *p_meta )
{
- input_item_t *p_item = p_input->p->p_item;
-
- char *psz_title = NULL;
- char *psz_arturl = input_item_GetArtURL( p_item );
-
- vlc_mutex_lock( &p_item->lock );
-
- if( vlc_meta_Get( p_meta, vlc_meta_Title ) && !p_item->b_fixed_name )
- psz_title = strdup( vlc_meta_Get( p_meta, vlc_meta_Title ) );
-
- vlc_meta_Merge( p_item->p_meta, p_meta );
-
+ es_out_ControlSetMeta( p_input->p->p_es_out, p_meta );
vlc_meta_Delete( p_meta );
-
- if( !psz_arturl || *psz_arturl == '\0' )
- {
- const char *psz_tmp = vlc_meta_Get( p_item->p_meta, vlc_meta_ArtworkURL );
- if( psz_tmp )
- psz_arturl = strdup( psz_tmp );
- }
- vlc_mutex_unlock( &p_item->lock );
-
- if( psz_arturl && *psz_arturl )
- {
- input_item_SetArtURL( p_item, psz_arturl );
-
- if( !strncmp( psz_arturl, "attachment://", strlen("attachment") ) )
- {
- /* Don't look for art cover if sout
- * XXX It can change when sout has meta data support */
- if( p_input->p->p_sout && !p_input->b_preparsing )
- input_item_SetArtURL( p_item, "" );
- else
- input_ExtractAttachmentAndCacheArt( p_input );
- }
- }
- free( psz_arturl );
-
- if( psz_title )
- {
- input_item_SetName( p_item, psz_title );
- free( psz_title );
- }
- input_item_SetPreparsed( p_item, true );
-
- input_SendEventMeta( p_input );
-
- /** \todo handle sout meta */
}
static void AppendAttachment( int *pi_attachment, input_attachment_t ***ppp_attachment,