/*****************************************************************************
* Preamble
*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <vlc/vlc.h>
#include <ctype.h>
+#include <limits.h>
+#include <assert.h>
#include "input_internal.h"
static void InputSourceClean( input_source_t * );
/* TODO */
//static void InputGetAttachments( input_thread_t *, input_source_t * );
-
static void SlaveDemux( input_thread_t *p_input );
static void SlaveSeek( input_thread_t *p_input );
static sout_instance_t *SoutFind( vlc_object_t *p_parent, input_item_t *p_item, vlc_bool_t * );
static void SoutKeep( sout_instance_t * );
+static void DemuxMeta( input_thread_t *p_input, vlc_meta_t *p_meta, demux_t *p_demux );
+static void AppendAttachment( int *pi_attachment, input_attachment_t ***ppp_attachment,
+ int i_new, input_attachment_t **pp_new );
+
/*****************************************************************************
* This function creates a new input, and returns a pointer
* to its description. On error, it returns NULL.
* - 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)
+ * - can-pause
* * For intf callback upon changes
* - intf-change
+ * - rate-change for when playback rate changes
* TODO explain when Callback is called
* TODO complete this list (?)
*****************************************************************************/
p_input->p->input.title = NULL;
p_input->p->input.i_title_offset = p_input->p->input.i_seekpoint_offset = 0;
p_input->p->input.b_can_pace_control = VLC_TRUE;
+ p_input->p->input.b_can_rate_control = VLC_TRUE;
+ p_input->p->input.b_rescale_ts = VLC_TRUE;
p_input->p->input.b_eof = VLC_FALSE;
p_input->p->input.i_cr_average = 0;
/* Parse input options */
vlc_mutex_lock( &p_item->lock );
for( i = 0; i < p_item->i_options; i++ )
- var_OptionParse( p_input, p_item->ppsz_options[i] );
+ var_OptionParse( VLC_OBJECT(p_input), p_item->ppsz_options[i] );
vlc_mutex_unlock( &p_item->lock );
/* Create Object Variables for private use only */
sout_DeleteInstance( priv->p_sout );
}
- vlc_object_destroy( p_input );
+ vlc_object_release( p_input );
vlc_mutex_destroy( &priv->lock_control );
free( priv );
}
{
/* Create a new one */
p_input->p->p_sout = sout_NewInstance( p_input, psz );
-
if( !p_input->p->p_sout )
{
input_ChangeState( p_input, ERROR_S );
}
/* Create es out */
- p_input->p->p_es_out = input_EsOutNew( p_input );
+ p_input->p->p_es_out = input_EsOutNew( p_input, p_input->p->i_rate );
es_out_Control( p_input->p->p_es_out, ES_OUT_SET_ACTIVE, VLC_FALSE );
es_out_Control( p_input->p->p_es_out, ES_OUT_SET_MODE, ES_OUT_MODE_NONE );
/* Global flag */
p_input->b_can_pace_control = p_input->p->input.b_can_pace_control;
p_input->p->b_can_pause = p_input->p->input.b_can_pause;
+ p_input->p->b_can_rate_control = p_input->p->input.b_can_rate_control;
/* Fix pts delay */
if( p_input->i_pts_delay < 0 )
InputMetaUser( p_input, p_meta );
/* Get meta data from master input */
- demux2_Control( p_input->p->input.p_demux, DEMUX_GET_META, p_meta );
+ DemuxMeta( p_input, p_meta, p_input->p->input.p_demux );
/* Access_file does not give any meta, and there are no slave */
if( !p_input->b_preparsing )
/* Get meta data from slave input */
for( i = 0; i < p_input->p->i_slave; i++ )
{
- demux2_Control( p_input->p->slave[i]->p_demux,
- DEMUX_GET_META, p_meta );
+ DemuxMeta( p_input, p_meta, p_input->p->slave[i]->p_demux );
if( p_input->p->slave[i]->p_access )
{
access2_Control( p_input->p->slave[i]->p_access,
*****************************************************************************/
static void Error( input_thread_t *p_input )
{
+ input_ChangeState( p_input, ERROR_S );
while( !p_input->b_die )
{
/* Sleep a while */
- input_ChangeState( p_input, ERROR_S );
msleep( INPUT_IDLE_SLEEP );
}
}
{
int i_rate;
- if( i_type == INPUT_CONTROL_SET_RATE_SLOWER )
- i_rate = p_input->p->i_rate * 2;
- else if( i_type == INPUT_CONTROL_SET_RATE_FASTER )
- i_rate = p_input->p->i_rate / 2;
- else
+ if( i_type == INPUT_CONTROL_SET_RATE )
+ {
i_rate = val.i_int;
+ }
+ else
+ {
+ static const int ppi_factor[][2] = {
+ {1,64}, {1,32}, {1,16}, {1,8}, {1,4}, {1,3}, {1,2}, {2,3},
+ {1,1},
+ {3,2}, {2,1}, {3,1}, {4,1}, {8,1}, {16,1}, {32,1}, {64,1},
+ {0,0}
+ };
+ int i_error;
+ int i_idx;
+ int i;
+
+ i_error = INT_MAX;
+ i_idx = -1;
+ for( i = 0; ppi_factor[i][0] != 0; i++ )
+ {
+ const int i_test_r = INPUT_RATE_DEFAULT * ppi_factor[i][0] / ppi_factor[i][1];
+ const int i_test_e = abs(p_input->p->i_rate - i_test_r);
+ if( i_test_e < i_error )
+ {
+ i_idx = i;
+ i_error = i_test_e;
+ }
+ }
+ assert( i_idx >= 0 && ppi_factor[i_idx][0] != 0 );
+
+ if( i_type == INPUT_CONTROL_SET_RATE_SLOWER )
+ {
+ if( ppi_factor[i_idx+1][0] > 0 )
+ i_rate = INPUT_RATE_DEFAULT * ppi_factor[i_idx+1][0] / ppi_factor[i_idx+1][1];
+ else
+ i_rate = INPUT_RATE_MAX+1;
+ }
+ else
+ {
+ assert( i_type == INPUT_CONTROL_SET_RATE_FASTER );
+ if( i_idx > 0 )
+ i_rate = INPUT_RATE_DEFAULT * ppi_factor[i_idx-1][0] / ppi_factor[i_idx-1][1];
+ else
+ i_rate = INPUT_RATE_MIN-1;
+ }
+ }
if( i_rate < INPUT_RATE_MIN )
{
i_rate = INPUT_RATE_MAX;
}
if( i_rate != INPUT_RATE_DEFAULT &&
- ( !p_input->b_can_pace_control ||
+ ( ( !p_input->b_can_pace_control && !p_input->p->b_can_rate_control ) ||
( p_input->p->p_sout && !p_input->p->b_out_pace_control ) ) )
{
msg_Dbg( p_input, "cannot change rate" );
i_rate = INPUT_RATE_DEFAULT;
}
+ if( i_rate != p_input->p->i_rate &&
+ !p_input->b_can_pace_control && p_input->p->b_can_rate_control )
+ {
+ int i_ret;
+ if( p_input->p->input.p_access )
+ i_ret = VLC_EGENERIC;
+ else
+ i_ret = demux2_Control( p_input->p->input.p_demux,
+ DEMUX_SET_RATE, &i_rate );
+ if( i_ret )
+ {
+ msg_Warn( p_input, "ACCESS/DEMUX_SET_RATE failed" );
+ i_rate = p_input->p->i_rate;
+ }
+ }
+
+ /* */
if( i_rate != p_input->p->i_rate )
{
val.i_int = i_rate;
var_Change( p_input, "rate", VLC_VAR_SETVALUE, &val, NULL );
+ var_SetBool( p_input, "rate-change", VLC_TRUE );
p_input->p->i_rate = i_rate;
- input_EsOutChangeRate( p_input->p->p_es_out );
+ /* FIXME do we need a RESET_PCR when !p_input->p->input.b_rescale_ts ? */
+ if( p_input->p->input.b_rescale_ts )
+ input_EsOutChangeRate( p_input->p->p_es_out, i_rate );
b_force_update = VLC_TRUE;
}
pl_Yield( p_input );
var_SetInteger( pl_Get( p_input ), "item-change",
p_input->p->input.p_item->i_id );
- pl_Release( p_input )
+ pl_Release( p_input );
}
}
in->p_demux = NULL;
in->b_title_demux = VLC_FALSE;
TAB_INIT( in->i_title, in->title );
+ in->b_can_pause = VLC_TRUE;
in->b_can_pace_control = VLC_TRUE;
+ in->b_can_rate_control = VLC_TRUE;
+ in->b_rescale_ts = VLC_TRUE;
in->b_eof = VLC_FALSE;
in->f_fps = 0.0;
in->i_cr_average = 0;
/* Split uri */
if( !p_input->b_preparsing )
{
- MRLSplit( VLC_OBJECT(p_input), psz_dup,
- &psz_access, &psz_demux, &psz_path );
+ MRLSplit( psz_dup, &psz_access, &psz_demux, &psz_path );
msg_Dbg( p_input, "`%s' gives access `%s' demux `%s' path `%s'",
psz_mrl, psz_access, psz_demux, psz_path );
if( !psz_access ||
(strncmp( psz_access, "udp", 3 ) &&
strncmp( psz_access, "rtp", 3 )) )
-
- /* Find optional titles and seekpoints */
- MRLSections( p_input, psz_path, &in->i_title_start, &in->i_title_end,
+ {
+ /* 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 );
+ }
if( psz_forced_demux && *psz_forced_demux )
{
in->i_title = 0;
in->title = NULL;
}
- 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 );
+ if( demux2_Control( in->p_demux, DEMUX_CAN_CONTROL_PACE,
+ &in->b_can_pace_control ) )
+ in->b_can_pace_control = VLC_FALSE;
+
+ if( !in->b_can_pace_control )
+ {
+ if( demux2_Control( in->p_demux, DEMUX_CAN_CONTROL_RATE,
+ &in->b_can_rate_control, &in->b_rescale_ts ) )
+ {
+ in->b_can_rate_control = VLC_FALSE;
+ in->b_rescale_ts = VLC_TRUE; /* not used */
+ }
+ }
+ else
+ {
+ in->b_can_rate_control = VLC_TRUE;
+ in->b_rescale_ts = VLC_TRUE;
+ }
+ if( demux2_Control( in->p_demux, DEMUX_CAN_PAUSE,
+ &in->b_can_pause ) )
+ in->b_can_pause = VLC_FALSE;
+ var_SetBool( p_input, "can-pause", in->b_can_pause );
- /* FIXME todo
- demux2_Control( in->p_demux, DEMUX_CAN_SEEK,
+ int ret = demux2_Control( in->p_demux, DEMUX_CAN_SEEK,
&val.b_bool );
- */
+ if( ret != VLC_SUCCESS )
+ val.b_bool = VLC_FALSE;
+ var_Set( p_input, "seekable", val );
}
else
{
{
msg_Dbg( p_input, "retrying with access `' demux `' path `%s'",
psz_mrl );
- in->p_access = access2_New( p_input,
+ psz_demux = "" ;
+ in->p_access = access2_New( p_input,
"", "", psz_mrl,
p_input->b_preparsing );
}
}
access2_Control( in->p_access, ACCESS_CAN_CONTROL_PACE,
&in->b_can_pace_control );
+ in->b_can_rate_control = in->b_can_pace_control;
+ in->b_rescale_ts = VLC_TRUE;
+
access2_Control( in->p_access, ACCESS_CAN_PAUSE,
&in->b_can_pause );
+ var_SetBool( p_input, "can-pause", in->b_can_pause );
access2_Control( in->p_access, ACCESS_CAN_SEEK,
&val.b_bool );
var_Set( p_input, "seekable", val );
{
const char *psz_a, *psz_d;
psz_buf = strdup( in->p_access->psz_path );
- MRLSplit( VLC_OBJECT(p_input), psz_buf,
- &psz_a, &psz_d, &psz_real_path );
+ MRLSplit( psz_buf, &psz_a, &psz_d, &psz_real_path );
}
else
{
msg_Err( p_input, "no suitable demux module for `%s/%s://%s'",
psz_access, psz_demux, psz_path );
intf_UserFatal( VLC_OBJECT( p_input ), VLC_FALSE,
- _("Can't recognize the input's format"),
- _("The format of '%s' can't be detected. "
+ _("VLC can't recognize the input's format"),
+ _("The format of '%s' cannot be detected. "
"Have a look the log for details."), psz_mrl );
goto error;
}
if( !demux2_Control( in->p_demux, DEMUX_GET_ATTACHMENTS,
&attachment, &i_attachment ) )
{
- int i;
vlc_mutex_lock( &p_input->p->input.p_item->lock );
- p_input->p->attachment = realloc( p_input->p->attachment,
- sizeof(input_attachment_t**) * ( p_input->p->i_attachment + i_attachment ) );
- for( i = 0; i < i_attachment; i++ )
- p_input->p->attachment[p_input->p->i_attachment++] = attachment[i];
- if( attachment )
- free( attachment );
+ AppendAttachment( &p_input->p->i_attachment, &p_input->p->attachment,
+ i_attachment, attachment );
vlc_mutex_unlock( &p_input->p->input.p_item->lock );
}
}
input_ExtractAttachmentAndCacheArt( p_input );
}
free( psz_arturl );
-
- input_item_SetPreparsed( p_item, VLC_TRUE );
/* A bit ugly */
p_meta = NULL;
}
vlc_mutex_unlock( &p_item->lock );
+ input_item_SetPreparsed( p_item, VLC_TRUE );
+
if( i_arturl_event == VLC_TRUE )
{
vlc_event_t event;
}
-static inline vlc_bool_t IsValidAccess( const char *psz )
+static void AppendAttachment( int *pi_attachment, input_attachment_t ***ppp_attachment,
+ int i_new, input_attachment_t **pp_new )
{
- char c;
+ int i_attachment = *pi_attachment;
+ input_attachment_t **attachment = *ppp_attachment;
+ int i;
+
+ attachment = realloc( attachment,
+ sizeof(input_attachment_t**) * ( i_attachment + i_new ) );
+ for( i = 0; i < i_new; i++ )
+ attachment[i_attachment++] = pp_new[i];
+ if( pp_new )
+ free( pp_new );
+
+ /* */
+ *pi_attachment = i_attachment;
+ *ppp_attachment = attachment;
+}
- while( ( c = *psz ) != '\0' )
+static void DemuxMeta( input_thread_t *p_input, vlc_meta_t *p_meta, demux_t *p_demux )
+{
+ vlc_bool_t b_bool;
+ module_t *p_id3;
+
+
+#if 0
+ /* XXX I am not sure it is a great idea, besides, there is more than that
+ * if we want to do it right */
+ vlc_mutex_lock( &p_item->lock );
+ if( p_item->p_meta && (p_item->p_meta->i_status & ITEM_PREPARSED ) )
{
- if( c == ':' )
- return VLC_TRUE;
+ vlc_mutex_unlock( &p_item->lock );
+ return;
+ }
+ vlc_mutex_unlock( &p_item->lock );
+#endif
- if( ( !isascii( c ) || !isalnum( c ) ) && c != '-' && ( c != '/' ) )
- return VLC_FALSE;
- psz++;
+ demux2_Control( p_demux, DEMUX_GET_META, p_meta );
+ if( demux2_Control( p_demux, DEMUX_HAS_UNSUPPORTED_META, &b_bool ) )
+ return;
+ if( !b_bool )
+ return;
+
+ p_demux->p_private = malloc( sizeof( demux_meta_t ) );
+ if(! p_demux->p_private )
+ return;
+
+ p_id3 = module_Need( p_demux, "meta reader", NULL, 0 );
+ if( p_id3 )
+ {
+ demux_meta_t *p_demux_meta = (demux_meta_t *)p_demux->p_private;
+
+ if( p_demux_meta->p_meta )
+ {
+ vlc_meta_Merge( p_meta, p_demux_meta->p_meta );
+ vlc_meta_Delete( p_demux_meta->p_meta );
+ }
+
+ if( p_demux_meta->i_attachments > 0 )
+ {
+ vlc_mutex_lock( &p_input->p->input.p_item->lock );
+ AppendAttachment( &p_input->p->i_attachment, &p_input->p->attachment,
+ p_demux_meta->i_attachments, p_demux_meta->attachments );
+ vlc_mutex_unlock( &p_input->p->input.p_item->lock );
+ }
+ module_Unneed( p_demux, p_id3 );
}
- /* should not happen though */
- return VLC_FALSE;
+ free( p_demux->p_private );
}
* MRLSplit: parse the access, demux and url part of the
* Media Resource Locator.
*****************************************************************************/
-void MRLSplit( vlc_object_t *p_input, char *psz_dup,
- const char **ppsz_access, const char **ppsz_demux,
+void MRLSplit( char *psz_dup, const char **ppsz_access, const char **ppsz_demux,
char **ppsz_path )
{
- const char *psz_access = "";
- const char *psz_demux = "";
+ char *psz_access = NULL;
+ char *psz_demux = NULL;
char *psz_path;
- char *psz;
- psz = strchr( psz_dup, ':' );
-
- if( psz != NULL )
+ /* Either there is an access/demux specification before ://
+ * or we have a plain local file path. */
+ psz_path = strstr( psz_dup, "://" );
+ if( psz_path != NULL )
{
- /* Guess whether ':' is part of a local filename, or separates
- * access/demux from path */
- if( !IsValidAccess( psz_dup ) )
- psz = NULL;
-#if defined( WIN32 ) || defined( UNDER_CE )
- else if( ( psz - psz_dup == 1 ) && isalpha( psz_dup[0] ) )
- {
- msg_Dbg( p_input, "drive letter %c: found in source", *psz_dup );
- psz = NULL;
- }
-#endif
- }
-
- if( psz != NULL )
- {
- *psz++ = '\0';
- if( psz[0] == '/' && psz[1] == '/' ) psz += 2;
-
- psz_path = psz;
-
- psz = strchr( psz_dup, '/' );
- if( psz )
- {
- *psz++ = '\0';
- psz_demux = psz;
- }
+ *psz_path = '\0';
+ psz_path += 3; /* skips "://" */
+ /* Separate access from demux (<access>/<demux>://<path>) */
psz_access = psz_dup;
+ psz_demux = strchr( psz_access, '/' );
+ if( psz_demux )
+ *psz_demux++ = '\0';
}
else
{
psz_path = psz_dup;
}
- *ppsz_access = psz_access;
- *ppsz_demux = psz_demux;
- *ppsz_path = psz_path;
+ *ppsz_access = psz_access ? psz_access : "";
+ *ppsz_demux = psz_demux ? psz_demux : "";
+ *ppsz_path = psz_path ? psz_path : "";
}
/*****************************************************************************
projects / vlc / blobdiff