/*****************************************************************************
* input.c: input thread
- * Read a stream, demultiplex and parse it before sending it to
- * decoders.
*****************************************************************************
* Copyright (C) 1998-2004 VideoLAN
- * $Id: input.c,v 1.275 2004/01/10 23:46:39 sigmunau Exp $
+ * $Id$
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
+ * Laurent Aimar <fenrir@via.ecp.fr>
*
* 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
* Preamble
*****************************************************************************/
#include <stdlib.h>
+#include <ctype.h>
#include <vlc/vlc.h>
#include <vlc/input.h>
#include <vlc/decoder.h>
#include <vlc/vout.h>
-#ifdef HAVE_SYS_TIMES_H
-# include <sys/times.h>
-#endif
-
-#include "vlc_playlist.h"
+#include "input_internal.h"
#include "stream_output.h"
#include "vlc_interface.h"
-#include "codecs.h"
-#include "../../modules/demux/util/sub.h"
+#include "vlc_meta.h"
/*****************************************************************************
* Local prototypes
*****************************************************************************/
-struct input_thread_sys_t
-{
- /* subtitles */
- int i_sub;
- subtitle_demux_t **sub;
-};
+static int Run ( input_thread_t *p_input );
-static int RunThread ( input_thread_t *p_input );
-static int InitThread ( input_thread_t *p_input );
-static void ErrorThread ( input_thread_t *p_input );
-static void EndThread ( input_thread_t *p_input );
+static int Init ( input_thread_t *p_input );
+static void Error( input_thread_t *p_input );
+static void End ( input_thread_t *p_input );
-static void ParseOption ( input_thread_t *p_input,
- const char *psz_option );
+static inline int ControlPopNoLock( input_thread_t *, int *, vlc_value_t * );
+static void ControlReduce( input_thread_t * );
+static vlc_bool_t Control( input_thread_t *, int, vlc_value_t );
-/*****************************************************************************
- * Callbacks
- *****************************************************************************/
-static int PositionCallback( vlc_object_t *p_this, char const *psz_cmd,
- vlc_value_t oldval, vlc_value_t newval, void *p_data );
-static int TimeCallback ( vlc_object_t *p_this, char const *psz_cmd,
- vlc_value_t oldval, vlc_value_t newval, void *p_data );
-static int StateCallback ( vlc_object_t *p_this, char const *psz_cmd,
- vlc_value_t oldval, vlc_value_t newval, void *p_data );
-static int RateCallback ( vlc_object_t *p_this, char const *psz_cmd,
- vlc_value_t oldval, vlc_value_t newval, void *p_data );
+
+static int UpdateFromAccess( input_thread_t * );
+static int UpdateFromDemux( input_thread_t * );
+
+static void UpdateItemLength( input_thread_t *, int64_t i_length );
+
+static void ParseOption( input_thread_t *p_input, const char *psz_option );
+
+static void DecodeUrl ( char * );
+static void MRLSplit( input_thread_t *, char *, char **, char **, char ** );
+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 );
+static void InputSourceClean( input_thread_t *, input_source_t * );
+
+static void SlaveDemux( input_thread_t *p_input );
+static void SlaveSeek( input_thread_t *p_input );
+
+static vlc_meta_t *InputMetaUser( input_thread_t *p_input );
/*****************************************************************************
* input_CreateThread: creates a new input thread
*****************************************************************************
* This function creates a new input, and returns a pointer
* to its description. On error, it returns NULL.
+ *
+ * Variables for _public_ use:
+ * * Get and Set:
+ * - state
+ * - rate,rate-slower, rate-faster
+ * - position, position-offset
+ * - time, time-offset
+ * - title,title-next,title-prev
+ * - chapter,chapter-next, chapter-prev
+ * - program, audio-es, video-es, spu-es
+ * - audio-delay, spu-delay
+ * - bookmark
+ * * Get only:
+ * - length
+ * - bookmarks
+ * - seekable (if you can seek, it doesn't say if 'bar display' has be shown or not, for that check position != 0.0)
+ * * For intf callback upon changes
+ * - intf-change
+ * TODO explain when Callback is called
+ * TODO complete this list (?)
*****************************************************************************/
input_thread_t *__input_CreateThread( vlc_object_t *p_parent,
- playlist_item_t *p_item )
+ input_item_t *p_item )
+
{
- input_thread_t * p_input; /* thread descriptor */
- input_info_category_t * p_info;
+ input_thread_t *p_input; /* thread descriptor */
vlc_value_t val;
- int i,j;
+ int i;
/* Allocate descriptor */
p_input = vlc_object_create( p_parent, VLC_OBJECT_INPUT );
return NULL;
}
+ /* 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_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 */
- for( i = 0 ; i < p_item->i_categories ; i++ )
+ vlc_mutex_lock( &p_item->lock );
+ for( i = 0; i < p_item->i_options; i++ )
{
- if( !strncmp( p_item->pp_categories[i]->psz_name, "Options", 7 ) )
- {
- msg_Dbg(p_input,"Parsing %i options for item",
- p_item->pp_categories[i]->i_infos );
- for( j = 0; j< p_item->pp_categories[i]->i_infos ; j++ )
- {
- msg_Dbg(p_input,"Option : %s",
- p_item->pp_categories[i]->pp_infos[j]->psz_name);
- ParseOption( p_input,
- p_item->pp_categories[i]->pp_infos[j]->psz_value);
- }
- break;
- }
+// msg_Dbg( p_input, "option: %s", p_item->ppsz_options[i] );
+ ParseOption( p_input, p_item->ppsz_options[i] );
}
+ vlc_mutex_unlock( &p_item->lock );
- /* Create a few object variables we'll need later on */
- var_Create( p_input, "video", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
- var_Create( p_input, "audio", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
- var_Create( p_input, "audio-channel", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT );
- var_Create( p_input, "spu-channel", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT );
- var_Create( p_input, "sub-file", VLC_VAR_FILE | VLC_VAR_DOINHERIT );
- var_Create( p_input, "sub-autodetect-file", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
- var_Create( p_input, "sub-autodetect-fuzzy", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
-
- var_Create( p_input, "sout", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
- var_Create( p_input, "sout-all", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
- var_Create( p_input, "sout-audio", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
- var_Create( p_input, "sout-video", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
- var_Create( p_input, "sout-keep", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
-
- /* decoders */
- var_Create( p_input, "minimize-threads", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
-
- /* play status */
-
- /* position variable */
- var_Create( p_input, "position", VLC_VAR_FLOAT ); /* position 0.0->1.0 */
- var_Create( p_input, "position-offset", VLC_VAR_FLOAT ); /* relative */
- val.f_float = 0.0;
- var_Change( p_input, "position", VLC_VAR_SETVALUE, &val, NULL );
- var_AddCallback( p_input, "position", PositionCallback, NULL );
- var_AddCallback( p_input, "position-offset", PositionCallback, NULL );
-
- /* time variable */
- var_Create( p_input, "time", VLC_VAR_TIME );
- var_Create( p_input, "time-offset", VLC_VAR_TIME ); /* relative */
- val.i_time = 0;
- var_Change( p_input, "time", VLC_VAR_SETVALUE, &val, NULL );
- var_AddCallback( p_input, "time", TimeCallback, NULL );
- var_AddCallback( p_input, "time-offset", TimeCallback, NULL );
-
- /* length variable */
- var_Create( p_input, "length", VLC_VAR_TIME );
- val.i_time = 0;
- var_Change( p_input, "length", VLC_VAR_SETVALUE, &val, NULL );
-
- /* rate variable */
- var_Create( p_input, "rate", VLC_VAR_INTEGER );
- var_Create( p_input, "rate-slower", VLC_VAR_VOID );
- var_Create( p_input, "rate-faster", VLC_VAR_VOID );
- val.i_int = DEFAULT_RATE;
- var_Change( p_input, "rate", VLC_VAR_SETVALUE, &val, NULL );
- var_AddCallback( p_input, "rate", RateCallback, NULL );
- var_AddCallback( p_input, "rate-slower", RateCallback, NULL );
- var_AddCallback( p_input, "rate-faster", RateCallback, NULL );
-
- /* state variable */
- var_Create( p_input, "state", VLC_VAR_INTEGER );
- val.i_int = INIT_S;
- var_Change( p_input, "state", VLC_VAR_SETVALUE, &val, NULL );
- var_AddCallback( p_input, "state", StateCallback, NULL );
+ /* Create Object Variables for private use only */
+ input_ConfigVarInit( p_input );
- /* state variable */
- var_Create( p_input, "demuxed-id3", VLC_VAR_BOOL );
- val.b_bool = VLC_FALSE;
- var_Change( p_input, "demuxed-id3", VLC_VAR_SETVALUE, &val, NULL );
+ /* Create Objects variables for public Get and Set */
+ input_ControlVarInit( p_input );
+ p_input->input.i_cr_average = var_GetInteger( p_input, "cr-average" );
- /* Initialize thread properties */
- p_input->b_eof = 0;
- p_input->p_sys = NULL;
-
- /* Set target */
- p_input->psz_source = strdup( p_item->psz_uri );
-
- /* Stream */
- p_input->s = NULL;
-
- /* es out */
- p_input->p_es_out = NULL;
-
- /* Demux */
- p_input->p_demux = NULL;
- p_input->pf_demux = NULL;
- p_input->pf_rewind = NULL;
- p_input->pf_demux_control = NULL;
- p_input->i_cr_average = config_GetInt( p_input, "cr-average" );
-
- /* Access */
- p_input->p_access = NULL;
-
- p_input->i_bufsize = 0;
- p_input->i_mtu = 0;
- p_input->i_pts_delay = DEFAULT_PTS_DELAY;
-
- /* Initialize statistics */
- p_input->c_loops = 0;
- p_input->stream.c_packets_read = 0;
- p_input->stream.c_packets_trashed = 0;
-
- /* Set locks. */
- vlc_mutex_init( p_input, &p_input->stream.stream_lock );
- vlc_cond_init( p_input, &p_input->stream.stream_wait );
- vlc_mutex_init( p_input, &p_input->stream.control.control_lock );
-
- /* Initialize stream description */
- p_input->stream.b_changed = 0;
- p_input->stream.i_es_number = 0;
- p_input->stream.i_selected_es_number = 0;
- p_input->stream.i_pgrm_number = 0;
- p_input->stream.i_new_status = p_input->stream.i_new_rate = 0;
- p_input->stream.b_new_mute = MUTE_NO_CHANGE;
- p_input->stream.i_mux_rate = 0;
- p_input->stream.b_seekable = 0;
- p_input->stream.p_sout = NULL;
-
- /* no stream, no program, no area, no es */
- p_input->stream.p_new_program = NULL;
-
- p_input->stream.i_area_nb = 0;
- p_input->stream.pp_areas = NULL;
- p_input->stream.p_selected_area = NULL;
- p_input->stream.p_new_area = NULL;
-
- p_input->stream.pp_selected_es = NULL;
- p_input->stream.p_removed_es = NULL;
- p_input->stream.p_newly_selected_es = NULL;
-
- /* By default there is one area in a stream */
- input_AddArea( p_input, 0, 1 );
- p_input->stream.p_selected_area = p_input->stream.pp_areas[0];
-
- /* Initialize stream control properties. */
- p_input->stream.control.i_status = INIT_S;
- p_input->stream.control.i_rate = DEFAULT_RATE;
- p_input->stream.control.b_mute = 0;
- p_input->stream.control.b_grayscale = config_GetInt( p_input, "grayscale" );
-
- /* Initialize input info */
- p_input->stream.p_info = malloc( sizeof( input_info_category_t ) );
- if( !p_input->stream.p_info )
+ /* TODO */
+ var_Get( p_input, "bookmarks", &val );
+ if( val.psz_string )
{
- msg_Err( p_input, "No memory!" );
- return NULL;
+ /* FIXME: have a common cfg parsing routine used by sout and others */
+ char *psz_parser, *psz_start, *psz_end;
+ psz_parser = val.psz_string;
+ while( (psz_start = strchr( psz_parser, '{' ) ) )
+ {
+ seekpoint_t seekpoint;
+ char backup;
+ psz_start++;
+ psz_end = strchr( psz_start, '}' );
+ if( !psz_end ) break;
+ psz_parser = psz_end + 1;
+ backup = *psz_parser;
+ *psz_parser = 0;
+ *psz_end = ',';
+
+ seekpoint.psz_name = 0;
+ seekpoint.i_byte_offset = 0;
+ seekpoint.i_time_offset = 0;
+ while( (psz_end = strchr( psz_start, ',' ) ) )
+ {
+ *psz_end = 0;
+ if( !strncmp( psz_start, "name=", 5 ) )
+ {
+ seekpoint.psz_name = psz_start + 5;
+ }
+ else if( !strncmp( psz_start, "bytes=", 6 ) )
+ {
+ seekpoint.i_byte_offset = atoll(psz_start + 6);
+ }
+ else if( !strncmp( psz_start, "time=", 5 ) )
+ {
+ seekpoint.i_time_offset = atoll(psz_start + 5) * 1000000;
+ }
+ psz_start = psz_end + 1;
+ }
+ msg_Dbg( p_input, "adding bookmark: %s, bytes="I64Fd", time="I64Fd,
+ seekpoint.psz_name, seekpoint.i_byte_offset,
+ seekpoint.i_time_offset );
+ input_Control( p_input, INPUT_ADD_BOOKMARK, &seekpoint );
+ *psz_parser = backup;
+ }
+ free( val.psz_string );
}
- p_input->stream.p_info->psz_name = strdup("General") ;
- p_input->stream.p_info->p_info = NULL;
- p_input->stream.p_info->p_next = NULL;
- msg_Info( p_input, "playlist item `%s'", p_input->psz_source );
-
- p_info = input_InfoCategory( p_input, _("General") );
- input_AddInfo( p_info, _("Playlist Item"), p_input->psz_source );
+ /* Now we can attach our new input */
vlc_object_attach( p_input, p_parent );
/* Create thread and wait for its readiness. */
- if( vlc_thread_create( p_input, "input", RunThread,
+ if( vlc_thread_create( p_input, "input", Run,
VLC_THREAD_PRIORITY_INPUT, VLC_TRUE ) )
{
msg_Err( p_input, "cannot create input thread" );
- free( p_input );
+ vlc_object_detach( p_input );
+ vlc_object_destroy( p_input );
return NULL;
}
*****************************************************************************/
void input_StopThread( input_thread_t *p_input )
{
- /* Make the thread exit from a possible vlc_cond_wait() */
- vlc_mutex_lock( &p_input->stream.stream_lock );
- /* Request thread destruction */
- p_input->b_die = 1;
+ vlc_list_t *p_list;
+ int i;
+
+ /* Set die for input */
+ p_input->b_die = VLC_TRUE;
+
+ /* We cannot touch p_input fields directly (we can from another thread),
+ * so use the vlc_object_find way, it's perfectly safe */
+
+ /* Set die for all access */
+ p_list = vlc_list_find( p_input, VLC_OBJECT_ACCESS, FIND_CHILD );
+ for( i = 0; i < p_list->i_count; i++ )
+ {
+ p_list->p_values[i].p_object->b_die = VLC_TRUE;
+ }
+ vlc_list_release( p_list );
+
+ /* Set die for all stream */
+ p_list = vlc_list_find( p_input, VLC_OBJECT_STREAM, FIND_CHILD );
+ for( i = 0; i < p_list->i_count; i++ )
+ {
+ p_list->p_values[i].p_object->b_die = VLC_TRUE;
+ }
+ vlc_list_release( p_list );
+
+ /* Set die for all demux */
+ p_list = vlc_list_find( p_input, VLC_OBJECT_DEMUX, FIND_CHILD );
+ for( i = 0; i < p_list->i_count; i++ )
+ {
+ p_list->p_values[i].p_object->b_die = VLC_TRUE;
+ }
+ vlc_list_release( p_list );
- vlc_cond_signal( &p_input->stream.stream_wait );
- vlc_mutex_unlock( &p_input->stream.stream_lock );
+ input_ControlPush( p_input, INPUT_CONTROL_SET_DIE, NULL );
}
/*****************************************************************************
/* Join the thread */
vlc_thread_join( p_input );
- /* Destroy Mutex locks */
- vlc_mutex_destroy( &p_input->stream.control.control_lock );
- vlc_cond_destroy( &p_input->stream.stream_wait );
- vlc_mutex_destroy( &p_input->stream.stream_lock );
+ /* Delete input lock (only after thread joined) */
+ vlc_mutex_destroy( &p_input->lock_control );
+
+ /* TODO: maybe input_DestroyThread should also delete p_input instead
+ * of the playlist but I'm not sure if it's possible */
}
/*****************************************************************************
- * RunThread: main thread loop
+ * Run: main thread loop
*****************************************************************************
* Thread in charge of processing the network packets and demultiplexing.
+ *
+ * TODO:
+ * read subtitle support (XXX take care of spu-delay in the right way).
+ * multi-input support (XXX may be done with subs)
*****************************************************************************/
-static int RunThread( input_thread_t *p_input )
+static int Run( input_thread_t *p_input )
{
- vlc_value_t val;
- mtime_t i_update_next = -1;
+ int64_t i_intf_update = 0;
- /* Signal right now, otherwise we'll get stuck in a peek */
+ /* Signal that the thread is launched */
vlc_thread_ready( p_input );
- if( InitThread( p_input ) )
+ if( Init( p_input ) )
{
/* If we failed, wait before we are killed, and exit */
- p_input->b_error = 1;
+ p_input->b_error = VLC_TRUE;
- ErrorThread( p_input );
+ Error( p_input );
/* Tell we're dead */
- p_input->b_dead = 1;
+ p_input->b_dead = VLC_TRUE;
return 0;
}
- /* initialization is complete */
- vlc_mutex_lock( &p_input->stream.stream_lock );
- p_input->stream.b_changed = 1;
- p_input->stream.control.i_status = PLAYING_S;
- vlc_mutex_unlock( &p_input->stream.stream_lock );
+ /* Main loop */
+ while( !p_input->b_die && !p_input->b_error && !p_input->input.b_eof )
+ {
+ vlc_bool_t b_force_update = VLC_FALSE;
+ int i_ret;
+ int i_type;
+ vlc_value_t val;
- val.i_int = PLAYING_S;
- var_Change( p_input, "state", VLC_VAR_SETVALUE, &val, NULL );
+ /* Do the read */
+ if( p_input->i_state != PAUSE_S )
+ {
+ if( p_input->i_stop <= 0 || p_input->i_time < p_input->i_stop )
+ i_ret=p_input->input.p_demux->pf_demux(p_input->input.p_demux);
+ else
+ i_ret = 0; /* EOF */
- while( !p_input->b_die && !p_input->b_error && !p_input->b_eof )
- {
- unsigned int i, i_count;
+ if( i_ret > 0 )
+ {
+ /* TODO */
+ if( p_input->input.b_title_demux &&
+ p_input->input.p_demux->info.i_update )
+ {
+ i_ret = UpdateFromDemux( p_input );
+ b_force_update = VLC_TRUE;
+ }
+ else if( !p_input->input.b_title_demux &&
+ p_input->input.p_access &&
+ p_input->input.p_access->info.i_update )
+ {
+ i_ret = UpdateFromAccess( p_input );
+ b_force_update = VLC_TRUE;
+ }
+ }
+
+ if( i_ret == 0 ) /* EOF */
+ {
+ vlc_value_t repeat;
+
+ var_Get( p_input, "input-repeat", &repeat );
+ if( repeat.i_int == 0 )
+ {
+ /* End of file - we do not set b_die because only the
+ * playlist is allowed to do so. */
+ msg_Dbg( p_input, "EOF reached" );
+ p_input->input.b_eof = VLC_TRUE;
+ }
+ else
+ {
+ msg_Dbg( p_input, "repeating the same input (%d)",
+ repeat.i_int );
+ if( repeat.i_int > 0 )
+ {
+ repeat.i_int--;
+ var_Set( p_input, "input-repeat", repeat );
+ }
- p_input->c_loops++;
+ /* Seek to start title/seekpoint */
+ 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 )
+ val.i_int = 0;
+ 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 );
+
+ /* Seek to start position */
+ if( p_input->i_start > 0 )
+ {
+ val.i_time = p_input->i_start;
+ input_ControlPush( p_input, INPUT_CONTROL_SET_TIME,
+ &val );
+ }
+ else
+ {
+ val.f_float = 0.0;
+ input_ControlPush( p_input, INPUT_CONTROL_SET_POSITION,
+ &val );
+ }
+ }
+ }
+ else if( i_ret < 0 )
+ {
+ p_input->b_error = VLC_TRUE;
+ }
+
+ if( i_ret > 0 && p_input->i_slave > 0 )
+ {
+ SlaveDemux( p_input );
+ }
+ }
+ else
+ {
+ /* Small wait */
+ msleep( 10*1000 );
+ }
- vlc_mutex_lock( &p_input->stream.stream_lock );
+ /* Handle control */
+ vlc_mutex_lock( &p_input->lock_control );
+ ControlReduce( p_input );
+ while( !ControlPopNoLock( p_input, &i_type, &val ) )
+ {
+ msg_Dbg( p_input, "control type=%d", i_type );
+ if( Control( p_input, i_type, val ) )
+ b_force_update = VLC_TRUE;
+ }
+ vlc_mutex_unlock( &p_input->lock_control );
- if( p_input->stream.p_new_program )
+ if( b_force_update || i_intf_update < mdate() )
{
- if( p_input->pf_set_program != NULL )
+ vlc_value_t val;
+ double f_pos;
+ int64_t i_time, i_length;
+ /* update input status variables */
+ if( !demux2_Control( p_input->input.p_demux,
+ DEMUX_GET_POSITION, &f_pos ) )
{
+ val.f_float = (float)f_pos;
+ var_Change( p_input, "position", VLC_VAR_SETVALUE, &val, NULL );
+ }
+ if( !demux2_Control( p_input->input.p_demux,
+ DEMUX_GET_TIME, &i_time ) )
+ {
+ p_input->i_time = i_time;
+ val.i_time = i_time;
+ var_Change( p_input, "time", VLC_VAR_SETVALUE, &val, NULL );
+ }
+ if( !demux2_Control( p_input->input.p_demux,
+ DEMUX_GET_LENGTH, &i_length ) )
+ {
+ vlc_value_t old_val;
+ var_Get( p_input, "length", &old_val );
+ val.i_time = i_length;
+ var_Change( p_input, "length", VLC_VAR_SETVALUE, &val, NULL );
+
+ if( old_val.i_time != val.i_time )
+ {
+ UpdateItemLength( p_input, i_length );
+ }
+ }
+
+ var_SetBool( p_input, "intf-change", VLC_TRUE );
+ i_intf_update = mdate() + I64C(150000);
+ }
+ }
- /* Reinitialize buffer manager. */
- input_AccessReinit( p_input );
+ if( !p_input->b_eof && !p_input->b_error && p_input->input.b_eof )
+ {
+ /* We have finish to demux data but not to play them */
+ while( !p_input->b_die )
+ {
+ if( input_EsOutDecodersEmpty( p_input->p_es_out ) )
+ break;
- p_input->pf_set_program( p_input,
- p_input->stream.p_new_program );
+ msg_Dbg( p_input, "waiting decoder fifos to empty" );
- /* Escape all decoders for the stream discontinuity they
- * will encounter. */
- input_EscapeDiscontinuity( p_input );
+ msleep( INPUT_IDLE_SLEEP );
+ }
- for( i = 0; i < p_input->stream.i_pgrm_number; i++ )
+ /* We have finished */
+ p_input->b_eof = VLC_TRUE;
+ }
+
+ /* Wait we are asked to die */
+ if( !p_input->b_die )
+ {
+ Error( p_input );
+ }
+
+ /* Clean up */
+ End( p_input );
+
+ return 0;
+}
+
+/*****************************************************************************
+ * Init: init the input Thread
+ *****************************************************************************/
+static int Init( input_thread_t * p_input )
+{
+ char *psz;
+ char *psz_subtitle;
+ vlc_value_t val;
+ double f_fps;
+ vlc_meta_t *p_meta, *p_meta_user;
+ int i_es_out_mode;
+ int i, i_delay;
+
+ /* Initialize optional stream output. (before access/demuxer) */
+ psz = var_GetString( p_input, "sout" );
+ if( *psz )
+ {
+ 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 );
+
+ /* Create es out */
+ p_input->p_es_out = input_EsOutNew( p_input );
+ es_out_Control( p_input->p_es_out, ES_OUT_SET_ACTIVE, VLC_FALSE );
+ 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 ) )
+ {
+ 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 )
+ {
+ /* 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;
+
+ /* 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);
+
+ /* 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 */
+ if( !demux2_Control( p_input->input.p_demux, DEMUX_GET_LENGTH,
+ &val.i_time ) && val.i_time > 0 )
+ {
+ var_Change( p_input, "length", VLC_VAR_SETVALUE, &val, NULL );
+
+ UpdateItemLength( p_input, 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 )
+ {
+ 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) ) );
+
+ 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 )
+ {
+ var_Create( p_input, "sub-fps", VLC_VAR_FLOAT| VLC_VAR_DOINHERIT );
+ var_SetFloat( p_input, "sub-fps", f_requested_fps );
+ }
+ }
+
+ i_delay = var_CreateGetInteger( p_input, "sub-delay" );
+
+ if( i_delay != 0 )
+ {
+ var_SetTime( p_input, "spu-delay", (mtime_t)i_delay * 100000 );
+ }
+
+
+ /* 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;
+
+ msg_Dbg( p_input, "forced subtitle: %s", psz_subtitle );
+
+ var_Change( p_input, "spu-es", VLC_VAR_CHOICESCOUNT, &count, NULL );
+
+ /* */
+ sub = InputSourceNew( p_input );
+ if( !InputSourceInit( p_input, sub, psz_subtitle, "subtitle" ) )
+ {
+ TAB_APPEND( p_input->i_slave, p_input->slave, sub );
+
+ /* Select the ES */
+ if( !var_Change( p_input, "spu-es", VLC_VAR_GETLIST, &list, NULL ) )
+ {
+ if( count.i_int == 0 )
+ count.i_int++; /* if it was first one, there is disable too */
+
+ if( count.i_int < list.p_list->i_count )
{
- pgrm_descriptor_t * p_pgrm
- = p_input->stream.pp_programs[i];
+ input_ControlPush( p_input, INPUT_CONTROL_SET_ES,
+ &list.p_list->p_values[count.i_int] );
+ }
+ var_Change( p_input, "spu-es", VLC_VAR_FREELIST, &list, NULL );
+ }
+ }
+ }
+
+ var_Get( p_input, "sub-autodetect-file", &val );
+ if( val.b_bool )
+ {
+ char *psz_autopath = var_GetString( p_input, "sub-autodetect-path" );
+ char **subs = subtitles_Detect( p_input, psz_autopath,
+ p_input->input.p_item->psz_uri );
+ input_source_t *sub;
- /* Reinitialize synchro. */
- p_pgrm->i_synchro_state = SYNCHRO_REINIT;
+ for( i = 0; subs[i] != NULL; i++ )
+ {
+ if( strcmp( psz_subtitle, subs[i] ) )
+ {
+ sub = InputSourceNew( p_input );
+ if( !InputSourceInit( p_input, sub, subs[i], "subtitle" ) )
+ {
+ TAB_APPEND( p_input->i_slave, p_input->slave, sub );
}
}
- p_input->stream.p_new_program = NULL;
+ free( subs[i] );
+ }
+ free( subs );
+ free( psz_autopath );
+ }
+ free( psz_subtitle );
+
+ /* Look for slave */
+ psz = var_GetString( p_input, "input-slave" );
+ if( *psz )
+ {
+ char *psz_delim = strchr( psz, '#' );
+
+ for( ;; )
+ {
+ input_source_t *slave;
+
+ if( psz_delim )
+ {
+ *psz_delim++ = '\0';
+ }
+
+ if( *psz == '\0' )
+ {
+ if( psz_delim )
+ continue;
+ else
+ break;
+ }
+
+ msg_Dbg( p_input, "adding slave '%s'", psz );
+ slave = InputSourceNew( p_input );
+ if( !InputSourceInit( p_input, slave, psz, NULL ) )
+ {
+ TAB_APPEND( p_input->i_slave, p_input->slave, slave );
+ }
+ if( !psz_delim )
+ break;
+ }
+ }
+ free( psz );
+
+ /* Set up es_out */
+ es_out_Control( p_input->p_es_out, ES_OUT_SET_ACTIVE, VLC_TRUE );
+ i_es_out_mode = ES_OUT_MODE_AUTO;
+ val.p_list = NULL;
+ if( p_input->p_sout )
+ {
+ var_Get( p_input, "sout-all", &val );
+ if ( val.b_bool )
+ {
+ i_es_out_mode = ES_OUT_MODE_ALL;
+ val.p_list = NULL;
+ }
+ else
+ {
+ var_Get( p_input, "programs", &val );
+ if ( val.p_list && val.p_list->i_count )
+ {
+ i_es_out_mode = ES_OUT_MODE_PARTIAL;
+ /* Note : we should remove the "program" callback. */
+ }
+ else
+ var_Change( p_input, "programs", VLC_VAR_FREELIST, &val, NULL );
+ }
+ }
+ es_out_Control( p_input->p_es_out, ES_OUT_SET_MODE, i_es_out_mode );
+
+ /* Inform the demuxer about waited group (needed only for DVB) */
+ if( i_es_out_mode == ES_OUT_MODE_ALL )
+ {
+ demux2_Control( p_input->input.p_demux, DEMUX_SET_GROUP, -1, NULL );
+ }
+ else if( i_es_out_mode == ES_OUT_MODE_PARTIAL )
+ {
+ demux2_Control( p_input->input.p_demux, DEMUX_SET_GROUP, -1,
+ val.p_list );
+ }
+ else
+ {
+ demux2_Control( p_input->input.p_demux, DEMUX_SET_GROUP,
+ (int) var_GetInteger( p_input, "program" ), NULL );
+ }
+
+ if( p_input->p_sout )
+ {
+ if( p_input->p_sout->i_out_pace_nocontrol > 0 )
+ {
+ p_input->b_out_pace_control = VLC_FALSE;
}
+ else
+ {
+ p_input->b_out_pace_control = VLC_TRUE;
+ }
+ msg_Dbg( p_input, "starting in %s mode",
+ p_input->b_out_pace_control ? "asynch" : "synch" );
+ }
- if( p_input->stream.p_new_area )
+ /* Get meta data from users */
+ p_meta_user = InputMetaUser( p_input );
+
+ /* Get meta data from master input */
+ if( demux2_Control( p_input->input.p_demux, DEMUX_GET_META, &p_meta ) )
+ p_meta = NULL;
+
+ /* Merge them */
+ if( p_meta == NULL )
+ {
+ p_meta = p_meta_user;
+ }
+ else if( p_meta_user )
+ {
+ vlc_meta_Merge( p_meta, p_meta_user );
+ vlc_meta_Delete( p_meta_user );
+ }
+
+ /* Get meta data from slave input */
+ for( i = 0; i < p_input->i_slave; i++ )
+ {
+ vlc_meta_t *p_meta_slave;
+
+ if( !demux2_Control( p_input->slave[i]->p_demux, DEMUX_GET_META, &p_meta_slave ) )
{
- if( p_input->stream.b_seekable && p_input->pf_set_area != NULL )
+ if( p_meta == NULL )
+ {
+ p_meta = p_meta_slave;
+ }
+ else if( p_meta_slave )
{
- input_AccessReinit( p_input );
+ vlc_meta_Merge( p_meta, p_meta_slave );
+ vlc_meta_Delete( p_meta_slave );
+ }
+ }
+ }
+
+ if( p_meta && p_meta->i_meta > 0 )
+ {
+ msg_Dbg( p_input, "meta information:" );
+ for( i = 0; i < p_meta->i_meta; i++ )
+ {
+ msg_Dbg( p_input, " - '%s' = '%s'",
+ _(p_meta->name[i]), p_meta->value[i] );
- p_input->pf_set_area( p_input, p_input->stream.p_new_area );
+ if( !strcmp(p_meta->name[i], VLC_META_TITLE) && p_meta->value[i] )
+ input_Control( p_input, INPUT_SET_NAME, p_meta->value[i] );
- /* Escape all decoders for the stream discontinuity they
- * will encounter. */
- input_EscapeDiscontinuity( p_input );
+ if( !strcmp( p_meta->name[i], VLC_META_AUTHOR ) )
+ input_Control( p_input, INPUT_ADD_INFO, _("General"),
+ _("Author"), p_meta->value[i] );
+
+ input_Control( p_input, INPUT_ADD_INFO, _("Meta-information"),
+ _(p_meta->name[i]), "%s", p_meta->value[i] );
+ }
- for( i = 0; i < p_input->stream.i_pgrm_number; i++ )
+ for( i = 0; i < p_meta->i_track; i++ )
+ {
+ vlc_meta_t *tk = p_meta->track[i];
+ int j;
+
+ if( tk->i_meta > 0 )
+ {
+ char *psz_cat = malloc( strlen(_("Stream")) + 10 );
+
+ msg_Dbg( p_input, " - track[%d]:", i );
+
+ sprintf( psz_cat, "%s %d", _("Stream"), i );
+ for( j = 0; j < tk->i_meta; j++ )
{
- pgrm_descriptor_t * p_pgrm
- = p_input->stream.pp_programs[i];
+ msg_Dbg( p_input, " - '%s' = '%s'", _(tk->name[j]),
+ tk->value[j] );
- /* Reinitialize synchro. */
- p_pgrm->i_synchro_state = SYNCHRO_REINIT;
+ input_Control( p_input, INPUT_ADD_INFO, psz_cat,
+ _(tk->name[j]), "%s", tk->value[j] );
}
}
- p_input->stream.p_new_area = NULL;
}
- if( p_input->stream.p_selected_area->i_seek != NO_SEEK )
+ if( p_input->p_sout && p_input->p_sout->p_meta == NULL )
+ {
+ p_input->p_sout->p_meta = p_meta;
+ }
+ else
+ {
+ vlc_meta_Delete( p_meta );
+ }
+ }
+ else if( p_meta ) vlc_meta_Delete( p_meta );
+
+ msg_Dbg( p_input, "`%s' sucessfully opened",
+ p_input->input.p_item->psz_uri );
+
+ /* initialization is complete */
+ p_input->i_state = PLAYING_S;
+
+ val.i_int = PLAYING_S;
+ var_Change( p_input, "state", VLC_VAR_SETVALUE, &val, NULL );
+
+ return VLC_SUCCESS;
+
+error:
+ if( p_input->p_es_out )
+ input_EsOutDelete( p_input->p_es_out );
+
+ if( p_input->p_sout )
+ sout_DeleteInstance( p_input->p_sout );
+
+ /* Mark them deleted */
+ p_input->input.p_demux = NULL;
+ p_input->input.p_stream = NULL;
+ p_input->input.p_access = NULL;
+ p_input->p_es_out = NULL;
+ p_input->p_sout = NULL;
+
+ return VLC_EGENERIC;
+}
+
+/*****************************************************************************
+ * Error: RunThread() error loop
+ *****************************************************************************
+ * This function is called when an error occurred during thread main's loop.
+ *****************************************************************************/
+static void Error( input_thread_t *p_input )
+{
+ while( !p_input->b_die )
+ {
+ /* Sleep a while */
+ msleep( INPUT_IDLE_SLEEP );
+ }
+}
+
+/*****************************************************************************
+ * End: end the input thread
+ *****************************************************************************/
+static void End( input_thread_t * p_input )
+{
+ vlc_value_t val;
+ int i;
+
+ msg_Dbg( p_input, "closing input" );
+
+ /* We are at the end */
+ p_input->i_state = END_S;
+
+ val.i_int = END_S;
+ var_Change( p_input, "state", VLC_VAR_SETVALUE, &val, NULL );
+
+ /* Clean control variables */
+ input_ControlVarClean( p_input );
+
+ /* Clean up master */
+ InputSourceClean( p_input, &p_input->input );
+
+ /* Delete slave */
+ for( i = 0; i < p_input->i_slave; i++ )
+ {
+ InputSourceClean( p_input, p_input->slave[i] );
+ free( p_input->slave[i] );
+ }
+ if( p_input->slave ) free( p_input->slave );
+
+ /* Unload all modules */
+ if( p_input->p_es_out )
+ input_EsOutDelete( p_input->p_es_out );
+
+ /* Close optional stream output instance */
+ if( p_input->p_sout )
+ {
+ vlc_object_t *p_pl =
+ vlc_object_find( p_input, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
+ vlc_value_t keep;
+
+ if( var_Get( p_input, "sout-keep", &keep ) >= 0 && keep.b_bool && p_pl )
+ {
+ /* attach sout to the playlist */
+ msg_Warn( p_input, "keeping sout" );
+ vlc_object_detach( p_input->p_sout );
+ vlc_object_attach( p_input->p_sout, p_pl );
+ }
+ else
+ {
+ msg_Warn( p_input, "destroying sout" );
+ sout_DeleteInstance( p_input->p_sout );
+ }
+ if( p_pl )
+ vlc_object_release( p_pl );
+ }
+
+ /* Tell we're dead */
+ p_input->b_dead = VLC_TRUE;
+}
+
+/*****************************************************************************
+ * Control
+ *****************************************************************************/
+static inline int ControlPopNoLock( input_thread_t *p_input,
+ int *pi_type, vlc_value_t *p_val )
+{
+ if( p_input->i_control <= 0 )
+ {
+ return VLC_EGENERIC;
+ }
+
+ *pi_type = p_input->control[0].i_type;
+ *p_val = p_input->control[0].val;
+
+ p_input->i_control--;
+ if( p_input->i_control > 0 )
+ {
+ int i;
+
+ for( i = 0; i < p_input->i_control; i++ )
+ {
+ p_input->control[i].i_type = p_input->control[i+1].i_type;
+ p_input->control[i].val = p_input->control[i+1].val;
+ }
+ }
+
+ return VLC_SUCCESS;
+}
+
+static void ControlReduce( input_thread_t *p_input )
+{
+ int i;
+ for( i = 1; i < p_input->i_control; i++ )
+ {
+ const int i_lt = p_input->control[i-1].i_type;
+ const int i_ct = p_input->control[i].i_type;
+
+ /* XXX We can't merge INPUT_CONTROL_SET_ES */
+ msg_Dbg( p_input, "[%d/%d] l=%d c=%d", i, p_input->i_control,
+ i_lt, i_ct );
+ if( i_lt == i_ct &&
+ ( i_ct == INPUT_CONTROL_SET_STATE ||
+ i_ct == INPUT_CONTROL_SET_RATE ||
+ i_ct == INPUT_CONTROL_SET_POSITION ||
+ i_ct == INPUT_CONTROL_SET_TIME ||
+ i_ct == INPUT_CONTROL_SET_PROGRAM ||
+ i_ct == INPUT_CONTROL_SET_TITLE ||
+ i_ct == INPUT_CONTROL_SET_SEEKPOINT ||
+ i_ct == INPUT_CONTROL_SET_BOOKMARK ) )
{
- if( p_input->stream.p_selected_area->i_size > 0 )
+ int j;
+ msg_Dbg( p_input, "merged at %d", i );
+ /* Remove the i-1 */
+ for( j = i; j < p_input->i_control; j++ )
+ p_input->control[j-1] = p_input->control[j];
+ p_input->i_control--;
+ }
+ else
+ {
+ /* TODO but that's not that important
+ - merge SET_X with SET_X_CMD
+ - remove SET_SEEKPOINT/SET_POSITION/SET_TIME before a SET_TITLE
+ - remove SET_SEEKPOINT/SET_POSITION/SET_TIME before another among them
+ - ?
+ */
+ }
+ }
+}
+
+static vlc_bool_t Control( input_thread_t *p_input, int i_type,
+ vlc_value_t val )
+{
+ vlc_bool_t b_force_update = VLC_FALSE;
+
+ switch( i_type )
+ {
+ case INPUT_CONTROL_SET_DIE:
+ msg_Dbg( p_input, "control: INPUT_CONTROL_SET_DIE proceed" );
+ /* Mark all submodules to die */
+ if( p_input->input.p_access )
+ p_input->input.p_access->b_die = VLC_TRUE;
+ if( p_input->input.p_stream )
+ p_input->input.p_stream->b_die = VLC_TRUE;
+ p_input->input.p_demux->b_die = VLC_TRUE;
+
+ p_input->b_die = VLC_TRUE;
+ break;
+
+ case INPUT_CONTROL_SET_POSITION:
+ case INPUT_CONTROL_SET_POSITION_OFFSET:
+ {
+ double f_pos;
+ if( i_type == INPUT_CONTROL_SET_POSITION )
+ {
+ f_pos = val.f_float;
+ }
+ else
{
- unsigned int i;
- mtime_t i_time;
- double f = (double)p_input->stream.p_selected_area->i_seek /
- (double)p_input->stream.p_selected_area->i_size;
+ /* Should not fail */
+ demux2_Control( p_input->input.p_demux,
+ DEMUX_GET_POSITION, &f_pos );
+ f_pos += val.f_float;
+ }
+ if( f_pos < 0.0 ) f_pos = 0.0;
+ if( f_pos > 1.0 ) f_pos = 1.0;
+ if( demux2_Control( p_input->input.p_demux, DEMUX_SET_POSITION,
+ f_pos ) )
+ {
+ msg_Err( p_input, "INPUT_CONTROL_SET_POSITION(_OFFSET) "
+ "%2.1f%% failed", f_pos * 100 );
+ }
+ else
+ {
+ if( p_input->i_slave > 0 )
+ SlaveSeek( p_input );
- vlc_mutex_unlock( &p_input->stream.stream_lock );
- demux_Control( p_input, DEMUX_SET_POSITION, f );
- vlc_mutex_lock( &p_input->stream.stream_lock );
+ input_EsOutDiscontinuity( p_input->p_es_out, VLC_FALSE );
+ es_out_Control( p_input->p_es_out, ES_OUT_RESET_PCR );
+ b_force_update = VLC_TRUE;
+ }
+ break;
+ }
- /* Escape all decoders for the stream discontinuity they
- * will encounter. */
- input_EscapeDiscontinuity( p_input );
+ case INPUT_CONTROL_SET_TIME:
+ case INPUT_CONTROL_SET_TIME_OFFSET:
+ {
+ int64_t i_time;
+ int i_ret;
- for( i = 0; i < p_input->stream.i_pgrm_number; i++ )
- {
- pgrm_descriptor_t * p_pgrm=p_input->stream.pp_programs[i];
+ if( i_type == INPUT_CONTROL_SET_TIME )
+ {
+ i_time = val.i_time;
+ }
+ else
+ {
+ /* Should not fail */
+ demux2_Control( p_input->input.p_demux,
+ DEMUX_GET_TIME, &i_time );
+ i_time += val.i_time;
+ }
+ if( i_time < 0 ) i_time = 0;
+ i_ret = demux2_Control( p_input->input.p_demux,
+ DEMUX_SET_TIME, i_time );
+ if( i_ret )
+ {
+ int64_t i_length;
+ /* Emulate it with a SET_POS */
- /* Reinitialize synchro. */
- p_pgrm->i_synchro_state = SYNCHRO_REINIT;
+ demux2_Control( p_input->input.p_demux,
+ DEMUX_GET_LENGTH, &i_length );
+ if( i_length > 0 )
+ {
+ double f_pos = (double)i_time / (double)i_length;
+ i_ret = demux2_Control( p_input->input.p_demux,
+ DEMUX_SET_POSITION, f_pos );
}
+ }
+ if( i_ret )
+ {
+ msg_Err( p_input, "INPUT_CONTROL_SET_TIME(_OFFSET) "I64Fd
+ " failed", i_time );
+ }
+ else
+ {
+ if( p_input->i_slave > 0 )
+ SlaveSeek( p_input );
- vlc_mutex_unlock( &p_input->stream.stream_lock );
- if( !demux_Control( p_input, DEMUX_GET_TIME, &i_time ) )
+ input_EsOutDiscontinuity( p_input->p_es_out, VLC_FALSE );
+
+ es_out_Control( p_input->p_es_out, ES_OUT_RESET_PCR );
+ b_force_update = VLC_TRUE;
+ }
+ break;
+ }
+
+ 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 ) )
+ {
+ int i_ret;
+ if( p_input->input.p_access )
+ i_ret = access2_Control( p_input->input.p_access,
+ ACCESS_SET_PAUSE_STATE, VLC_FALSE );
+ else
+ i_ret = demux2_Control( p_input->input.p_demux,
+ DEMUX_SET_PAUSE_STATE, VLC_FALSE );
+
+ if( i_ret )
{
- int i;
- vlc_value_t val;
+ /* FIXME What to do ? */
+ msg_Warn( p_input, "cannot unset pause -> EOF" );
+ input_ControlPush( p_input, INPUT_CONTROL_SET_DIE, NULL );
+ }
- /* Help in bar display */
- val.i_time = i_time;
- var_Change( p_input, "time", VLC_VAR_SETVALUE, &val, NULL );
+ b_force_update = VLC_TRUE;
- /* Seek subs */
- for( i = 0; i < p_input->p_sys->i_sub; i++ )
- {
- subtitle_Seek( p_input->p_sys->sub[i], i_time );
- }
+ /* Switch to play */
+ p_input->i_state = PLAYING_S;
+ val.i_int = PLAYING_S;
+ var_Change( p_input, "state", VLC_VAR_SETVALUE, &val, NULL );
+
+ /* Reset clock */
+ es_out_Control( p_input->p_es_out, ES_OUT_RESET_PCR );
+ }
+ else if( val.i_int == PAUSE_S && p_input->i_state == PLAYING_S &&
+ p_input->b_can_pause )
+ {
+ int i_ret;
+ if( p_input->input.p_access )
+ i_ret = access2_Control( p_input->input.p_access,
+ ACCESS_SET_PAUSE_STATE, VLC_TRUE );
+ else
+ i_ret = demux2_Control( p_input->input.p_demux,
+ DEMUX_SET_PAUSE_STATE, VLC_TRUE );
+
+ b_force_update = VLC_TRUE;
+
+ if( i_ret )
+ {
+ msg_Warn( p_input, "cannot set pause state" );
+ val.i_int = p_input->i_state;
}
- vlc_mutex_lock( &p_input->stream.stream_lock );
+ else
+ {
+ val.i_int = PAUSE_S;
+ }
+
+ /* Switch to new state */
+ p_input->i_state = val.i_int;
+ var_Change( p_input, "state", VLC_VAR_SETVALUE, &val, NULL );
}
- p_input->stream.p_selected_area->i_seek = NO_SEEK;
- }
+ else if( val.i_int == PAUSE_S && !p_input->b_can_pause )
+ {
+ b_force_update = VLC_TRUE;
- if( p_input->stream.p_removed_es )
- {
- input_UnselectES( p_input, p_input->stream.p_removed_es );
- p_input->stream.p_removed_es = NULL;
- }
+ /* Correct "state" value */
+ val.i_int = p_input->i_state;
+ var_Change( p_input, "state", VLC_VAR_SETVALUE, &val, NULL );
+ }
+ else if( val.i_int != PLAYING_S && val.i_int != PAUSE_S )
+ {
+ msg_Err( p_input, "invalid state in INPUT_CONTROL_SET_STATE" );
+ }
+ break;
- if( p_input->stream.p_newly_selected_es )
+ case INPUT_CONTROL_SET_RATE:
+ case INPUT_CONTROL_SET_RATE_SLOWER:
+ case INPUT_CONTROL_SET_RATE_FASTER:
{
- input_SelectES( p_input, p_input->stream.p_newly_selected_es );
- p_input->stream.p_newly_selected_es = NULL;
+ int i_rate;
+
+ if( i_type == INPUT_CONTROL_SET_RATE_SLOWER )
+ i_rate = p_input->i_rate * 2;
+ else if( i_type == INPUT_CONTROL_SET_RATE_FASTER )
+ i_rate = p_input->i_rate / 2;
+ else
+ i_rate = val.i_int;
+
+ if( i_rate < INPUT_RATE_MIN )
+ {
+ msg_Dbg( p_input, "cannot set rate faster" );
+ i_rate = INPUT_RATE_MIN;
+ }
+ else if( i_rate > INPUT_RATE_MAX )
+ {
+ msg_Dbg( p_input, "cannot set rate slower" );
+ i_rate = INPUT_RATE_MAX;
+ }
+ if( i_rate != INPUT_RATE_DEFAULT &&
+ ( !p_input->b_can_pace_control ||
+ ( p_input->p_sout && !p_input->b_out_pace_control ) ) )
+ {
+ msg_Dbg( p_input, "cannot change rate" );
+ i_rate = INPUT_RATE_DEFAULT;
+ }
+ if( i_rate != p_input->i_rate )
+ {
+ p_input->i_rate = i_rate;
+ val.i_int = i_rate;
+ var_Change( p_input, "rate", VLC_VAR_SETVALUE, &val, NULL );
+
+ /* We haven't send data to decoder when rate != default */
+ if( i_rate == INPUT_RATE_DEFAULT )
+ input_EsOutDiscontinuity( p_input->p_es_out, VLC_TRUE );
+
+ /* Reset clock */
+ es_out_Control( p_input->p_es_out, ES_OUT_RESET_PCR );
+
+ b_force_update = VLC_TRUE;
+ }
+ break;
}
- if( p_input->stream.b_new_mute != MUTE_NO_CHANGE )
- {
- if( p_input->stream.b_new_mute )
- {
- input_EscapeAudioDiscontinuity( p_input );
- }
+ case INPUT_CONTROL_SET_PROGRAM:
+ /* No need to force update, es_out does it if needed */
+ es_out_Control( p_input->p_es_out,
+ ES_OUT_SET_GROUP, val.i_int );
+
+ demux2_Control( p_input->input.p_demux, DEMUX_SET_GROUP, val.i_int,
+ NULL );
+ break;
+
+ case INPUT_CONTROL_SET_ES:
+ /* No need to force update, es_out does it if needed */
+ es_out_Control( p_input->p_es_out, ES_OUT_SET_ES,
+ input_EsOutGetFromID( p_input->p_es_out,
+ val.i_int ) );
+ break;
+
+ case INPUT_CONTROL_SET_AUDIO_DELAY:
+ input_EsOutSetDelay( p_input->p_es_out,
+ AUDIO_ES, val.i_time );
+ var_Change( p_input, "audio-delay", VLC_VAR_SETVALUE, &val, NULL );
+ break;
+
+ case INPUT_CONTROL_SET_SPU_DELAY:
+ input_EsOutSetDelay( p_input->p_es_out,
+ SPU_ES, val.i_time );
+ var_Change( p_input, "spu-delay", VLC_VAR_SETVALUE, &val, NULL );
+ break;
+
+ case INPUT_CONTROL_SET_TITLE:
+ case INPUT_CONTROL_SET_TITLE_NEXT:
+ case INPUT_CONTROL_SET_TITLE_PREV:
+ if( p_input->input.b_title_demux &&
+ p_input->input.i_title > 0 )
+ {
+ /* TODO */
+ /* FIXME handle demux title */
+ demux_t *p_demux = p_input->input.p_demux;
+ int i_title;
+
+ if( i_type == INPUT_CONTROL_SET_TITLE_PREV )
+ i_title = p_demux->info.i_title - 1;
+ else if( i_type == INPUT_CONTROL_SET_TITLE_NEXT )
+ i_title = p_demux->info.i_title + 1;
+ else
+ i_title = val.i_int;
+
+ if( i_title >= 0 && i_title < p_input->input.i_title )
+ {
+ demux2_Control( p_demux, DEMUX_SET_TITLE, i_title );
+
+ input_EsOutDiscontinuity( p_input->p_es_out, VLC_FALSE );
+ es_out_Control( p_input->p_es_out, ES_OUT_RESET_PCR );
+
+ input_ControlVarTitle( p_input, i_title );
+ }
+ }
+ else if( p_input->input.i_title > 0 )
+ {
+ access_t *p_access = p_input->input.p_access;
+ int i_title;
+
+ if( i_type == INPUT_CONTROL_SET_TITLE_PREV )
+ i_title = p_access->info.i_title - 1;
+ else if( i_type == INPUT_CONTROL_SET_TITLE_NEXT )
+ i_title = p_access->info.i_title + 1;
+ else
+ i_title = val.i_int;
+
+ if( i_title >= 0 && i_title < p_input->input.i_title )
+ {
+ access2_Control( p_access, ACCESS_SET_TITLE, i_title );
+ stream_AccessReset( p_input->input.p_stream );
+
+ input_EsOutDiscontinuity( p_input->p_es_out, VLC_FALSE );
+ es_out_Control( p_input->p_es_out, ES_OUT_RESET_PCR );
+ }
+ }
+ break;
+ case INPUT_CONTROL_SET_SEEKPOINT:
+ case INPUT_CONTROL_SET_SEEKPOINT_NEXT:
+ case INPUT_CONTROL_SET_SEEKPOINT_PREV:
+ if( p_input->input.b_title_demux &&
+ p_input->input.i_title > 0 )
+ {
+ demux_t *p_demux = p_input->input.p_demux;
+ int i_seekpoint;
+
+ if( i_type == INPUT_CONTROL_SET_SEEKPOINT_PREV )
+ i_seekpoint = p_demux->info.i_seekpoint - 1;
+ else if( i_type == INPUT_CONTROL_SET_SEEKPOINT_NEXT )
+ i_seekpoint = p_demux->info.i_seekpoint + 1;
+ else
+ i_seekpoint = val.i_int;
+
+ if( i_seekpoint >= 0 && i_seekpoint <
+ p_input->input.title[p_demux->info.i_title]->i_seekpoint )
+ {
+ demux2_Control( p_demux, DEMUX_SET_SEEKPOINT, i_seekpoint );
+
+ input_EsOutDiscontinuity( p_input->p_es_out, VLC_FALSE );
+ es_out_Control( p_input->p_es_out, ES_OUT_RESET_PCR );
+ }
+ }
+ else if( p_input->input.i_title > 0 )
+ {
+ access_t *p_access = p_input->input.p_access;
+ int i_seekpoint;
+
+ if( i_type == INPUT_CONTROL_SET_SEEKPOINT_PREV )
+ i_seekpoint = p_access->info.i_seekpoint - 1;
+ else if( i_type == INPUT_CONTROL_SET_TITLE_NEXT )
+ i_seekpoint = p_access->info.i_seekpoint + 1;
+ else
+ i_seekpoint = val.i_int;
+
+ if( i_seekpoint >= 0 && i_seekpoint <
+ p_input->input.title[p_access->info.i_title]->i_seekpoint )
+ {
+ access2_Control( p_access, ACCESS_SET_SEEKPOINT, i_seekpoint );
+ stream_AccessReset( p_input->input.p_stream );
+
+ input_EsOutDiscontinuity( p_input->p_es_out, VLC_FALSE );
+ es_out_Control( p_input->p_es_out, ES_OUT_RESET_PCR );
+ }
+ }
+ break;
+
+ case INPUT_CONTROL_SET_BOOKMARK:
+ default:
+ msg_Err( p_input, "not yet implemented" );
+ break;
+ }
+
+ return b_force_update;
+}
+
+/*****************************************************************************
+ * UpdateFromDemux:
+ *****************************************************************************/
+static int UpdateFromDemux( input_thread_t *p_input )
+{
+ demux_t *p_demux = p_input->input.p_demux;
+ vlc_value_t v;
+
+ if( p_demux->info.i_update & INPUT_UPDATE_TITLE )
+ {
+ v.i_int = p_demux->info.i_title;
+ var_Change( p_input, "title", VLC_VAR_SETVALUE, &v, NULL );
- vlc_mutex_lock( &p_input->stream.control.control_lock );
- p_input->stream.control.b_mute = p_input->stream.b_new_mute;
- vlc_mutex_unlock( &p_input->stream.control.control_lock );
+ input_ControlVarTitle( p_input, p_demux->info.i_title );
- p_input->stream.b_new_mute = MUTE_NO_CHANGE;
- }
+ p_demux->info.i_update &= ~INPUT_UPDATE_TITLE;
+ }
+ if( p_demux->info.i_update & INPUT_UPDATE_SEEKPOINT )
+ {
+ v.i_int = p_demux->info.i_seekpoint;
+ var_Change( p_input, "chapter", VLC_VAR_SETVALUE, &v, NULL);
- vlc_mutex_unlock( &p_input->stream.stream_lock );
+ p_demux->info.i_update &= ~INPUT_UPDATE_SEEKPOINT;
+ }
+ p_demux->info.i_update &= ~INPUT_UPDATE_SIZE;
- /* Read and demultiplex some data. */
- i_count = p_input->pf_demux( p_input );
+ /* Hmmm only works with master input */
+ if( p_input->input.p_demux == p_demux )
+ {
+ int i_title_end = p_input->input.i_title_end -
+ p_input->input.i_title_offset;
+ int i_seekpoint_end = p_input->input.i_seekpoint_end -
+ p_input->input.i_seekpoint_offset;
- if( i_count == 0 )
+ if( i_title_end >= 0 && i_seekpoint_end >= 0 )
{
- /* End of file - we do not set b_die because only the
- * playlist is allowed to do so. */
- msg_Info( p_input, "EOF reached" );
- p_input->b_eof = 1;
+ if( p_demux->info.i_title > i_title_end ||
+ ( p_demux->info.i_title == i_title_end &&
+ p_demux->info.i_seekpoint > i_seekpoint_end ) ) return 0;
}
- else if( i_count < 0 )
+ else if( i_seekpoint_end >=0 )
{
- p_input->b_error = 1;
+ if( p_demux->info.i_seekpoint > i_seekpoint_end ) return 0;
}
-
- if( !p_input->b_error && !p_input->b_eof && i_update_next < mdate() )
+ else if( i_title_end >= 0 )
{
- int i;
- mtime_t i_time;
- mtime_t i_length;
- double d_pos;
-
- /* update input status variables */
- if( !demux_Control( p_input, DEMUX_GET_POSITION, &d_pos ) )
- {
- val.f_float = (float)d_pos;
- var_Change( p_input, "position", VLC_VAR_SETVALUE, &val, NULL );
- }
- if( !demux_Control( p_input, DEMUX_GET_TIME, &i_time ) )
- {
- val.i_time = i_time;
- var_Change( p_input, "time", VLC_VAR_SETVALUE, &val, NULL );
- }
- if( !demux_Control( p_input, DEMUX_GET_LENGTH, &i_length ) )
- {
- val.i_time = i_length;
- var_Change( p_input, "length", VLC_VAR_SETVALUE, &val, NULL );
- }
-
- /* update subs */
- for( i = 0; i < p_input->p_sys->i_sub; i++ )
- {
- subtitle_Demux( p_input->p_sys->sub[i], i_time );
- }
-
- i_update_next = mdate() + I64C(150000);
+ if( p_demux->info.i_title > i_title_end ) return 0;
}
}
- if( p_input->b_error || p_input->b_eof )
- {
- ErrorThread( p_input );
- }
-
- EndThread( p_input );
-
- return 0;
+ return 1;
}
/*****************************************************************************
- * InitThread: init the input Thread
+ * UpdateFromAccess:
*****************************************************************************/
-static int InitThread( input_thread_t * p_input )
+static int UpdateFromAccess( input_thread_t *p_input )
{
- float f_fps;
- playlist_t *p_playlist;
- mtime_t i_length;
+ access_t *p_access = p_input->input.p_access;
+ vlc_value_t v;
- /* Parse source string. Syntax : [[<access>][/<demux>]:][<source>] */
- char * psz_parser = p_input->psz_dupsource = strdup(p_input->psz_source);
- vlc_value_t val;
- int64_t i_microsecondperframe;
+ if( p_access->info.i_update & INPUT_UPDATE_TITLE )
+ {
+ v.i_int = p_access->info.i_title;
+ var_Change( p_input, "title", VLC_VAR_SETVALUE, &v, NULL );
- subtitle_demux_t *p_sub_toselect = NULL;
+ input_ControlVarTitle( p_input, p_access->info.i_title );
- /* Skip the plug-in names */
- while( *psz_parser && *psz_parser != ':' )
- {
- psz_parser++;
+ stream_AccessUpdate( p_input->input.p_stream );
+
+ p_access->info.i_update &= ~INPUT_UPDATE_TITLE;
}
-#if defined( WIN32 ) || defined( UNDER_CE )
- if( psz_parser - p_input->psz_dupsource == 1 )
+ if( p_access->info.i_update & INPUT_UPDATE_SEEKPOINT )
{
- msg_Warn( p_input, "drive letter %c: found in source string",
- p_input->psz_dupsource[0] ) ;
- psz_parser = "";
- }
-#endif
+ v.i_int = p_access->info.i_seekpoint;
+ var_Change( p_input, "chapter", VLC_VAR_SETVALUE, &v, NULL);
- if( !*psz_parser )
- {
- p_input->psz_access = p_input->psz_demux = "";
- p_input->psz_name = p_input->psz_source;
- free( p_input->psz_dupsource );
- p_input->psz_dupsource = NULL;
+ p_access->info.i_update &= ~INPUT_UPDATE_SEEKPOINT;
}
- else
+ p_access->info.i_update &= ~INPUT_UPDATE_SIZE;
+
+ /* Hmmm only works with master input */
+ if( p_input->input.p_access == p_access )
{
- *psz_parser++ = '\0';
+ int i_title_end = p_input->input.i_title_end -
+ p_input->input.i_title_offset;
+ int i_seekpoint_end = p_input->input.i_seekpoint_end -
+ p_input->input.i_seekpoint_offset;
- /* let's skip '//' */
- if( psz_parser[0] == '/' && psz_parser[1] == '/' )
+ if( i_title_end >= 0 && i_seekpoint_end >=0 )
{
- psz_parser += 2 ;
+ if( p_access->info.i_title > i_title_end ||
+ ( p_access->info.i_title == i_title_end &&
+ p_access->info.i_seekpoint > i_seekpoint_end ) ) return 0;
}
-
- p_input->psz_name = psz_parser ;
-
- /* Come back to parse the access and demux plug-ins */
- psz_parser = p_input->psz_dupsource;
-
- if( !*psz_parser )
+ else if( i_seekpoint_end >=0 )
{
- /* No access */
- p_input->psz_access = "";
+ if( p_access->info.i_seekpoint > i_seekpoint_end ) return 0;
}
- else if( *psz_parser == '/' )
+ else if( i_title_end >= 0 )
{
- /* No access */
- p_input->psz_access = "";
- psz_parser++;
+ if( p_access->info.i_title > i_title_end ) return 0;
}
- else
- {
- p_input->psz_access = psz_parser;
+ }
- while( *psz_parser && *psz_parser != '/' )
- {
- psz_parser++;
- }
+ return 1;
+}
- if( *psz_parser == '/' )
- {
- *psz_parser++ = '\0';
- }
- }
+/*****************************************************************************
+ * UpdateItemLength:
+ *****************************************************************************/
+static void UpdateItemLength( input_thread_t *p_input, int64_t i_length )
+{
+ char psz_buffer[MSTRTIME_MAX_SIZE];
- if( !*psz_parser )
- {
- /* No demux */
- p_input->psz_demux = "";
- }
- else
- {
- p_input->psz_demux = psz_parser;
- }
- }
+ vlc_mutex_lock( &p_input->input.p_item->lock );
+ p_input->input.p_item->i_duration = i_length;
+ vlc_mutex_unlock( &p_input->input.p_item->lock );
- msg_Dbg( p_input, "access `%s', demux `%s', name `%s'",
- p_input->psz_access, p_input->psz_demux, p_input->psz_name );
+ input_Control( p_input, INPUT_ADD_INFO, _("General"), _("Duration"),
+ msecstotimestr( psz_buffer, i_length / 1000 ) );
+}
- if( input_AccessInit( p_input ) == -1 )
- {
- free( p_input->psz_source );
- if( p_input->psz_dupsource != NULL )
- {
- free( p_input->psz_dupsource );
- }
+/*****************************************************************************
+ * InputSourceNew:
+ *****************************************************************************/
+static input_source_t *InputSourceNew( input_thread_t *p_input )
+{
+ input_source_t *in = malloc( sizeof( input_source_t ) );
+
+ in->p_item = NULL;
+ in->p_access = NULL;
+ in->p_stream = NULL;
+ in->p_demux = NULL;
+ in->b_title_demux = VLC_FALSE;
+ in->i_title = 0;
+ in->title = NULL;
+ in->b_can_pace_control = VLC_TRUE;
+ in->b_eof = VLC_FALSE;
+ in->i_cr_average = 0;
+
+ return in;
+}
- return VLC_EGENERIC;
- }
+/*****************************************************************************
+ * InputSourceInit:
+ *****************************************************************************/
+static int InputSourceInit( input_thread_t *p_input,
+ input_source_t *in, char *psz_mrl,
+ char *psz_forced_demux )
+{
+ char *psz_dup = strdup( psz_mrl );
+ char *psz_access;
+ char *psz_demux;
+ char *psz_path;
+ vlc_value_t val;
- /* Initialize optional stream output. (before demuxer)*/
- var_Get( p_input, "sout", &val );
- if( val.psz_string != NULL )
- {
- if ( *val.psz_string && (p_input->stream.p_sout =
- sout_NewInstance( p_input, val.psz_string )) == NULL )
- {
- msg_Err( p_input, "cannot start stream output instance, aborting" );
- free( val.psz_string );
+ /* Split uri */
+ MRLSplit( p_input, psz_dup, &psz_access, &psz_demux, &psz_path );
- input_AccessEnd( p_input );
- free( p_input->psz_source );
- if( p_input->psz_dupsource != NULL )
- {
- free( p_input->psz_dupsource );
- }
- return VLC_EGENERIC;
- }
- free( val.psz_string );
- }
+ msg_Dbg( p_input, "`%s' gives access `%s' demux `%s' path `%s'",
+ psz_mrl, psz_access, psz_demux, psz_path );
- p_input->p_es_out = input_EsOutNew( p_input );
- es_out_Control( p_input->p_es_out, ES_OUT_SET_ACTIVE, VLC_FALSE );
- es_out_Control( p_input->p_es_out, ES_OUT_SET_MODE, ES_OUT_MODE_NONE );
+ /* Hack to allow udp://@:port syntax */
+ if( !psz_access ||
+ (strncmp( psz_access, "udp", 3 ) && strncmp( psz_access, "rtp", 3 )) )
- /* Find and open appropriate access module */
- p_input->p_access = module_Need( p_input, "access",
- p_input->psz_access );
+ /* Find optional titles and seekpoints */
+ MRLSections( p_input, psz_path, &in->i_title_start, &in->i_title_end,
+ &in->i_seekpoint_start, &in->i_seekpoint_end );
-#ifndef WIN32 /* Remove this gross hack from the win32 build as colons
- * are forbidden in filenames on Win32. */
+ if( psz_forced_demux && *psz_forced_demux )
+ psz_demux = psz_forced_demux;
- /* Maybe we got something like: /Volumes/toto:titi/gabu.mpg */
- if ( p_input->p_access == NULL
- && (*p_input->psz_demux || *p_input->psz_access) )
+ /* Try access_demux if no demux given */
+ if( *psz_demux == '\0' )
{
- p_input->psz_access = p_input->psz_demux = "";
- p_input->psz_name = p_input->psz_source;
- free( p_input->psz_dupsource);
- p_input->psz_dupsource = NULL;
-
- p_input->p_access = module_Need( p_input, "access",
- p_input->psz_access );
+ in->p_demux = demux2_New( p_input, psz_access, psz_demux, psz_path,
+ NULL, p_input->p_es_out );
}
-#endif
- if( p_input->p_access == NULL )
+ if( in->p_demux )
{
- msg_Err( p_input, "no suitable access module for `%s/%s://%s'",
- p_input->psz_access, p_input->psz_demux, p_input->psz_name );
- if ( p_input->stream.p_sout != NULL )
- {
- sout_DeleteInstance( p_input->stream.p_sout );
- }
+ int64_t i_pts_delay;
- input_AccessEnd( p_input );
- free( p_input->psz_source );
- if( p_input->psz_dupsource != NULL )
+ /* Get infos from access_demux */
+ demux2_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 );
+
+ in->b_title_demux = VLC_TRUE;
+ if( demux2_Control( in->p_demux, DEMUX_GET_TITLE_INFO,
+ &in->title, &in->i_title,
+ &in->i_title_offset, &in->i_seekpoint_offset ) )
{
- free( p_input->psz_dupsource );
+ in->i_title = 0;
+ in->title = NULL;
}
- return VLC_EGENERIC;
- }
-
- /* Waiting for stream. */
- if( p_input->i_mtu )
- {
- p_input->i_bufsize = p_input->i_mtu;
+ demux2_Control( in->p_demux, DEMUX_CAN_CONTROL_PACE,
+ &in->b_can_pace_control );
+ demux2_Control( in->p_demux, DEMUX_CAN_PAUSE,
+ &in->b_can_pause );
+
+ /* FIXME todo
+ demux2_Control( in->p_demux, DEMUX_CAN_SEEK,
+ &val.b_bool );
+ */
}
else
{
- p_input->i_bufsize = INPUT_DEFAULT_BUFSIZE;
- }
+ int64_t i_pts_delay;
- /* If the desynchronisation requested by the user is < 0, we need to
- * cache more data. */
- var_Create( p_input, "audio-desync", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- var_Get( p_input, "audio-desync", &val );
- if( val.i_int < 0 )
- p_input->i_pts_delay -= (val.i_int * 1000);
+ /* Now try a real access */
+ in->p_access = access2_New( p_input, psz_access, psz_demux, psz_path );
- if( p_input->p_current_data == NULL && p_input->pf_read != NULL )
- {
- while( !input_FillBuffer( p_input ) )
+ /* Access failed, URL encoded ? */
+ if( in->p_access == NULL && strchr( psz_path, '%' ) )
{
- if( p_input->b_die || p_input->b_error || p_input->b_eof )
- {
- module_Unneed( p_input, p_input->p_access );
- if ( p_input->stream.p_sout != NULL )
- {
- sout_DeleteInstance( p_input->stream.p_sout );
- }
- input_AccessEnd( p_input );
- free( p_input->psz_source );
- if( p_input->psz_dupsource != NULL )
- {
- free( p_input->psz_dupsource );
- }
- return VLC_EGENERIC;
- }
- }
- }
+ DecodeUrl( psz_path );
- /* Create the stream_t facilities */
- p_input->s = stream_OpenInput( p_input );
- if( p_input->s == NULL )
- {
- /* should nver occur yet */
+ msg_Dbg( p_input, "retying with access `%s' demux `%s' path `%s'",
+ psz_access, psz_demux, psz_path );
- msg_Err( p_input, "cannot create stream_t !" );
+ in->p_access = access2_New( p_input,
+ psz_access, psz_demux, psz_path );
+ }
+#ifndef WIN32 /* Remove this gross hack from the win32 build as colons
+ * are forbidden in filenames on Win32. */
- module_Unneed( p_input, p_input->p_access );
- if ( p_input->stream.p_sout != NULL )
+ /* Maybe we got something like: /Volumes/toto:titi/gabu.mpg */
+ if( in->p_access == NULL &&
+ *psz_access == '\0' && ( *psz_demux || *psz_path ) )
{
- sout_DeleteInstance( p_input->stream.p_sout );
+ free( psz_dup );
+ psz_dup = strdup( psz_mrl );
+ psz_access = "";
+ psz_demux = "";
+ psz_path = psz_dup;
+
+ in->p_access = access2_New( p_input,
+ psz_access, psz_demux, psz_path );
}
- input_AccessEnd( p_input );
- free( p_input->psz_source );
- if( p_input->psz_dupsource != NULL )
+#endif
+
+ if( in->p_access == NULL )
{
- free( p_input->psz_dupsource );
+ msg_Err( p_input, "no suitable access module for `%s'", psz_mrl );
+ goto error;
}
- return VLC_EGENERIC;
- }
- /* Find and open appropriate demux module */
- p_input->p_demux =
- module_Need( p_input, "demux",
- (p_input->psz_demux && *p_input->psz_demux) ?
- p_input->psz_demux : "$demux" );
+ /* Get infos from access */
+ access2_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 );
- if( p_input->p_demux == NULL )
- {
- msg_Err( p_input, "no suitable demux module for `%s/%s://%s'",
- p_input->psz_access, p_input->psz_demux, p_input->psz_name );
+ in->b_title_demux = VLC_FALSE;
+ if( access2_Control( in->p_access, ACCESS_GET_TITLE_INFO,
+ &in->title, &in->i_title,
+ &in->i_title_offset, &in->i_seekpoint_offset ) )
- stream_Release( p_input->s );
- module_Unneed( p_input, p_input->p_access );
- if ( p_input->stream.p_sout != NULL )
{
- sout_DeleteInstance( p_input->stream.p_sout );
+ in->i_title = 0;
+ in->title = NULL;
}
- input_AccessEnd( p_input );
- free( p_input->psz_source );
- if( p_input->psz_dupsource != NULL )
+ access2_Control( in->p_access, ACCESS_CAN_CONTROL_PACE,
+ &in->b_can_pace_control );
+ access2_Control( in->p_access, ACCESS_CAN_PAUSE,
+ &in->b_can_pause );
+ access2_Control( in->p_access, ACCESS_CAN_SEEK,
+ &val.b_bool );
+ var_Set( p_input, "seekable", val );
+
+ /* Create the stream_t */
+ in->p_stream = stream_AccessNew( in->p_access );
+ if( in->p_stream == NULL )
{
- free( p_input->psz_dupsource );
+ msg_Warn( p_input, "cannot create a stream_t from access" );
+ goto error;
}
- return VLC_EGENERIC;
- }
- /* Init input_thread_sys_t */
- p_input->p_sys = malloc( sizeof( input_thread_sys_t ) );
- p_input->p_sys->i_sub = 0;
- p_input->p_sys->sub = NULL;
-
- /* get length */
- if( !demux_Control( p_input, DEMUX_GET_LENGTH, &i_length ) && i_length > 0 )
- {
- p_playlist = (playlist_t*)vlc_object_find( p_input,
- VLC_OBJECT_PLAYLIST,
- FIND_PARENT );
- if( p_playlist )
+ /* Open a demuxer */
+ if( *psz_demux == '\0' && *in->p_access->psz_demux )
{
- playlist_SetDuration( p_playlist, -1 , i_length );
- val.b_bool = VLC_TRUE;
- var_Set( p_playlist, "item-change", val );
- vlc_object_release( p_playlist );
+ psz_demux = in->p_access->psz_demux;
}
- }
-
-
- /* get fps */
- if( demux_Control( p_input, DEMUX_GET_FPS, &f_fps ) || f_fps < 0.1 )
- {
- i_microsecondperframe = 0;
- }
- else
- {
- i_microsecondperframe = (int64_t)( (double)1000000.0 / (double)f_fps );
- }
-
- /* Look for and add subtitle files */
- var_Get( p_input, "sub-file", &val );
- if( val.psz_string && *val.psz_string )
- {
- subtitle_demux_t *p_sub;
- if( ( p_sub = subtitle_New( p_input, strdup(val.psz_string), i_microsecondperframe, 0 ) ) )
+ in->p_demux = demux2_New( p_input, psz_access, psz_demux, psz_path,
+ in->p_stream, p_input->p_es_out );
+ if( in->p_demux == NULL )
{
- p_sub_toselect = p_sub;
- TAB_APPEND( p_input->p_sys->i_sub, p_input->p_sys->sub, p_sub );
+ msg_Err( p_input, "no suitable demux module for `%s/%s://%s'",
+ psz_access, psz_demux, psz_path );
+ goto error;
}
- }
- if( val.psz_string ) free( val.psz_string );
- var_Get( p_input, "sub-autodetect-file", &val );
- if( val.b_bool )
- {
- subtitle_demux_t *p_sub;
- int i;
- char **tmp = subtitles_Detect( p_input, "", p_input->psz_source );
- char **tmp2 = tmp;
- for( i = 0; *tmp2 != NULL; i++ )
+ /* TODO get title from demux */
+ if( in->i_title <= 0 )
{
- if( ( p_sub = subtitle_New( p_input, strdup(*tmp2++), i_microsecondperframe, i ) ) )
+ if( demux2_Control( in->p_demux, DEMUX_GET_TITLE_INFO,
+ &in->title, &in->i_title,
+ &in->i_title_offset, &in->i_seekpoint_offset ))
{
- TAB_APPEND( p_input->p_sys->i_sub, p_input->p_sys->sub, p_sub );
+ in->i_title = 0;
+ in->title = NULL;
+ }
+ else
+ {
+ in->b_title_demux = VLC_TRUE;
}
}
- free(tmp);
}
+ free( psz_dup );
+ return VLC_SUCCESS;
- es_out_Control( p_input->p_es_out, ES_OUT_SET_ACTIVE, VLC_TRUE );
- val.b_bool = VLC_FALSE;
- if( p_input->stream.p_sout )
- {
- var_Get( p_input, "sout-all", &val );
- }
- es_out_Control( p_input->p_es_out, ES_OUT_SET_MODE,
- val.b_bool ? ES_OUT_MODE_ALL : ES_OUT_MODE_AUTO );
- if( p_sub_toselect )
- {
- es_out_Control( p_input->p_es_out, ES_OUT_SET_ES, p_sub_toselect->p_es, VLC_TRUE );
- }
+error:
+ if( in->p_demux )
+ demux2_Delete( in->p_demux );
- return VLC_SUCCESS;
+ if( in->p_stream )
+ stream_AccessDelete( in->p_stream );
+
+ if( in->p_access )
+ access2_Delete( in->p_access );
+ free( psz_dup );
+
+ return VLC_EGENERIC;
}
/*****************************************************************************
- * ErrorThread: RunThread() error loop
- *****************************************************************************
- * This function is called when an error occured during thread main's loop.
+ * InputSourceClean:
*****************************************************************************/
-static void ErrorThread( input_thread_t *p_input )
+static void InputSourceClean( input_thread_t *p_input, input_source_t *in )
{
- while( !p_input->b_die )
+ if( in->p_demux )
+ demux2_Delete( in->p_demux );
+
+ if( in->p_stream )
+ stream_AccessDelete( in->p_stream );
+
+ if( in->p_access )
+ access2_Delete( in->p_access );
+
+ if( in->i_title > 0 )
{
- /* Sleep a while */
- msleep( INPUT_IDLE_SLEEP );
+ int i;
+ for( i = 0; i < in->i_title; i++ )
+ {
+ vlc_input_title_Delete( in->title[i] );
+ }
+ free( in->title );
}
}
-/*****************************************************************************
- * EndThread: end the input thread
- *****************************************************************************/
-static void EndThread( input_thread_t * p_input )
+static void SlaveDemux( input_thread_t *p_input )
{
+ int64_t i_time;
int i;
-#ifdef HAVE_SYS_TIMES_H
- /* Display statistics */
- struct tms cpu_usage;
- times( &cpu_usage );
-
- msg_Dbg( p_input, "%ld loops consuming user: %ld, system: %ld",
- p_input->c_loops, cpu_usage.tms_utime, cpu_usage.tms_stime );
-#else
- msg_Dbg( p_input, "%ld loops", p_input->c_loops );
-#endif
+ if( demux2_Control( p_input->input.p_demux, DEMUX_GET_TIME, &i_time ) )
+ {
+ msg_Err( p_input, "demux doesn't like DEMUX_GET_TIME" );
+ return;
+ }
- input_DumpStream( p_input );
+ for( i = 0; i < p_input->i_slave; i++ )
+ {
+ input_source_t *in = p_input->slave[i];
+ int i_ret = 1;
- /* Free demultiplexer's data */
- if( p_input->p_demux ) module_Unneed( p_input, p_input->p_demux );
+ if( in->b_eof )
+ continue;
- /* Free all ES and destroy all decoder threads */
- input_EndStream( p_input );
+ if( demux2_Control( in->p_demux, DEMUX_SET_NEXT_DEMUX_TIME, i_time ) )
+ {
+ for( ;; )
+ {
+ int64_t i_stime;
+ if( demux2_Control( in->p_demux, DEMUX_GET_TIME, &i_stime ) )
+ {
+ msg_Err( p_input, "slave[%d] doesn't like "
+ "DEMUX_GET_TIME -> EOF", i );
+ i_ret = 0;
+ break;
+ }
- /* Close optional stream output instance */
- if( p_input->stream.p_sout )
- {
- vlc_object_t *p_pl =
- vlc_object_find( p_input, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
- vlc_value_t keep;
+ if( i_stime >= i_time )
+ break;
- if( var_Get( p_input, "sout-keep", &keep ) >= 0 && keep.b_bool && p_pl )
- {
- /* attach sout to the playlist */
- msg_Warn( p_input, "keeping sout" );
- vlc_object_detach( p_input->stream.p_sout );
- vlc_object_attach( p_input->stream.p_sout, p_pl );
+ if( ( i_ret = in->p_demux->pf_demux( in->p_demux ) ) <= 0 )
+ break;
+ }
}
else
{
- msg_Warn( p_input, "destroying sout" );
- sout_DeleteInstance( p_input->stream.p_sout );
+ i_ret = in->p_demux->pf_demux( in->p_demux );
}
- if( p_pl )
+
+ if( i_ret <= 0 )
{
- vlc_object_release( p_pl );
+ msg_Dbg( p_input, "slave %d EOF", i );
+ in->b_eof = VLC_TRUE;
}
}
+}
+
+static void SlaveSeek( input_thread_t *p_input )
+{
+ int64_t i_time;
+ int i;
- /* Destroy subtitles demuxers */
- if( p_input->p_sys )
+ if( demux2_Control( p_input->input.p_demux, DEMUX_GET_TIME, &i_time ) )
{
- for( i = 0; i < p_input->p_sys->i_sub; i++ )
- {
- subtitle_Close( p_input->p_sys->sub[i] );
- }
- if( p_input->p_sys->i_sub > 0 )
+ msg_Err( p_input, "demux doesn't like DEMUX_GET_TIME" );
+ return;
+ }
+
+ for( i = 0; i < p_input->i_slave; i++ )
+ {
+ input_source_t *in = p_input->slave[i];
+
+ if( demux2_Control( in->p_demux, DEMUX_SET_TIME, i_time ) )
{
- free( p_input->p_sys->sub );
+ msg_Err( p_input, "seek failed for slave %d -> EOF", i );
+ in->b_eof = VLC_TRUE;
}
-
- /* Free input_thread_sys_t */
- free( p_input->p_sys );
}
+}
+/*****************************************************************************
+ * InputMetaUser:
+ *****************************************************************************/
+static vlc_meta_t *InputMetaUser( input_thread_t *p_input )
+{
+ vlc_meta_t *p_meta;
+ vlc_value_t val;
- /* Destroy the stream_t facilities */
- if( p_input->s ) stream_Release( p_input->s );
-
- /* Destroy es out */
- if( p_input->p_es_out ) input_EsOutDelete( p_input->p_es_out );
+ if( ( p_meta = vlc_meta_New() ) == NULL )
+ return NULL;
- /* Close the access plug-in */
- if( p_input->p_access ) module_Unneed( p_input, p_input->p_access );
+ /* Get meta information from user */
+#define GET_META( c, s ) \
+ var_Get( p_input, (s), &val ); \
+ if( *val.psz_string ) \
+ vlc_meta_Add( p_meta, c, val.psz_string ); \
+ free( val.psz_string )
+
+ GET_META( VLC_META_TITLE, "meta-title" );
+ GET_META( VLC_META_AUTHOR, "meta-author" );
+ GET_META( VLC_META_ARTIST, "meta-artist" );
+ GET_META( VLC_META_GENRE, "meta-genre" );
+ GET_META( VLC_META_COPYRIGHT, "meta-copyright" );
+ GET_META( VLC_META_DESCRIPTION, "meta-description" );
+ GET_META( VLC_META_DATE, "meta-date" );
+ GET_META( VLC_META_URL, "meta-url" );
+#undef GET_META
+
+ return p_meta;
+}
- input_AccessEnd( p_input );
+/*****************************************************************************
+ * DecodeUrl: decode a given encoded url
+ *****************************************************************************/
+static void DecodeUrl( char *psz )
+{
+ char *dup = strdup( psz );
+ char *p = dup;
- /* Free info structures XXX destroy es before 'cause vorbis */
- msg_Dbg( p_input, "freeing info structures...");
- input_DelInfo( p_input );
+ while( *p )
+ {
+ if( *p == '%' )
+ {
+ char val[3];
+ p++;
+ if( !*p )
+ {
+ break;
+ }
- free( p_input->psz_source );
- if( p_input->psz_dupsource != NULL ) free( p_input->psz_dupsource );
+ val[0] = *p++;
+ val[1] = *p++;
+ val[2] = '\0';
- /* Tell we're dead */
- p_input->b_dead = 1;
+ *psz++ = strtol( val, NULL, 16 );
+ }
+ else if( *p == '+' )
+ {
+ *psz++ = ' ';
+ p++;
+ }
+ else
+ {
+ *psz++ = *p++;
+ }
+ }
+ *psz++ ='\0';
+ free( dup );
}
/*****************************************************************************
var_Set( p_input, psz_name, val );
- msg_Dbg( p_input, "set input option: %s to %s", psz_name, psz_value );
+ msg_Dbg( p_input, "set input option: %s to %s", psz_name, psz_value ? psz_value : ( val.b_bool ? "true" : "false") );
cleanup:
if( psz_name ) free( psz_name );
}
/*****************************************************************************
- * Callbacks (position, time, state, rate )
+ * MRLSplit: parse the access, demux and url part of the
+ * Media Resource Locator.
*****************************************************************************/
-static int PositionCallback( vlc_object_t *p_this, char const *psz_cmd,
- vlc_value_t oldval, vlc_value_t newval,
- void *p_data )
+static void MRLSplit( input_thread_t *p_input, char *psz_dup,
+ char **ppsz_access, char **ppsz_demux, char **ppsz_path )
{
- input_thread_t *p_input = (input_thread_t *)p_this;
-
- msg_Dbg( p_input, "cmd=%s old=%f new=%f", psz_cmd,
- oldval.f_float, newval.f_float );
-
- if( !strcmp( psz_cmd, "position-offset" ) )
- {
- vlc_value_t val;
- var_Get( p_input, "position", &val );
+ char *psz_access = NULL;
+ char *psz_demux = NULL;
+ char *psz_path = NULL;
+ char *psz, *psz_check;
- newval.f_float += val.f_float;
- }
+ psz = strchr( psz_dup, ':' );
- vlc_mutex_lock( &p_input->stream.stream_lock );
- p_input->stream.p_selected_area->i_seek =
- (int64_t)( newval.f_float *
- (double)p_input->stream.p_selected_area->i_size );
+ /* '@' not allowed in access/demux part */
+ psz_check = strchr( psz_dup, '@' );
+ if( psz_check && psz_check < psz ) psz = 0;
- if( p_input->stream.p_selected_area->i_seek < 0 )
+#if defined( WIN32 ) || defined( UNDER_CE )
+ if( psz - psz_dup == 1 )
{
- p_input->stream.p_selected_area->i_seek = 0;
+ msg_Warn( p_input, "drive letter %c: found in source", *psz_dup );
+ psz_path = psz_dup;
}
- vlc_mutex_unlock( &p_input->stream.stream_lock );
-
- return VLC_SUCCESS;
-}
+ else
+#endif
-static int TimeCallback( vlc_object_t *p_this, char const *psz_cmd,
- vlc_value_t oldval, vlc_value_t newval, void *p_data )
-{
- input_thread_t *p_input = (input_thread_t *)p_this;
- vlc_value_t val;
+ if( psz )
+ {
+ *psz++ = '\0';
+ if( psz[0] == '/' && psz[1] == '/' ) psz += 2;
- /* FIXME TODO FIXME */
- msg_Dbg( p_input, "cmd=%s old=%lld new=%lld", psz_cmd,
- oldval.i_time, newval.i_time );
+ psz_path = psz;
- var_Get( p_input, "length", &val );
- if( val.i_time > 0 )
- {
- val.f_float = (double)newval.i_time / (double)val.i_time;
- if( !strcmp( psz_cmd, "time-offset" ) )
- {
- var_Set( p_input, "position-offset", val );
- }
- else
+ psz = strchr( psz_dup, '/' );
+ if( psz )
{
- var_Set( p_input, "position", val );
+ *psz++ = '\0';
+ psz_demux = psz;
}
+
+ psz_access = psz_dup;
}
else
{
- msg_Warn( p_input, "TimeCallback: length <= 0 -> can't seek" );
+ psz_path = psz_dup;
}
- return VLC_SUCCESS;
-}
-static int StateCallback( vlc_object_t *p_this, char const *psz_cmd,
- vlc_value_t oldval, vlc_value_t newval,
- void *p_data )
-{
- input_thread_t *p_input = (input_thread_t *)p_this;
+ if( !psz_access ) *ppsz_access = "";
+ else *ppsz_access = psz_access;
- msg_Dbg( p_input, "cmd=%s old=%d new=%d",
- psz_cmd, oldval.i_int, newval.i_int );
+ if( !psz_demux ) *ppsz_demux = "";
+ else *ppsz_demux = psz_demux;
- switch( newval.i_int )
- {
- case PLAYING_S:
- input_SetStatus( p_input, INPUT_STATUS_PLAY );
- return VLC_SUCCESS;
- case PAUSE_S:
- input_SetStatus( p_input, INPUT_STATUS_PAUSE );
- return VLC_SUCCESS;
- case END_S:
- input_SetStatus( p_input, INPUT_STATUS_END );
- return VLC_SUCCESS;
- default:
- msg_Err( p_input, "cannot set new state (invalid)" );
- return VLC_EGENERIC;
- }
+ if( !psz_path ) *ppsz_path = "";
+ else *ppsz_path = psz_path;
}
-static int RateCallback( vlc_object_t *p_this, char const *psz_cmd,
- vlc_value_t oldval, vlc_value_t newval, void *p_data )
+/*****************************************************************************
+ * MRLSections: parse title and seekpoint info from the Media Resource Locator.
+ *
+ * Syntax:
+ * [url][@[title-start][:chapter-start][-[title-end][:chapter-end]]]
+ *****************************************************************************/
+static void MRLSections( input_thread_t *p_input, char *psz_source,
+ int *pi_title_start, int *pi_title_end,
+ int *pi_chapter_start, int *pi_chapter_end )
{
- input_thread_t *p_input = (input_thread_t *)p_this;
-
- if( !strcmp( psz_cmd, "rate-slower" ) )
- {
- input_SetStatus( p_input, INPUT_STATUS_SLOWER );
- }
- else if( !strcmp( psz_cmd, "rate-faster" ) )
- {
- input_SetStatus( p_input, INPUT_STATUS_FASTER );
- }
- else
+ char *psz, *psz_end, *psz_next, *psz_check;
+
+ *pi_title_start = *pi_title_end = -1;
+ *pi_chapter_start = *pi_chapter_end = -1;
+
+ /* Start by parsing titles and chapters */
+ if( !psz_source || !( psz = strrchr( psz_source, '@' ) ) ) return;
+
+ /* Check we are really dealing with a title/chapter section */
+ psz_check = psz + 1;
+ if( !*psz_check ) return;
+ if( isdigit(*psz_check) ) strtol( psz_check, &psz_check, 0 );
+ if( *psz_check != ':' && *psz_check != '-' && *psz_check ) return;
+ if( *psz_check == ':' && ++psz_check )
+ if( isdigit(*psz_check) ) strtol( psz_check, &psz_check, 0 );
+ if( *psz_check != '-' && *psz_check ) return;
+ if( *psz_check == '-' && ++psz_check )
+ if( isdigit(*psz_check) ) strtol( psz_check, &psz_check, 0 );
+ if( *psz_check != ':' && *psz_check ) return;
+ if( *psz_check == ':' && ++psz_check )
+ if( isdigit(*psz_check) ) strtol( psz_check, &psz_check, 0 );
+ if( *psz_check ) return;
+
+ /* Separate start and end */
+ *psz++ = 0;
+ if( ( psz_end = strchr( psz, '-' ) ) ) *psz_end++ = 0;
+
+ /* Look for the start title */
+ *pi_title_start = strtol( psz, &psz_next, 0 );
+ if( !*pi_title_start && psz == psz_next ) *pi_title_start = -1;
+ *pi_title_end = *pi_title_start;
+ psz = psz_next;
+
+ /* Look for the start chapter */
+ if( *psz ) psz++;
+ *pi_chapter_start = strtol( psz, &psz_next, 0 );
+ if( !*pi_chapter_start && psz == psz_next ) *pi_chapter_start = -1;
+ *pi_chapter_end = *pi_chapter_start;
+
+ if( psz_end )
{
- msg_Dbg( p_input, "cmd=%s old=%d new=%d",
- psz_cmd, oldval.i_int, newval.i_int );
- input_SetRate( p_input, newval.i_int );
+ /* Look for the end title */
+ *pi_title_end = strtol( psz_end, &psz_next, 0 );
+ if( !*pi_title_end && psz_end == psz_next ) *pi_title_end = -1;
+ psz_end = psz_next;
+
+ /* Look for the end chapter */
+ if( *psz_end ) psz_end++;
+ *pi_chapter_end = strtol( psz_end, &psz_next, 0 );
+ if( !*pi_chapter_end && psz_end == psz_next ) *pi_chapter_end = -1;
}
- return VLC_SUCCESS;
+
+ msg_Dbg( p_input, "source=`%s' title=%d/%d seekpoint=%d/%d",
+ psz_source, *pi_title_start, *pi_chapter_start,
+ *pi_title_end, *pi_chapter_end );
}
projects / vlc / blobdiff