#include <vlc_common.h>
-#include <ctype.h>
#include <limits.h>
#include <assert.h>
#include <errno.h>
static void ObjectKillChildrens( input_thread_t *, vlc_object_t * );
-static inline int ControlPop( input_thread_t *, int *, vlc_value_t *, mtime_t i_deadline );
+static inline int ControlPop( input_thread_t *, int *, vlc_value_t *, mtime_t i_deadline, bool b_postpone_seek );
static void ControlRelease( int i_type, vlc_value_t val );
+static bool ControlIsSeekRequest( int i_type );
static bool Control( input_thread_t *, int, vlc_value_t );
static int UpdateTitleSeekpointFromAccess( input_thread_t * );
if( p_input == NULL )
return NULL;
+ vlc_object_attach( p_input, p_parent );
+
/* Construct a nice name for the input timer */
char psz_timer_name[255];
char * psz_name = input_item_GetName( p_item );
/* Set the destructor when we are sure we are initialized */
vlc_object_set_destructor( p_input, (vlc_destructor_t)Destructor );
- /* Attach only once we are ready */
- vlc_object_attach( p_input, p_parent );
-
return p_input;
}
mtime_t i_start_mdate = mdate();
mtime_t i_intf_update = 0;
mtime_t i_statistic_update = 0;
+ mtime_t i_last_seek_mdate = 0;
bool b_pause_after_eof = b_interactive &&
var_CreateGetBool( p_input, "play-and-pause" );
while( vlc_object_alive( p_input ) && !p_input->b_error )
{
bool b_force_update;
- int i_type;
vlc_value_t val;
mtime_t i_current;
- mtime_t i_deadline;
mtime_t i_wakeup;
bool b_paused;
bool b_demux_polled;
msg_Dbg( p_input, "waiting decoder fifos to empty" );
i_wakeup = mdate() + INPUT_IDLE_SLEEP;
}
- else if( b_pause_after_eof )
+ /* Pause after eof only if the input is pausable.
+ * This way we won't trigger timeshifting for nothing */
+ else if( b_pause_after_eof && p_input->p->b_can_pause )
{
msg_Dbg( p_input, "pausing at EOF (pause after each)");
val.i_int = PAUSE_S;
/* */
do {
- i_deadline = i_wakeup;
+ mtime_t i_deadline = i_wakeup;
if( b_paused || !b_demux_polled )
i_deadline = __MIN( i_intf_update, i_statistic_update );
/* Handle control */
- while( !ControlPop( p_input, &i_type, &val, i_deadline ) )
+ for( ;; )
{
+ mtime_t i_limit = i_deadline;
+
+ /* We will postpone the execution of a seek until we have
+ * finished the ES bufferisation (postpone is limited to
+ * 125ms) */
+ bool b_buffering = es_out_GetBuffering( p_input->p->p_es_out ) &&
+ !p_input->p->input.b_eof;
+ if( b_buffering )
+ {
+ /* When postpone is in order, check the ES level every 20ms */
+ mtime_t i_current = mdate();
+ if( i_last_seek_mdate + INT64_C(125000) >= i_current )
+ i_limit = __MIN( i_deadline, i_current + INT64_C(20000) );
+ }
+
+ int i_type;
+ if( ControlPop( p_input, &i_type, &val, i_limit, b_buffering ) )
+ {
+ if( b_buffering && i_limit < i_deadline )
+ continue;
+ break;
+ }
msg_Dbg( p_input, "control type=%d", i_type );
if( Control( p_input, i_type, val ) )
+ {
+ if( ControlIsSeekRequest( i_type ) )
+ i_last_seek_mdate = mdate();
b_force_update = true;
+ }
}
/* Update interface and statistics */
var_SetTime( p_input, "spu-delay", (mtime_t)i_delay * 100000 );
/* Look for and add subtitle files */
+ bool b_forced = true;
+
char *psz_subtitle = var_GetNonEmptyString( p_input, "sub-file" );
if( psz_subtitle != NULL )
{
msg_Dbg( p_input, "forced subtitle: %s", psz_subtitle );
- SubtitleAdd( p_input, psz_subtitle, true );
+ SubtitleAdd( p_input, psz_subtitle, b_forced );
+ b_forced = false;
}
if( var_GetBool( p_input, "sub-autodetect-file" ) )
for( int i = 0; ppsz_subs && ppsz_subs[i]; i++ )
{
- /* Try to autoselect the first autodetected subtitles file
- * if no subtitles file was specified */
- bool b_forced = i == 0 && !psz_subtitle;
-
if( !psz_subtitle || strcmp( psz_subtitle, ppsz_subs[i] ) )
+ {
SubtitleAdd( p_input, ppsz_subs[i], b_forced );
+ b_forced = false;
+ }
free( ppsz_subs[i] );
}
free( ppsz_subs );
}
free( psz_subtitle );
+
+ /* Load subtitles from attachments */
+ int i_attachment = 0;
+ input_attachment_t **pp_attachment = NULL;
+
+ vlc_mutex_lock( &p_input->p->p_item->lock );
+ for( int i = 0; i < p_input->p->i_attachment; i++ )
+ {
+ const input_attachment_t *a = p_input->p->attachment[i];
+ if( !strcmp( a->psz_mime, "application/x-srt" ) )
+ TAB_APPEND( i_attachment, pp_attachment,
+ vlc_input_attachment_New( a->psz_name, NULL,
+ a->psz_description, NULL, 0 ) );
+ }
+ vlc_mutex_unlock( &p_input->p->p_item->lock );
+
+ if( i_attachment > 0 )
+ var_Create( p_input, "sub-description", VLC_VAR_STRING );
+ for( int i = 0; i < i_attachment; i++ )
+ {
+ input_attachment_t *a = pp_attachment[i];
+ if( !a )
+ continue;
+ char *psz_mrl;
+ if( a->psz_name[i] &&
+ asprintf( &psz_mrl, "attachment://%s", a->psz_name ) >= 0 )
+ {
+ var_SetString( p_input, "sub-description", a->psz_description ? a->psz_description : "");
+
+ SubtitleAdd( p_input, psz_mrl, b_forced );
+
+ b_forced = false;
+ free( psz_mrl );
+ }
+ vlc_input_attachment_Delete( a );
+ }
+ free( pp_attachment );
+ if( i_attachment > 0 )
+ var_Destroy( p_input, "sub-description" );
}
static void LoadSlaves( input_thread_t *p_input )
static inline int ControlPop( input_thread_t *p_input,
int *pi_type, vlc_value_t *p_val,
- mtime_t i_deadline )
+ mtime_t i_deadline, bool b_postpone_seek )
{
input_thread_private_t *p_sys = p_input->p;
vlc_mutex_lock( &p_sys->lock_control );
- while( p_sys->i_control <= 0 )
+ while( p_sys->i_control <= 0 ||
+ ( b_postpone_seek && ControlIsSeekRequest( p_sys->control[0].i_type ) ) )
{
if( !vlc_object_alive( p_input ) || i_deadline < 0 )
{
return VLC_SUCCESS;
}
+static bool ControlIsSeekRequest( int i_type )
+{
+ switch( i_type )
+ {
+ case INPUT_CONTROL_SET_POSITION:
+ case INPUT_CONTROL_SET_TIME:
+ case INPUT_CONTROL_SET_TITLE:
+ case INPUT_CONTROL_SET_TITLE_NEXT:
+ case INPUT_CONTROL_SET_TITLE_PREV:
+ case INPUT_CONTROL_SET_SEEKPOINT:
+ case INPUT_CONTROL_SET_SEEKPOINT_NEXT:
+ case INPUT_CONTROL_SET_SEEKPOINT_PREV:
+ case INPUT_CONTROL_SET_BOOKMARK:
+ return true;
+ default:
+ return false;
+ }
+}
static void ControlRelease( int i_type, vlc_value_t val )
{
else if( bookmark.i_byte_offset >= 0 &&
p_input->p->input.p_stream )
{
- const int64_t i_size = stream_Size( p_input->p->input.p_stream );
+ const uint64_t i_size = stream_Size( p_input->p->input.p_stream );
if( i_size > 0 && bookmark.i_byte_offset <= i_size )
{
val.f_float = (double)bookmark.i_byte_offset / i_size;
input_SplitMRL( &psz_access, &psz_demux, &psz_path, psz_dup );
/* FIXME: file:// handling plugins do not support URIs properly...
- * So we pre-decoded the URI to a path for them. Note that we do not do it
+ * So we pre-decode the URI to a path for them. Note that we do not do it
* for non-standard VLC-specific schemes. */
if( !strcmp( psz_access, "file" ) )
{
/* XXX Remember that checking against p_item->p_meta->i_status & ITEM_PREPARSED
* is a bad idea */
+ bool has_meta;
+
/* Read access meta */
- if( p_access )
- access_Control( p_access, ACCESS_GET_META, p_meta );
+ has_meta = p_access && !access_Control( p_access, ACCESS_GET_META, p_meta );
/* Read demux meta */
- demux_Control( p_demux, DEMUX_GET_META, p_meta );
+ has_meta |= !demux_Control( p_demux, DEMUX_GET_META, p_meta );
- /* If the demux report unsupported meta data, try an external "meta reader" */
- bool b_bool;
- if( demux_Control( p_demux, DEMUX_HAS_UNSUPPORTED_META, &b_bool ) )
- return;
- if( !b_bool )
+ bool has_unsupported;
+ if( demux_Control( p_demux, DEMUX_HAS_UNSUPPORTED_META, &has_unsupported ) )
+ has_unsupported = true;
+
+ /* If the demux report unsupported meta data, or if we don't have meta data
+ * try an external "meta reader" */
+ if( has_meta && !has_unsupported )
return;
demux_meta_t *p_demux_meta =
if( !p_demux_meta )
return;
p_demux_meta->p_demux = p_demux;
+ p_demux_meta->p_item = p_input->p->p_item;
module_t *p_id3 = module_need( p_demux_meta, "meta reader", NULL, false );
if( p_id3 )
input_attachment_t **attachment = *ppp_attachment;
int i;
- attachment = realloc( attachment,
- sizeof(input_attachment_t**) * ( i_attachment + i_new ) );
+ attachment = xrealloc( attachment,
+ sizeof(input_attachment_t**) * ( i_attachment + i_new ) );
for( i = 0; i < i_new; i++ )
attachment[i_attachment++] = pp_new[i];
free( pp_new );
{
psz_path = psz_dup;
}
- *ppsz_access = psz_access ? psz_access : (char*)"";
- *ppsz_demux = psz_demux ? psz_demux : (char*)"";
+ *ppsz_access = psz_access ? psz_access : "";
+ *ppsz_demux = psz_demux ? psz_demux : "";
*ppsz_path = psz_path;
}
projects / vlc / blobdiff