/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h>
-#include <ctype.h>
-
#include <vlc/vlc.h>
+#include <ctype.h>
+#include <limits.h>
+
#include "input_internal.h"
#include <vlc_sout.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.
input_Control( p_input, INPUT_DEL_INFO,
_(VLC_META_INFO_CAT),
_(VLC_META_NOW_PLAYING) );
- vlc_mutex_lock( &p_item->lock );
input_item_SetNowPlaying( p_item, NULL );
- vlc_mutex_unlock( &p_item->lock );
/* */
if( p_input->b_preparsing )
static void Destroy( input_thread_t *p_input, sout_instance_t **pp_sout )
{
vlc_object_detach( p_input );
+ input_thread_private_t *priv = p_input->p;
if( pp_sout )
*pp_sout = NULL;
- if( p_input->p->p_sout )
+ if( priv->p_sout )
{
if( pp_sout )
- *pp_sout = p_input->p->p_sout;
- else if( p_input->p->b_sout_keep )
- SoutKeep( p_input->p->p_sout );
+ *pp_sout = priv->p_sout;
+ else if( priv->b_sout_keep )
+ SoutKeep( priv->p_sout );
else
- sout_DeleteInstance( p_input->p->p_sout );
+ sout_DeleteInstance( priv->p_sout );
}
- vlc_mutex_destroy( &p_input->p->lock_control );
- free( p_input->p );
-
vlc_object_destroy( p_input );
+ vlc_mutex_destroy( &priv->lock_control );
+ free( priv );
}
/**
memset( &p_input->p->counters, 0, sizeof( p_input->p->counters ) );
vlc_mutex_init( p_input, &p_input->p->counters.counters_lock );
+ for( i = 0; i < p_input->p->input.p_item->i_options; i++ )
+ {
+ if( !strncmp( p_input->p->input.p_item->ppsz_options[i], "meta-file", 9 ) )
+ {
+ msg_Dbg( p_input, "Input is a meta file: disabling unneeded options" );
+ var_SetString( p_input, "sout", "" );
+ var_SetBool( p_input, "sout-all", VLC_FALSE );
+ var_SetString( p_input, "input-slave", "" );
+ var_SetInteger( p_input, "input-repeat", 0 );
+ var_SetString( p_input, "sub-file", "" );
+ var_SetBool( p_input, "sub-autodetect-file", VLC_FALSE );
+ }
+ }
+
if( !p_input->b_preparsing )
{
/* Prepare statistics */
}
/* Find a usable sout and attach it to p_input */
- psz = var_GetString( p_input, "sout" );
- if( *psz && strncasecmp( p_input->p->input.p_item->psz_uri, "vlc:", 4 ) )
+ psz = var_GetNonEmptyString( p_input, "sout" );
+ if( psz && strncasecmp( p_input->p->input.p_item->psz_uri, "vlc:", 4 ) )
{
/* Check the validity of the provided sout */
if( p_input->p->p_sout )
var_Change( p_input, "length", VLC_VAR_SETVALUE, &val, NULL );
UpdateItemLength( p_input, val.i_time );
}
+ else
+ {
+ val.i_time = input_item_GetDuration( p_input->p->input.p_item );
+ if( val.i_time > 0 )
+ { /* fallback: gets length from metadata */
+ var_Change( p_input, "length", VLC_VAR_SETVALUE, &val, NULL );
+ UpdateItemLength( p_input, val.i_time );
+ }
+ }
/* Start title/chapter */
if( !p_input->b_preparsing )
}
/* Look for and add subtitle files */
- psz_subtitle = var_GetString( p_input, "sub-file" );
- if( *psz_subtitle )
+ psz_subtitle = var_GetNonEmptyString( p_input, "sub-file" );
+ if( psz_subtitle != NULL )
{
msg_Dbg( p_input, "forced subtitle: %s", psz_subtitle );
input_AddSubtitles( p_input, psz_subtitle, VLC_FALSE );
var_Get( p_input, "sub-autodetect-file", &val );
if( val.b_bool )
{
- char *psz_autopath = var_GetString( p_input, "sub-autodetect-path" );
+ char *psz_autopath = var_GetNonEmptyString( p_input, "sub-autodetect-path" );
char **subs = subtitles_Detect( p_input, psz_autopath,
p_input->p->input.p_item->psz_uri );
input_source_t *sub;
i = 0;
+ if( psz_autopath == NULL )
+ psz_autopath = strdup("");
/* Try to autoselect the first autodetected subtitles file
* if no subtitles file was specified */
- if( *psz_subtitle == 0 && subs && subs[0] )
+ if( ( psz_subtitle == NULL ) && subs && subs[0] )
{
input_AddSubtitles( p_input, subs[0], VLC_FALSE );
free( subs[0] );
/* Then, just add the following subtitles files */
for( ; subs && subs[i]; i++ )
{
- if( strcmp( psz_subtitle, subs[i] ) )
+ if( !psz_subtitle || strcmp( psz_subtitle, subs[i] ) )
{
sub = InputSourceNew( p_input );
if( !InputSourceInit( p_input, sub, subs[i], "subtitle" ) )
free( psz_subtitle );
/* Look for slave */
- psz = var_GetString( p_input, "input-slave" );
- if( *psz )
+ psz = var_GetNonEmptyString( p_input, "input-slave" );
+ if( psz != NULL )
{
char *psz_delim;
input_source_t *slave;
else free( slave );
psz = psz_delim;
}
+ free( psz );
}
- if( psz ) free( psz );
}
else
{
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,
if( f_pos < 0.0 ) f_pos = 0.0;
if( f_pos > 1.0 ) f_pos = 1.0;
/* Reset the decoders states and clock sync (before calling the demuxer */
- es_out_Control( p_input->p->p_es_out, ES_OUT_RESET_PCR );
- input_EsOutDiscontinuity( p_input->p->p_es_out, VLC_TRUE, VLC_FALSE );
+ input_EsOutChangePosition( p_input->p->p_es_out );
if( demux2_Control( p_input->p->input.p_demux, DEMUX_SET_POSITION,
f_pos ) )
{
if( i_time < 0 ) i_time = 0;
/* Reset the decoders states and clock sync (before calling the demuxer */
- es_out_Control( p_input->p->p_es_out, ES_OUT_RESET_PCR );
- input_EsOutDiscontinuity( p_input->p->p_es_out, VLC_TRUE, VLC_FALSE );
+ input_EsOutChangePosition( p_input->p->p_es_out );
i_ret = demux2_Control( p_input->p->input.p_demux,
DEMUX_SET_TIME, i_time );
val.i_int = PLAYING_S;
var_Change( p_input, "state", VLC_VAR_SETVALUE, &val, NULL );
- /* Reset clock */
- es_out_Control( p_input->p->p_es_out, ES_OUT_RESET_PCR );
+ /* */
+ if( !i_ret )
+ input_EsOutChangeState( p_input->p->p_es_out );
}
else if( val.i_int == PAUSE_S && p_input->i_state == PLAYING_S &&
p_input->p->b_can_pause )
p_input->i_state = val.i_int;
var_Change( p_input, "state", VLC_VAR_SETVALUE, &val, NULL );
- /* Send discontinuity to decoders (it will allow them to flush
- * if implemented */
- input_EsOutDiscontinuity( p_input->p->p_es_out, VLC_FALSE, VLC_FALSE );
+ /* */
+ if( !i_ret )
+ input_EsOutChangeState( p_input->p->p_es_out );
}
else if( val.i_int == PAUSE_S && !p_input->p->b_can_pause )
{
{
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 )
{
val.i_int = i_rate;
var_Change( p_input, "rate", VLC_VAR_SETVALUE, &val, NULL );
- input_EsOutDiscontinuity( p_input->p->p_es_out,
- VLC_FALSE, VLC_FALSE );
-
p_input->p->i_rate = i_rate;
- input_EsOutSetRate( p_input->p->p_es_out );
+ input_EsOutChangeRate( p_input->p->p_es_out );
b_force_update = VLC_TRUE;
}
if( i_title >= 0 && i_title < p_input->p->input.i_title )
{
- es_out_Control( p_input->p->p_es_out, ES_OUT_RESET_PCR );
- input_EsOutDiscontinuity( p_input->p->p_es_out, VLC_TRUE, VLC_FALSE );
+ input_EsOutChangePosition( p_input->p->p_es_out );
demux2_Control( p_demux, DEMUX_SET_TITLE, i_title );
input_ControlVarTitle( p_input, i_title );
if( i_title >= 0 && i_title < p_input->p->input.i_title )
{
- es_out_Control( p_input->p->p_es_out, ES_OUT_RESET_PCR );
- input_EsOutDiscontinuity( p_input->p->p_es_out, VLC_TRUE, VLC_FALSE );
+ input_EsOutChangePosition( p_input->p->p_es_out );
access2_Control( p_access, ACCESS_SET_TITLE, i_title );
stream_AccessReset( p_input->p->input.p_stream );
if( i_seekpoint >= 0 && i_seekpoint <
p_input->p->input.title[p_demux->info.i_title]->i_seekpoint )
{
- es_out_Control( p_input->p->p_es_out, ES_OUT_RESET_PCR );
- input_EsOutDiscontinuity( p_input->p->p_es_out, VLC_TRUE, VLC_FALSE );
+
+ input_EsOutChangePosition( p_input->p->p_es_out );
demux2_Control( p_demux, DEMUX_SET_SEEKPOINT, i_seekpoint );
}
else
i_seekpoint--;
}
- else if( i_type == INPUT_CONTROL_SET_SEEKPOINT_NEXT )
+ else if( i_type == INPUT_CONTROL_SET_SEEKPOINT_NEXT )
i_seekpoint = p_access->info.i_seekpoint + 1;
else
i_seekpoint = val.i_int;
if( i_seekpoint >= 0 && i_seekpoint <
p_input->p->input.title[p_access->info.i_title]->i_seekpoint )
{
- es_out_Control( p_input->p->p_es_out, ES_OUT_RESET_PCR );
- input_EsOutDiscontinuity( p_input->p->p_es_out, VLC_TRUE, VLC_FALSE );
+ input_EsOutChangePosition( p_input->p->p_es_out );
access2_Control( p_access, ACCESS_SET_SEEKPOINT,
i_seekpoint );
vlc_meta_t *p_meta = vlc_meta_New();
access2_Control( p_input->p->input.p_access,ACCESS_GET_META, p_meta );
InputUpdateMeta( p_input, p_meta );
- var_SetBool( p_input, "item-change", p_input->p->input.p_item->i_id );
+ var_SetInteger( pl_Get( p_input ), "item-change", p_input->p->input.p_item->i_id );
p_access->info.i_update &= ~INPUT_UPDATE_META;
}
*****************************************************************************/
static void UpdateItemLength( input_thread_t *p_input, int64_t i_length )
{
- vlc_mutex_lock( &p_input->p->input.p_item->lock );
- p_input->p->input.p_item->i_duration = i_length;
- vlc_mutex_unlock( &p_input->p->input.p_item->lock );
+ input_item_SetDuration( p_input->p->input.p_item, (mtime_t) i_length );
if( !p_input->b_preparsing )
{
TAB_INIT( in->i_title, in->title );
in->b_can_pace_control = VLC_TRUE;
in->b_eof = VLC_FALSE;
+ in->f_fps = 0.0;
in->i_cr_average = 0;
return in;
char *psz_tmp;
char *psz;
vlc_value_t val;
+ double f_fps;
strcpy( psz_dup, psz_mrl );
{
/* special hack for forcing a demuxer with --demux=module
* (and do nothing with a list) */
- char *psz_var_demux = var_GetString( p_input, "demux" );
+ char *psz_var_demux = var_GetNonEmptyString( p_input, "demux" );
- if( *psz_var_demux != '\0' &&
+ if( psz_var_demux != NULL &&
!strchr(psz_var_demux, ',' ) &&
!strchr(psz_var_demux, ':' ) )
{
msg_Dbg( p_input, "enforced demux ` %s'", psz_demux );
}
- else if( psz_var_demux )
- {
- free( psz_var_demux );
- }
}
/* Try access_demux if no demux given */
}
/* */
- psz_tmp = psz = var_GetString( p_input, "access-filter" );
+ psz_tmp = psz = var_GetNonEmptyString( p_input, "access-filter" );
while( psz && *psz )
{
access_t *p_access = in->p_access;
psz = end;
}
- if( psz_tmp ) free( psz_tmp );
+ free( psz_tmp );
/* Get infos from access */
if( !p_input->b_preparsing )
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;
}
in->b_title_demux = VLC_TRUE;
}
}
- /* get attachment
- * FIXME improve for b_preparsing: move it after GET_META and check psz_arturl */
- if( 1 || !p_input->b_preparsing )
+ }
+
+ /* get attachment
+ * FIXME improve for b_preparsing: move it after GET_META and check psz_arturl */
+ if( 1 || !p_input->b_preparsing )
+ {
+ int i_attachment;
+ input_attachment_t **attachment;
+ if( !demux2_Control( in->p_demux, DEMUX_GET_ATTACHMENTS,
+ &attachment, &i_attachment ) )
{
- int i_attachment;
- input_attachment_t **attachment;
- 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 );
- vlc_mutex_unlock( &p_input->p->input.p_item->lock );
- }
+ vlc_mutex_lock( &p_input->p->input.p_item->lock );
+ AppendAttachment( &p_input->p->i_attachment, &p_input->p->attachment,
+ i_attachment, attachment );
+ vlc_mutex_unlock( &p_input->p->input.p_item->lock );
}
}
+ if( !demux2_Control( in->p_demux, DEMUX_GET_FPS, &f_fps ) )
+ {
+ vlc_mutex_lock( &p_input->p->input.p_item->lock );
+ in->f_fps = f_fps;
+ vlc_mutex_unlock( &p_input->p->input.p_item->lock );
+ }
if( var_GetInteger( p_input, "clock-synchro" ) != -1 )
in->b_can_pace_control = !var_GetInteger( p_input, "clock-synchro" );
static void InputUpdateMeta( input_thread_t *p_input, vlc_meta_t *p_meta )
{
input_item_t *p_item = p_input->p->input.p_item;
- char * psz_saved_arturl = NULL;
- const char * psz_arturl = NULL;
+ char * psz_arturl = NULL;
char *psz_title = NULL;
int i;
+ int i_arturl_event = VLC_FALSE;
if( !p_meta )
return;
+ psz_arturl = input_item_GetArtURL( p_item );
+
vlc_mutex_lock( &p_item->lock );
if( vlc_meta_Get( p_meta, vlc_meta_Title ) && !p_item->b_fixed_name )
psz_title = strdup( vlc_meta_Get( p_meta, vlc_meta_Title ) );
- if( input_item_GetArtURL( p_item ) )
- psz_saved_arturl = strdup( input_item_GetArtURL( p_item ) );
-
vlc_meta_Merge( p_item->p_meta, p_meta );
- if( psz_saved_arturl && *psz_saved_arturl )
- input_item_SetArtURL( p_item, psz_saved_arturl );
+ if( psz_arturl && *psz_arturl )
+ {
+ vlc_meta_Set( p_item->p_meta, vlc_meta_ArtworkURL, psz_arturl );
+ i_arturl_event = VLC_TRUE;
+ }
- free( psz_saved_arturl );
vlc_meta_Delete( p_meta );
- psz_arturl = input_item_GetArtURL( p_item );
if( psz_arturl && !strncmp( psz_arturl, "attachment://", strlen("attachment") ) )
{
/* Don't look for art cover if sout
* XXX It can change when sout has meta data support */
if( p_input->p->p_sout && !p_input->b_preparsing )
- input_item_SetArtURL( p_item, "" );
+ {
+ vlc_meta_Set( p_item->p_meta, vlc_meta_ArtworkURL, "" );
+ i_arturl_event = VLC_TRUE;
+
+ }
else
input_ExtractAttachmentAndCacheArt( p_input );
}
-
- input_item_SetPreparsed( p_item, VLC_TRUE );
+ free( psz_arturl );
/* 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;
+
+ /* Notify interested third parties */
+ event.type = vlc_InputItemMetaChanged;
+ event.u.input_item_meta_changed.meta_type = vlc_meta_ArtworkURL;
+ vlc_event_send( &p_item->event_manager, &event );
+ }
+
if( psz_title )
{
input_Control( p_input, INPUT_SET_NAME, psz_title );
return VLC_FALSE;
}
+static void AppendAttachment( int *pi_attachment, input_attachment_t ***ppp_attachment,
+ int i_new, input_attachment_t **pp_new )
+{
+ 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;
+}
+
+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 ) )
+ {
+ vlc_mutex_unlock( &p_item->lock );
+ return;
+ }
+ vlc_mutex_unlock( &p_item->lock );
+#endif
+
+ 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 );
+ }
+ free( p_demux->p_private );
+}
+
/*****************************************************************************
* MRLSplit: parse the access, demux and url part of the
projects / vlc / blobdiff