Commit 01aca2cc authored by Clément Stenac's avatar Clément Stenac

*experimental* input pre-parsing support.

Won't work for many things (only those for which metadata can be gotten during initialization).

Processing is done asynchronously, use playlist_PreparseEnqueue to add an item to the queue.
parent 3e46b414
......@@ -104,8 +104,8 @@ struct access_t
access_sys_t *p_sys;
};
#define access2_New( a, b, c, d ) __access2_New(VLC_OBJECT(a), b, c, d )
VLC_EXPORT( access_t *, __access2_New, ( vlc_object_t *p_obj, char *psz_access, char *psz_demux, char *psz_path ) );
#define access2_New( a, b, c, d, e ) __access2_New(VLC_OBJECT(a), b, c, d, e )
VLC_EXPORT( access_t *, __access2_New, ( vlc_object_t *p_obj, char *psz_access, char *psz_demux, char *psz_path, vlc_bool_t b_quick ) );
VLC_EXPORT( void, access2_Delete, ( access_t * ) );
static inline int access2_vaControl( access_t *p_access, int i_query, va_list args )
......
......@@ -225,6 +225,7 @@ typedef struct playlist_export_t playlist_export_t;
typedef struct services_discovery_t services_discovery_t;
typedef struct services_discovery_sys_t services_discovery_sys_t;
typedef struct playlist_add_t playlist_add_t;
typedef struct playlist_preparse_t playlist_preparse_t;
/* Modules */
typedef struct module_bank_t module_bank_t;
......
......@@ -109,8 +109,8 @@ enum demux_query_e
};
/* stream_t *s could be null and then it mean a access+demux in one */
#define demux2_New( a, b, c, d, e, f ) __demux2_New(VLC_OBJECT(a),b,c,d,e,f)
VLC_EXPORT( demux_t *, __demux2_New, ( vlc_object_t *p_obj, char *psz_access, char *psz_demux, char *psz_path, stream_t *s, es_out_t *out ) );
#define demux2_New( a, b, c, d, e, f,g ) __demux2_New(VLC_OBJECT(a),b,c,d,e,f,g)
VLC_EXPORT( demux_t *, __demux2_New, ( vlc_object_t *p_obj, char *psz_access, char *psz_demux, char *psz_path, stream_t *s, es_out_t *out, vlc_bool_t ) );
VLC_EXPORT( void, demux2_Delete, ( demux_t * ) );
VLC_EXPORT( int, demux2_vaControlHelper, ( stream_t *, int64_t i_start, int64_t i_end, int i_bitrate, int i_align, int i_query, va_list args ) );
......
......@@ -398,6 +398,8 @@ struct input_thread_t
*****************************************************************************/
#define input_CreateThread(a,b) __input_CreateThread(VLC_OBJECT(a),b)
VLC_EXPORT( input_thread_t *, __input_CreateThread, ( vlc_object_t *, input_item_t * ) );
#define input_Preparse(a,b) __input_Preparse(VLC_OBJECT(a),b)
VLC_EXPORT( int, __input_Preparse, ( vlc_object_t *, input_item_t * ) );
VLC_EXPORT( void, input_StopThread, ( input_thread_t * ) );
VLC_EXPORT( void, input_DestroyThread, ( input_thread_t * ) );
......
......@@ -127,6 +127,14 @@ struct services_discovery_t
void (*pf_run) ( services_discovery_t *);
};
struct playlist_preparse_t
{
VLC_COMMON_MEMBERS
vlc_mutex_t lock;
int i_waiting;
input_item_t **pp_waiting;
};
/**
* Structure containing information about the playlist
......@@ -191,9 +199,11 @@ struct playlist_t
vlc_bool_t b_request; /**< Set to true by the requester
The playlist sets it back to false
when processing the request */
vlc_mutex_t lock; /**< Lock to protect request */
vlc_mutex_t lock; /**< Lock to protect request */
} request;
playlist_preparse_t *p_preparse;
/*@}*/
};
......@@ -238,6 +248,7 @@ VLC_EXPORT( int, playlist_Control, ( playlist_t *, int, ... ) );
VLC_EXPORT( int, playlist_Clear, ( playlist_t * ) );
VLC_EXPORT( int, playlist_PreparseEnqueue, (playlist_t *, input_item_t *) );
/* Services discovery */
......
......@@ -90,6 +90,7 @@ enum
PopupPlay_Event,
PopupPlayThis_Event,
PopupPreparse_Event,
PopupSort_Event,
PopupDel_Event,
PopupEna_Event,
......@@ -150,6 +151,7 @@ BEGIN_EVENT_TABLE(Playlist, wxFrame)
/* Popup events */
EVT_MENU( PopupPlay_Event, Playlist::OnPopupPlay)
EVT_MENU( PopupPlayThis_Event, Playlist::OnPopupPlay)
EVT_MENU( PopupPreparse_Event, Playlist::OnPopupPreparse)
EVT_MENU( PopupSort_Event, Playlist::OnPopupSort)
EVT_MENU( PopupDel_Event, Playlist::OnPopupDel)
EVT_MENU( PopupEna_Event, Playlist::OnPopupEna)
......@@ -266,6 +268,7 @@ Playlist::Playlist( intf_thread_t *_p_intf, wxWindow *p_parent ):
popup_menu = new wxMenu;
popup_menu->Append( PopupPlay_Event, wxU(_("Play")) );
popup_menu->Append( PopupPlayThis_Event, wxU(_("Play this branch")) );
popup_menu->Append( PopupPreparse_Event, wxU(_("Preparse")) );
popup_menu->Append( PopupSort_Event, wxU(_("Sort this branch")) );
popup_menu->Append( PopupDel_Event, wxU(_("Delete")) );
popup_menu->Append( PopupEna_Event, wxU(_("Enable/Disable")) );
......@@ -1139,8 +1142,9 @@ void Playlist::OnActivateItem( wxTreeEvent& event )
playlist_item_t *p_item,*p_node;
playlist_t *p_playlist = (playlist_t *)vlc_object_find( p_intf,
VLC_OBJECT_PLAYLIST,FIND_ANYWHERE );
PlaylistItem *p_wxitem = (PlaylistItem *)treectrl->GetItemData(
event.GetItem() );
event.GetItem() );
wxTreeItemId parent = treectrl->GetItemParent( event.GetItem() );
PlaylistItem *p_wxparent = (PlaylistItem *)treectrl->GetItemData( parent );
......@@ -1380,9 +1384,6 @@ void Playlist::OnPopup( wxContextMenuEvent& event )
Playlist::PopupMenu( popup_menu,
ScreenToClient( wxGetMousePosition() ) );
}
else
{
}
}
void Playlist::OnPopupPlay( wxMenuEvent& event )
......@@ -1424,6 +1425,38 @@ void Playlist::OnPopupPlay( wxMenuEvent& event )
vlc_object_release( p_playlist );
}
void Playlist::OnPopupPreparse( wxMenuEvent& event )
{
playlist_t *p_playlist =
(playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
if( p_playlist == NULL )
{
return;
}
if( p_popup_item != NULL )
{
if( p_popup_item->i_children == -1 )
{
playlist_PreparseEnqueue( p_playlist, &p_popup_item->input );
}
else
{
int i = 0;
playlist_item_t *p_parent = p_popup_item;
for( i = 0; i< p_parent->i_children ; i++ )
{
wxMenuEvent dummy;
i_popup_item = FindItem( treectrl->GetRootItem(),
p_parent->pp_children[i] );
p_popup_item = p_parent->pp_children[i];
OnPopupPreparse( dummy );
}
}
}
vlc_object_release( p_playlist );
}
void Playlist::OnPopupDel( wxMenuEvent& event )
{
PlaylistItem *p_wxitem;
......
......@@ -108,9 +108,14 @@ void Timer::Notify()
/* Update the input */
if( p_intf->p_sys->p_input == NULL )
{
p_intf->p_sys->p_input =
(input_thread_t *)vlc_object_find( p_intf, VLC_OBJECT_INPUT,
FIND_ANYWHERE );
playlist_t *p_playlist =
(playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
if( p_playlist != NULL )
{
p_intf->p_sys->p_input = p_playlist->p_input;
vlc_object_release( p_playlist );
}
/* Refresh interface */
if( p_intf->p_sys->p_input )
......@@ -140,7 +145,6 @@ void Timer::Notify()
p_main_interface->statusbar->SetStatusText( wxT(""), 0 );
p_main_interface->statusbar->SetStatusText( wxT(""), 2 );
vlc_object_release( p_intf->p_sys->p_input );
p_intf->p_sys->p_input = NULL;
}
......
......@@ -175,11 +175,6 @@ static void Close( vlc_object_t *p_this )
{
intf_thread_t *p_intf = (intf_thread_t *)p_this;
if( p_intf->p_sys->p_input )
{
vlc_object_release( p_intf->p_sys->p_input );
}
vlc_mutex_lock( &p_intf->object_lock );
p_intf->b_dead = VLC_TRUE;
vlc_mutex_unlock( &p_intf->object_lock );
......
......@@ -846,6 +846,7 @@ private:
playlist_item_t *p_popup_parent;
void OnPopup( wxContextMenuEvent& event );
void OnPopupPlay( wxMenuEvent& event );
void OnPopupPreparse( wxMenuEvent& event );
void OnPopupSort( wxMenuEvent& event );
void OnPopupDel( wxMenuEvent& event );
void OnPopupEna( wxMenuEvent& event );
......
......@@ -31,7 +31,8 @@
* access2_New:
*****************************************************************************/
access_t *__access2_New( vlc_object_t *p_obj,
char *psz_access, char *psz_demux, char *psz_path )
char *psz_access, char *psz_demux, char *psz_path,
vlc_bool_t b_quick )
{
access_t *p_access = vlc_object_create( p_obj, VLC_OBJECT_ACCESS );
......@@ -42,12 +43,13 @@ access_t *__access2_New( vlc_object_t *p_obj,
}
/* Parse URL */
p_access->psz_access = strdup( psz_access );
p_access->psz_access = b_quick ? strdup( "file" ) : strdup( psz_access );
p_access->psz_path = strdup( psz_path );
p_access->psz_demux = strdup( "" );
msg_Dbg( p_obj, "access2_New: access='%s' path='%s'",
p_access->psz_access, p_access->psz_path );
if( !b_quick )
msg_Dbg( p_obj, "access2_New: access='%s' path='%s'",
p_access->psz_access, p_access->psz_path );
p_access->pf_read = NULL;
p_access->pf_block = NULL;
......@@ -66,7 +68,8 @@ access_t *__access2_New( vlc_object_t *p_obj,
vlc_object_attach( p_access, p_obj );
p_access->p_module =
module_Need( p_access, "access2", p_access->psz_access, VLC_FALSE );
module_Need( p_access, "access2", p_access->psz_access,
b_quick ? VLC_TRUE : VLC_FALSE );
if( p_access->p_module == NULL )
{
......
......@@ -33,7 +33,7 @@
*****************************************************************************/
demux_t *__demux2_New( vlc_object_t *p_obj,
char *psz_access, char *psz_demux, char *psz_path,
stream_t *s, es_out_t *out )
stream_t *s, es_out_t *out, vlc_bool_t b_quick )
{
demux_t *p_demux = vlc_object_create( p_obj, VLC_OBJECT_DEMUX );
char *psz_module;
......@@ -55,8 +55,11 @@ demux_t *__demux2_New( vlc_object_t *p_obj,
p_demux->psz_demux = var_GetString( p_obj, "demux" );
}
msg_Dbg( p_obj, "demux2_New: access='%s' demux='%s' path='%s'",
p_demux->psz_access, p_demux->psz_demux, p_demux->psz_path );
if( !b_quick )
{
msg_Dbg( p_obj, "demux2_New: access='%s' demux='%s' path='%s'",
p_demux->psz_access, p_demux->psz_demux, p_demux->psz_path );
}
p_demux->s = s;
p_demux->out = out;
......@@ -79,8 +82,8 @@ demux_t *__demux2_New( vlc_object_t *p_obj,
* - no .mp3, .a52, ... (aac is added as it works only by file ext anyway
* - wav can't be added 'cause of a52 and dts in them as raw audio
*/
static struct { char *ext; char *demux; } exttodemux[] =
{
static struct { char *ext; char *demux; } exttodemux[] =
{
{ "aac", "aac" },
{ "aiff", "aiff" },
{ "asf", "asf" }, { "wmv", "asf" }, { "wma", "asf" },
......@@ -98,17 +101,40 @@ demux_t *__demux2_New( vlc_object_t *p_obj,
{ "rm", "rm" },
{ NULL, NULL },
};
/* Here, we don't mind if it does not work, it must be quick */
static struct { char *ext; char *demux; } exttodemux_quick[] =
{
{ "mp3", "mpga" },
{ "ogg", "ogg" },
{ "wma", "asf" },
{ NULL, NULL }
};
char *psz_ext = strrchr( p_demux->psz_path, '.' ) + 1;
int i;
for( i = 0; exttodemux[i].ext != NULL; i++ )
if( !b_quick )
{
for( i = 0; exttodemux[i].ext != NULL; i++ )
{
if( !strcasecmp( psz_ext, exttodemux[i].ext ) )
{
psz_module = exttodemux[i].demux;
break;
}
}
}
else
{
if( !strcasecmp( psz_ext, exttodemux[i].ext ) )
for( i = 0; exttodemux_quick[i].ext != NULL; i++ )
{
psz_module = exttodemux[i].demux;
break;
if( !strcasecmp( psz_ext, exttodemux_quick[i].ext ) )
{
psz_module = exttodemux_quick[i].demux;
break;
}
}
}
}
......@@ -486,7 +512,8 @@ static int DStreamThread( stream_t *s )
demux_t *p_demux;
/* Create the demuxer */
if( !(p_demux = demux2_New( s, "", p_sys->psz_name, "", s, p_sys->out )) )
if( !(p_demux = demux2_New( s, "", p_sys->psz_name, "", s, p_sys->out,
VLC_FALSE )) )
{
return VLC_EGENERIC;
}
......
......@@ -44,7 +44,7 @@
*****************************************************************************/
static int Run ( input_thread_t *p_input );
static int Init ( input_thread_t *p_input );
static int Init ( input_thread_t *p_input, vlc_bool_t b_quick );
static void Error( input_thread_t *p_input );
static void End ( input_thread_t *p_input );
......@@ -55,9 +55,9 @@ static vlc_bool_t Control( input_thread_t *, int, vlc_value_t );
static int UpdateFromAccess( input_thread_t * );
static int UpdateFromDemux( input_thread_t * );
static int UpdateMeta( input_thread_t * );
static int UpdateMeta( input_thread_t *, vlc_bool_t );
static void UpdateItemLength( input_thread_t *, int64_t i_length );
static void UpdateItemLength( input_thread_t *, int64_t i_length, vlc_bool_t );
static void ParseOption( input_thread_t *p_input, const char *psz_option );
......@@ -67,7 +67,8 @@ static void MRLSections( input_thread_t *, char *, int *, int *, int *, int *);
static input_source_t *InputSourceNew( input_thread_t *);
static int InputSourceInit( input_thread_t *, input_source_t *,
char *, char *psz_forced_demux );
char *, char *psz_forced_demux,
vlc_bool_t b_quick );
static void InputSourceClean( input_thread_t *, input_source_t * );
static void SlaveDemux( input_thread_t *p_input );
......@@ -237,6 +238,99 @@ input_thread_t *__input_CreateThread( vlc_object_t *p_parent,
return p_input;
}
/*****************************************************************************
* input_PreParse: Lightweight input for playlist item preparsing
*****************************************************************************/
int __input_Preparse( vlc_object_t *p_parent, input_item_t *p_item )
{
input_thread_t *p_input; /* thread descriptor */
int i;
/* Allocate descriptor */
p_input = vlc_object_create( p_parent, VLC_OBJECT_INPUT );
if( p_input == NULL )
{
msg_Err( p_parent, "out of memory" );
return VLC_EGENERIC;
}
/* Init Common fields */
p_input->b_eof = VLC_FALSE;
p_input->b_can_pace_control = VLC_TRUE;
p_input->i_start = 0;
p_input->i_time = 0;
p_input->i_stop = 0;
p_input->i_title = 0;
p_input->title = NULL;
p_input->i_title_offset = p_input->i_seekpoint_offset = 0;
p_input->i_state = INIT_S;
p_input->i_rate = INPUT_RATE_DEFAULT;
p_input->i_bookmark = 0;
p_input->bookmark = NULL;
p_input->p_meta = NULL;
p_input->p_es_out = NULL;
p_input->p_sout = NULL;
p_input->b_out_pace_control = VLC_FALSE;
p_input->i_pts_delay = 0;
/* Init Input fields */
p_input->input.p_item = p_item;
p_input->input.p_access = NULL;
p_input->input.p_stream = NULL;
p_input->input.p_demux = NULL;
p_input->input.b_title_demux = VLC_FALSE;
p_input->input.i_title = 0;
p_input->input.title = NULL;
p_input->input.i_title_offset = p_input->input.i_seekpoint_offset = 0;
p_input->input.b_can_pace_control = VLC_TRUE;
p_input->input.b_eof = VLC_FALSE;
p_input->input.i_cr_average = 0;
/* No slave */
p_input->i_slave = 0;
p_input->slave = NULL;
/* Init control buffer */
vlc_mutex_init( p_input, &p_input->lock_control );
p_input->i_control = 0;
/* Parse input options */
vlc_mutex_lock( &p_item->lock );
for( i = 0; i < p_item->i_options; i++ )
{
ParseOption( p_input, p_item->ppsz_options[i] );
}
vlc_mutex_unlock( &p_item->lock );
/* Create Object Variables for private use only */
input_ConfigVarInit( p_input );
p_input->input.i_cr_average = var_GetInteger( p_input, "cr-average" );
/* Now we can attach our new input */
vlc_object_attach( p_input, p_parent );
Init( p_input, VLC_TRUE );
/* Clean up master */
InputSourceClean( p_input, &p_input->input );
/* Kill access and demux */
if( p_input->input.p_access ) p_input->input.p_access->b_die = VLC_TRUE;
if( p_input->input.p_demux ) p_input->input.p_access->b_die = VLC_TRUE;
/* Unload all modules */
if( p_input->p_es_out ) input_EsOutDelete( p_input->p_es_out );
/* Delete meta */
if( p_input->p_meta ) vlc_meta_Delete( p_input->p_meta );
vlc_object_detach( p_input );
vlc_object_destroy( p_input );
return VLC_SUCCESS;
}
/*****************************************************************************
* input_StopThread: mark an input thread as zombie
*****************************************************************************
......@@ -313,7 +407,7 @@ static int Run( input_thread_t *p_input )
/* Signal that the thread is launched */
vlc_thread_ready( p_input );
if( Init( p_input ) )
if( Init( p_input, VLC_FALSE ) )
{
/* If we failed, wait before we are killed, and exit */
p_input->b_error = VLC_TRUE;
......@@ -467,7 +561,7 @@ static int Run( input_thread_t *p_input )
if( old_val.i_time != val.i_time )
{
UpdateItemLength( p_input, i_length );
UpdateItemLength( p_input, i_length, VLC_TRUE );
}
}
......@@ -505,10 +599,8 @@ static int Run( input_thread_t *p_input )
return 0;
}
/*****************************************************************************
* Init: init the input Thread
*****************************************************************************/
static int Init( input_thread_t * p_input )
static int Init( input_thread_t * p_input, vlc_bool_t b_quick )
{
char *psz;
char *psz_subtitle;
......@@ -519,18 +611,22 @@ static int Init( input_thread_t * p_input )
int i, i_delay;
/* Initialize optional stream output. (before access/demuxer) */
psz = var_GetString( p_input, "sout" );
if( *psz )
if( !b_quick )
{
p_input->p_sout = sout_NewInstance( p_input, psz );
if( p_input->p_sout == NULL )
psz = var_GetString( p_input, "sout" );
if( *psz )
{
msg_Err( p_input, "cannot start stream output instance, aborting" );
free( psz );
return VLC_EGENERIC;
p_input->p_sout = sout_NewInstance( p_input, psz );
if( p_input->p_sout == NULL )
{
msg_Err( p_input, "cannot start stream output instance," \
"aborting" );
free( psz );
return VLC_EGENERIC;
}
}
free( psz );
}
free( psz );
/* Create es out */
p_input->p_es_out = input_EsOutNew( p_input );
......@@ -538,40 +634,43 @@ static int Init( input_thread_t * p_input )
es_out_Control( p_input->p_es_out, ES_OUT_SET_MODE, ES_OUT_MODE_NONE );
if( InputSourceInit( p_input, &p_input->input,
p_input->input.p_item->psz_uri, NULL ) )
p_input->input.p_item->psz_uri, NULL, b_quick ) )
{
goto error;
}
/* Create global title (from master) */
p_input->i_title = p_input->input.i_title;
p_input->title = p_input->input.title;
p_input->i_title_offset = p_input->input.i_title_offset;
p_input->i_seekpoint_offset = p_input->input.i_seekpoint_offset;
if( p_input->i_title > 0 )
if( !b_quick )
{
/* Setup variables */
input_ControlVarNavigation( p_input );
input_ControlVarTitle( p_input, 0 );
}
p_input->i_title = p_input->input.i_title;
p_input->title = p_input->input.title;
p_input->i_title_offset = p_input->input.i_title_offset;
p_input->i_seekpoint_offset = p_input->input.i_seekpoint_offset;
if( p_input->i_title > 0 )
{
/* Setup variables */
input_ControlVarNavigation( p_input );
input_ControlVarTitle( p_input, 0 );
}
/* Global flag */
p_input->b_can_pace_control = p_input->input.b_can_pace_control;
p_input->b_can_pause = p_input->input.b_can_pause;
/* Global flag */
p_input->b_can_pace_control = p_input->input.b_can_pace_control;
p_input->b_can_pause = p_input->input.b_can_pause;
/* Fix pts delay */
if( p_input->i_pts_delay <= 0 )
p_input->i_pts_delay = DEFAULT_PTS_DELAY;
/* Fix pts delay */
if( p_input->i_pts_delay <= 0 )
p_input->i_pts_delay = DEFAULT_PTS_DELAY;
/* If the desynchronisation requested by the user is < 0, we need to
* cache more data. */
var_Get( p_input, "audio-desync", &val );
if( val.i_int < 0 ) p_input->i_pts_delay -= (val.i_int * 1000);
/* If the desynchronisation requested by the user is < 0, we need to
* cache more data. */
var_Get( p_input, "audio-desync", &val );
if( val.i_int < 0 ) p_input->i_pts_delay -= (val.i_int * 1000);
/* Update cr_average depending on the caching */
p_input->input.i_cr_average *= (10 * p_input->i_pts_delay / 200000);
p_input->input.i_cr_average /= 10;
if( p_input->input.i_cr_average <= 0 ) p_input->input.i_cr_average = 1;
/* Update cr_average depending on the caching */
p_input->input.i_cr_average *= (10 * p_input->i_pts_delay / 200000);
p_input->input.i_cr_average /= 10;
if( p_input->input.i_cr_average <= 0 ) p_input->input.i_cr_average = 1;
}
/* Load master infos */
/* Init length */
......@@ -579,224 +678,239 @@ static int Init( input_thread_t * p_input )
&val.i_time ) && val.i_time > 0 )
{
var_Change( p_input, "length", VLC_VAR_SETVALUE, &val, NULL );
UpdateItemLength( p_input, val.i_time );
UpdateItemLength( p_input, val.i_time, b_quick );
p_input->input.p_item->i_duration = val.i_time;
}
/* Start title/chapter */
val.i_int = p_input->input.i_title_start -
p_input->input.i_title_offset;
if( val.i_int > 0 && val.i_int < p_input->input.i_title )
input_ControlPush( p_input, INPUT_CONTROL_SET_TITLE, &val );
val.i_int = p_input->input.i_seekpoint_start -
p_input->input.i_seekpoint_offset;
if( val.i_int > 0 /* TODO: check upper boundary */ )
input_ControlPush( p_input, INPUT_CONTROL_SET_SEEKPOINT, &val );
/* Start time*/
/* Set start time */
p_input->i_start = (int64_t)var_GetInteger( p_input, "start-time" ) *
I64C(1000000);
p_input->i_stop = (int64_t)var_GetInteger( p_input, "stop-time" ) *
I64C(1000000);
if( p_input->i_start > 0 )
{
if( p_input->i_start >= val.i_time )
if( !b_quick )
{
val.i_int = p_input->input.i_title_start -
p_input->input.i_title_offset;
if( val.i_int > 0 && val.i_int < p_input->input.i_title )
input_ControlPush( p_input, INPUT_CONTROL_SET_TITLE, &val );
val.i_int = p_input->input.i_seekpoint_start -
p_input->input.i_seekpoint_offset;
if( val.i_int > 0 /* TODO: check upper boundary */ )
input_ControlPush( p_input, INPUT_CONTROL_SET_SEEKPOINT, &val );
/* Start time*/
/* Set start time */
p_input->i_start = (int64_t)var_GetInteger( p_input, "start-time" ) *
I64C(1000000);
p_input->i_stop = (int64_t)var_GetInteger( p_input, "stop-time" ) *
I64C(1000000);
if( p_input->i_start > 0 )
{
msg_Warn( p_input, "invalid start-time ignored" );
}
else
{
vlc_value_t s;
if( p_input->i_start >= val.i_time )
{
msg_Warn( p_input, "invalid start-time ignored" );
}
else
{
vlc_value_t s;
msg_Dbg( p_input, "start-time: %ds",
(int)( p_input->i_start / I64C(1000000) ) );
msg_Dbg( p_input, "start-time: %ds",
(int)( p_input->i_start / I64C(1000000) ) );
s.i_time = p_input->i_start;
input_ControlPush( p_input, INPUT_CONTROL_SET_TIME, &s );
s.i_time = p_input->i_start;
input_ControlPush( p_input, INPUT_CONTROL_SET_TIME, &s );
}
}
}
if( p_input->i_stop > 0 && p_input->i_stop <= p_input->i_start )
{
msg_Warn( p_input, "invalid stop-time ignored" );
p_input->i_stop = 0;
}
/* Load subtitles */
/* Get fps and set it if not already set */
if( !demux2_Control( p_input->input.p_demux, DEMUX_GET_FPS, &f_fps ) &&
f_fps > 1.0 )
{
vlc_value_t fps;
float f_requested_fps;
var_Create( p_input, "sub-original-fps", VLC_VAR_FLOAT );
var_SetFloat( p_input, "sub-original-fps", f_fps );
f_requested_fps = var_CreateGetFloat( p_input, "sub-fps" );
if( f_requested_fps != f_fps )
if( p_input->i_stop > 0 && p_input->i_stop <= p_input->i_start )
{
var_Create( p_input, "sub-fps", VLC_VAR_FLOAT| VLC_VAR_DOINHERIT );
var_SetFloat( p_input, "sub-fps", f_requested_fps );
msg_Warn( p_input, "invalid stop-time ignored" );
p_input->i_stop = 0;
}
}
i_delay = var_CreateGetInteger( p_input, "sub-delay" );
if( i_delay != 0 )
{
var_SetTime( p_input, "spu-delay", (mtime_t)i_delay * 100000 );
}
/* Load subtitles */
/* Get fps and set it if not already set */
if( !demux2_Control( p_input->input.p_demux, DEMUX_GET_FPS, &f_fps ) &&
f_fps > 1.0 )
{
float f_requested_fps;
var_Create( p_input, "sub-original-fps", VLC_VAR_FLOAT );
var_SetFloat( p_input, "sub-original-fps", f_fps );
/* Look for and add subtitle files */
psz_subtitle = var_GetString( p_input, "sub-file" );
if( *psz_subtitle )
{
input_source_t *sub;
vlc_value_t count;
vlc_value_t list;
f_requested_fps = var_CreateGetFloat( p_input, "sub-fps" );
if( f_requested_fps != f_fps )
{
var_Create( p_input, "sub-fps", VLC_VAR_FLOAT|