/*****************************************************************************
* input.c: input thread
*****************************************************************************
- * Copyright (C) 1998-2004 the VideoLAN team
+ * Copyright (C) 1998-2007 the VideoLAN team
* $Id$
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h>
-#include <ctype.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
#include <vlc/vlc.h>
-#include <vlc/input.h>
-#include <vlc/decoder.h>
-#include <vlc/vout.h>
+
+#include <ctype.h>
+#include <limits.h>
+#include <assert.h>
#include "input_internal.h"
-#include "stream_output.h"
-#include "vlc_playlist.h"
-#include "vlc_interface.h"
-#include "vlc_interaction.h"
-#include "vlc_meta_engine.h"
+#include <vlc_sout.h>
+#include "../stream_output/stream_output.h"
-#include "charset.h"
+#include <vlc_playlist.h>
+#include <vlc_interface.h>
+#include <vlc_url.h>
+#include <vlc_demux.h>
+#include <vlc_charset.h>
#ifdef HAVE_SYS_STAT_H
# include <sys/stat.h>
* Local prototypes
*****************************************************************************/
static int Run ( input_thread_t *p_input );
-static int RunAndClean ( input_thread_t *p_input );
+static int RunAndDestroy ( input_thread_t *p_input );
-static input_thread_t * Create ( vlc_object_t *, input_item_t *, char *,
- vlc_bool_t );
+static input_thread_t * Create ( vlc_object_t *, input_item_t *,
+ const char *, vlc_bool_t, sout_instance_t * );
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 MainLoop( input_thread_t *p_input );
+static void Destroy( input_thread_t *p_input, sout_instance_t **pp_sout );
static inline int ControlPopNoLock( input_thread_t *, int *, vlc_value_t * );
static void ControlReduce( input_thread_t * );
static int UpdateFromAccess( input_thread_t * );
static int UpdateFromDemux( input_thread_t * );
-static int UpdateMeta( input_thread_t * );
static void UpdateItemLength( input_thread_t *, int64_t i_length );
-static void DecodeUrl( 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 * );
-
+ const char *, const char *psz_forced_demux );
+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 void InputMetaUser( input_thread_t *p_input );
+static void InputMetaUser( input_thread_t *p_input, vlc_meta_t *p_meta );
+static void InputUpdateMeta( input_thread_t *p_input, vlc_meta_t *p_meta );
+
+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
* - 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 (?)
*****************************************************************************/
static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item,
- char *psz_header, vlc_bool_t b_quick )
+ const char *psz_header, vlc_bool_t b_quick, sout_instance_t *p_sout )
{
input_thread_t *p_input = NULL; /* thread descriptor */
vlc_value_t val;
msg_Err( p_parent, "out of memory" );
return NULL;
}
+ MALLOC_NULL( p_input->p, input_thread_private_t );
+
+ /* One "randomly" selected input thread is responsible for computing
+ * the global stats. Check if there is already someone doing this */
+ if( p_input->p_libvlc->p_playlist->p_stats && !b_quick )
+ {
+ vlc_mutex_lock( &p_input->p_libvlc->p_playlist->p_stats->lock );
+ if( p_input->p_libvlc->p_playlist->p_stats_computer == NULL )
+ {
+ p_input->p_libvlc->p_playlist->p_stats_computer = p_input;
+ }
+ vlc_mutex_unlock( &p_input->p_libvlc->p_playlist->p_stats->lock );
+ }
+
p_input->b_preparsing = b_quick;
p_input->psz_header = psz_header ? strdup( psz_header ) : 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->p->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->p->i_stop = 0;
+ p_input->p->i_run = 0;
+ p_input->p->i_title = 0;
+ p_input->p->title = NULL;
+ p_input->p->i_title_offset = p_input->p->i_seekpoint_offset = 0;
p_input->i_state = INIT_S;
- p_input->i_rate = INPUT_RATE_DEFAULT;
- p_input->i_bookmark = 0;
- p_input->bookmark = NULL;
- p_input->p_meta = NULL;
- p_input->p_es_out = NULL;
- p_input->p_sout = NULL;
- p_input->b_out_pace_control = VLC_FALSE;
+ p_input->p->i_rate = INPUT_RATE_DEFAULT;
+ TAB_INIT( p_input->p->i_bookmark, p_input->p->bookmark );
+ TAB_INIT( p_input->p->i_attachment, p_input->p->attachment );
+ p_input->p->p_es_out = NULL;
+ p_input->p->p_sout = NULL;
+ p_input->p->b_sout_keep = VLC_FALSE;
+ p_input->p->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;
-
- if( !p_input->input.p_item->p_meta )
- p_input->input.p_item->p_meta = vlc_meta_New();
- stats_ReinitInputStats( p_item->p_stats );
+ p_input->p->input.p_item = p_item;
+ p_input->p->input.p_access = NULL;
+ p_input->p->input.p_stream = NULL;
+ p_input->p->input.p_demux = NULL;
+ p_input->p->input.b_title_demux = VLC_FALSE;
+ p_input->p->input.i_title = 0;
+ 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;
+
+ vlc_mutex_lock( &p_item->lock );
+
+ if( !p_item->p_stats )
+ p_item->p_stats = stats_NewInputStats( p_input );
+ vlc_mutex_unlock( &p_item->lock );
/* No slave */
- p_input->i_slave = 0;
- p_input->slave = NULL;
+ p_input->p->i_slave = 0;
+ p_input->p->slave = NULL;
/* Init control buffer */
- vlc_mutex_init( p_input, &p_input->lock_control );
- p_input->i_control = 0;
+ vlc_mutex_init( p_input, &p_input->p->lock_control );
+ p_input->p->i_control = 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 */
/* Create Objects variables for public Get and Set */
input_ControlVarInit( p_input );
- p_input->input.i_cr_average = var_GetInteger( p_input, "cr-average" );
+
+ p_input->p->input.i_cr_average = var_GetInteger( p_input, "cr-average" );
if( !p_input->b_preparsing )
{
*psz_end = 0;
if( !strncmp( psz_start, "name=", 5 ) )
{
- p_seekpoint->psz_name = psz_start + 5;
+ p_seekpoint->psz_name = strdup(psz_start + 5);
}
else if( !strncmp( psz_start, "bytes=", 6 ) )
{
}
/* Remove 'Now playing' info as it is probably outdated */
- input_Control( p_input, INPUT_DEL_INFO, _(VLC_META_INFO_CAT),
- VLC_META_NOW_PLAYING ); /* ? Don't translate as it might has been copied ? */
+ input_Control( p_input, INPUT_DEL_INFO,
+ _(VLC_META_INFO_CAT),
+ _(VLC_META_NOW_PLAYING) );
+ input_item_SetNowPlaying( p_item, NULL );
+
+ /* */
+ if( p_input->b_preparsing )
+ p_input->i_flags |= OBJECT_FLAGS_QUIET | OBJECT_FLAGS_NOINTERACT;
+
+ /* */
+ if( p_sout )
+ p_input->p->p_sout = p_sout;
+
+ /* Attach only once we are ready */
+ vlc_object_attach( p_input, p_parent );
return p_input;
}
+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( priv->p_sout )
+ {
+ if( pp_sout )
+ *pp_sout = priv->p_sout;
+ else if( priv->b_sout_keep )
+ SoutKeep( priv->p_sout );
+ else
+ sout_DeleteInstance( priv->p_sout );
+ }
+
+ vlc_object_release( p_input );
+ vlc_mutex_destroy( &priv->lock_control );
+ free( priv );
+}
+
/**
* Initialize an input thread and run it. You will need to monitor the
* thread to clean up after it is done
input_thread_t *__input_CreateThread( vlc_object_t *p_parent,
input_item_t *p_item )
{
- return __input_CreateThread2( p_parent, p_item, NULL );
-}
+ vlc_bool_t b_sout_keep;
+ sout_instance_t *p_sout = SoutFind( p_parent, p_item, &b_sout_keep );
+ input_thread_t *p_input = __input_CreateThreadExtended( p_parent, p_item, NULL, p_sout );
+ if( !p_input && p_sout )
+ SoutKeep( p_sout );
-/* Gruik ! */
-input_thread_t *__input_CreateThread2( vlc_object_t *p_parent,
- input_item_t *p_item,
- char *psz_header )
+ p_input->p->b_sout_keep = b_sout_keep;
+ return p_input;
+}
+
+/* */
+input_thread_t *__input_CreateThreadExtended( vlc_object_t *p_parent,
+ input_item_t *p_item,
+ const char *psz_log, sout_instance_t *p_sout )
{
- input_thread_t *p_input = NULL; /* thread descriptor */
+ input_thread_t *p_input;
- p_input = Create( p_parent, p_item, psz_header, VLC_FALSE );
- /* Now we can attach our new input */
- vlc_object_attach( p_input, p_parent );
+ p_input = Create( p_parent, p_item, psz_log, VLC_FALSE, p_sout );
+ if( !p_input )
+ return NULL;
/* Create thread and wait for its readiness. */
if( vlc_thread_create( p_input, "input", Run,
- VLC_THREAD_PRIORITY_INPUT, VLC_TRUE ) )
+ VLC_THREAD_PRIORITY_INPUT, VLC_TRUE ) )
{
+ input_ChangeState( p_input, ERROR_S );
msg_Err( p_input, "cannot create input thread" );
- vlc_object_detach( p_input );
- vlc_object_destroy( p_input );
+ Destroy( p_input, &p_sout );
return NULL;
}
return p_input;
}
-
/**
* Initialize an input thread and run it. This thread will clean after himself,
* you can forget about it. It can work either in blocking or non-blocking mode
int __input_Read( vlc_object_t *p_parent, input_item_t *p_item,
vlc_bool_t b_block )
{
- input_thread_t *p_input = NULL; /* thread descriptor */
+ vlc_bool_t b_sout_keep;
+ sout_instance_t *p_sout = SoutFind( p_parent, p_item, &b_sout_keep );
+ input_thread_t *p_input;
- p_input = Create( p_parent, p_item, NULL, VLC_FALSE );
- /* Now we can attach our new input */
- vlc_object_attach( p_input, p_parent );
+ p_input = Create( p_parent, p_item, NULL, VLC_FALSE, p_sout );
+ if( !p_input && p_sout )
+ {
+ SoutKeep( p_sout );
+ return VLC_EGENERIC;
+ }
+ p_input->p->b_sout_keep = b_sout_keep;
if( b_block )
{
- RunAndClean( p_input );
+ RunAndDestroy( p_input );
return VLC_SUCCESS;
}
else
{
- if( vlc_thread_create( p_input, "input", RunAndClean,
+ if( vlc_thread_create( p_input, "input", RunAndDestroy,
VLC_THREAD_PRIORITY_INPUT, VLC_TRUE ) )
{
+ input_ChangeState( p_input, ERROR_S );
msg_Err( p_input, "cannot create input thread" );
- vlc_object_detach( p_input );
- vlc_object_destroy( p_input );
+ Destroy( p_input, NULL );
return VLC_EGENERIC;
}
}
*/
int __input_Preparse( vlc_object_t *p_parent, input_item_t *p_item )
{
- input_thread_t *p_input = NULL; /* thread descriptor */
+ input_thread_t *p_input;
/* Allocate descriptor */
- p_input = Create( p_parent, p_item, NULL, VLC_TRUE );
- p_input->i_flags |= OBJECT_FLAGS_QUIET;
- p_input->i_flags |= OBJECT_FLAGS_NOINTERACT;
-
- /* Now we can attach our new input */
- vlc_object_attach( p_input, p_parent );
-
- Init( p_input );
-
- /* Clean up master */
- InputSourceClean( p_input, &p_input->input );
-
- /* Unload all modules */
- if( p_input->p_es_out ) input_EsOutDelete( p_input->p_es_out );
-
- vlc_object_detach( p_input );
- vlc_object_destroy( p_input );
-
- return VLC_SUCCESS;
-}
-
-int __input_SecondaryPreparse( vlc_object_t *p_parent, input_item_t *p_item )
-{
- struct meta_engine_t *p_me;
-
- /* FIXME: don't launch any module if we already have all the needed
- * info. Easiest way to do this would be to add a dummy module.
- * I'll do that later */
-
- p_me = vlc_object_create( p_parent, VLC_OBJECT_META_ENGINE );
- p_me->i_flags |= OBJECT_FLAGS_NOINTERACT;
- p_me->i_mandatory = VLC_META_ENGINE_TITLE
- | VLC_META_ENGINE_ARTIST;
- p_me->i_optional = 0;
-/*
- if( var_CreateGetInteger( p_parent, "album-art" ) != ALBUM_ART_NEVER )
- {
- p_me->i_mandatory |= VLC_META_ENGINE_ART_URL;
- }
- else
- {
- p_me->i_optional |= VLC_META_ENGINE_ART_URL;
- }
-*/
- p_me->p_item = p_item;
- p_me->p_module = module_Need( p_me, "meta fetcher", 0, VLC_FALSE );
- vlc_object_attach( p_me, p_parent );
- if( !p_me->p_module )
- {
- msg_Err( p_parent, "no suitable meta engine module" );
- vlc_object_detach( p_me );
- vlc_object_destroy( p_me );
+ p_input = Create( p_parent, p_item, NULL, VLC_TRUE, NULL );
+ if( !p_input )
return VLC_EGENERIC;
- }
- module_Unneed( p_me, p_me->p_module );
+ if( !Init( p_input ) )
+ End( p_input );
- vlc_object_destroy( p_me );
+ Destroy( p_input, NULL );
return VLC_SUCCESS;
}
int i;
/* Set die for input */
- p_input->b_die = VLC_TRUE;
+ vlc_object_kill( p_input );
+ /* FIXME: seems to be duplicated in ControlPush(INPUT_CONTROL_SET_DIE) */
- /* We cannot touch p_input fields directly (we can from another thread),
+ /* We cannot touch p_input fields directly (we come 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_object_kill( p_list->p_values[i].p_object );
}
vlc_list_release( p_list );
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_object_kill( p_list->p_values[i].p_object );
}
vlc_list_release( p_list );
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_object_kill( p_list->p_values[i].p_object );
}
vlc_list_release( p_list );
* \param the input thread to kill
*/
void input_DestroyThread( input_thread_t *p_input )
+{
+ input_DestroyThreadExtended( p_input, NULL );
+}
+
+void input_DestroyThreadExtended( input_thread_t *p_input, sout_instance_t **pp_sout )
{
/* Join the thread */
vlc_thread_join( p_input );
- /* 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 */
+ /* */
+ Destroy( p_input, pp_sout );
}
/*****************************************************************************
{
/* If we failed, wait before we are killed, and exit */
p_input->b_error = VLC_TRUE;
+ playlist_Signal( pl_Get( p_input ) );
Error( p_input );
MainLoop( p_input );
- if( !p_input->b_eof && !p_input->b_error && p_input->input.b_eof )
+ if( !p_input->b_eof && !p_input->b_error && p_input->p->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 ) )
+ if( input_EsOutDecodersEmpty( p_input->p->p_es_out ) )
break;
msg_Dbg( p_input, "waiting decoder fifos to empty" );
/* We have finished */
p_input->b_eof = VLC_TRUE;
+ playlist_Signal( pl_Get( p_input ) );
}
/* Wait until we are asked to die */
}
/*****************************************************************************
- * RunAndClean: main thread loop
+ * RunAndDestroy: main thread loop
* This is the "just forget me" thread that spawns the input processing chain,
* reads the stream, cleans up and releases memory
*****************************************************************************/
-static int RunAndClean( input_thread_t *p_input )
+static int RunAndDestroy( input_thread_t *p_input )
{
/* Signal that the thread is launched */
vlc_thread_ready( p_input );
if( Init( p_input ) )
- {
- /* If we failed, just exit */
- return 0;
- }
+ goto exit;
MainLoop( p_input );
- if( !p_input->b_eof && !p_input->b_error && p_input->input.b_eof )
+ if( !p_input->b_eof && !p_input->b_error && p_input->p->input.b_eof )
{
/* We have finished demuxing data but not playing it */
while( !p_input->b_die )
{
- if( input_EsOutDecodersEmpty( p_input->p_es_out ) )
+ if( input_EsOutDecodersEmpty( p_input->p->p_es_out ) )
break;
msg_Dbg( p_input, "waiting decoder fifos to empty" );
/* Clean up */
End( p_input );
+exit:
/* Release memory */
- vlc_object_detach( p_input );
- vlc_object_destroy( p_input );
-
+ Destroy( p_input, NULL );
return 0;
}
-
/*****************************************************************************
* Main loop: Fill buffers from access, and demux
*****************************************************************************/
static void MainLoop( input_thread_t *p_input )
{
+ int64_t i_start_mdate = mdate();
int64_t i_intf_update = 0;
- while( !p_input->b_die && !p_input->b_error && !p_input->input.b_eof )
+ int i_updates = 0;
+
+ while( !p_input->b_die && !p_input->b_error && !p_input->p->input.b_eof )
{
vlc_bool_t b_force_update = VLC_FALSE;
int i_ret;
/* 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);
+ if( ( p_input->p->i_stop > 0 && p_input->i_time >= p_input->p->i_stop ) ||
+ ( p_input->p->i_run > 0 && i_start_mdate+p_input->p->i_run < mdate() ) )
+ i_ret = 0; /* EOF */
else
- i_ret = 0; /* EOF */
+ i_ret = p_input->p->input.p_demux->pf_demux(p_input->p->input.p_demux);
if( i_ret > 0 )
{
/* TODO */
- if( p_input->input.b_title_demux &&
- p_input->input.p_demux->info.i_update )
+ if( p_input->p->input.b_title_demux &&
+ p_input->p->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 )
+ else if( !p_input->p->input.b_title_demux &&
+ p_input->p->input.p_access &&
+ p_input->p->input.p_access->info.i_update )
{
i_ret = UpdateFromAccess( p_input );
b_force_update = VLC_TRUE;
{
/* End of file - we do not set b_die because only the
* playlist is allowed to do so. */
+ input_ChangeState( p_input, END_S );
msg_Dbg( p_input, "EOF reached" );
- p_input->input.b_eof = VLC_TRUE;
+ p_input->p->input.b_eof = VLC_TRUE;
}
else
{
}
/* 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 = p_input->p->input.i_title_start -
+ p_input->p->input.i_title_offset;
+ if( val.i_int < 0 || val.i_int >= p_input->p->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;
+ val.i_int = p_input->p->input.i_seekpoint_start -
+ p_input->p->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 )
+ if( p_input->p->i_start > 0 )
{
- val.i_time = p_input->i_start;
+ val.i_time = p_input->p->i_start;
input_ControlPush( p_input, INPUT_CONTROL_SET_TIME,
&val );
}
input_ControlPush( p_input, INPUT_CONTROL_SET_POSITION,
&val );
}
+
+ /* */
+ i_start_mdate = mdate();
}
}
else if( i_ret < 0 )
p_input->b_error = VLC_TRUE;
}
- if( i_ret > 0 && p_input->i_slave > 0 )
+ if( i_ret > 0 && p_input->p->i_slave > 0 )
{
SlaveDemux( p_input );
}
}
/* Handle control */
- vlc_mutex_lock( &p_input->lock_control );
+ vlc_mutex_lock( &p_input->p->lock_control );
ControlReduce( p_input );
while( !ControlPopNoLock( p_input, &i_type, &val ) )
{
if( Control( p_input, i_type, val ) )
b_force_update = VLC_TRUE;
}
- vlc_mutex_unlock( &p_input->lock_control );
+ vlc_mutex_unlock( &p_input->p->lock_control );
if( b_force_update || i_intf_update < mdate() )
{
double f_pos;
int64_t i_time, i_length;
/* update input status variables */
- if( !demux2_Control( p_input->input.p_demux,
+ if( !demux2_Control( p_input->p->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,
+ if( !demux2_Control( p_input->p->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,
+ if( !demux2_Control( p_input->p->input.p_demux,
DEMUX_GET_LENGTH, &i_length ) )
{
vlc_value_t old_val;
var_SetBool( p_input, "intf-change", VLC_TRUE );
i_intf_update = mdate() + I64C(150000);
}
+ /* 150ms * 8 = ~ 1 second */
+ if( ++i_updates % 8 == 0 )
+ {
+ stats_ComputeInputStats( p_input, p_input->p->input.p_item->p_stats );
+ /* Are we the thread responsible for computing global stats ? */
+ if( p_input->p_libvlc->p_playlist->p_stats_computer == p_input )
+ {
+ stats_ComputeGlobalStats( p_input->p_libvlc->p_playlist,
+ p_input->p_libvlc->p_playlist->p_stats );
+ }
+ }
}
}
-
static int Init( input_thread_t * p_input )
{
char *psz;
* (this will break playing of file starting by 'vlc:' but I don't
* want to add more logic, just force file by file:// or code it ;)
*/
- memset( &p_input->counters, 0, sizeof( p_input->counters ) );
+ 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 */
-#define INIT_COUNTER( p, type, compute ) p_input->counters.p_##p = \
+#define INIT_COUNTER( c, type, compute ) p_input->p->counters.p_##c = \
stats_CounterCreate( p_input, VLC_VAR_##type, STATS_##compute);
if( p_input->p_libvlc->b_stats )
{
INIT_COUNTER( decoded_audio, INTEGER, COUNTER );
INIT_COUNTER( decoded_video, INTEGER, COUNTER );
INIT_COUNTER( decoded_sub, INTEGER, COUNTER );
- p_input->counters.p_sout_send_bitrate = NULL;
- p_input->counters.p_sout_sent_packets = NULL;
- p_input->counters.p_sout_sent_bytes = NULL;
- if( p_input->counters.p_demux_bitrate )
- p_input->counters.p_demux_bitrate->update_interval = 1000000;
- if( p_input->counters.p_input_bitrate )
- p_input->counters.p_input_bitrate->update_interval = 1000000;
+ p_input->p->counters.p_sout_send_bitrate = NULL;
+ p_input->p->counters.p_sout_sent_packets = NULL;
+ p_input->p->counters.p_sout_sent_bytes = NULL;
+ if( p_input->p->counters.p_demux_bitrate )
+ p_input->p->counters.p_demux_bitrate->update_interval = 1000000;
+ if( p_input->p->counters.p_input_bitrate )
+ p_input->p->counters.p_input_bitrate->update_interval = 1000000;
}
- vlc_mutex_init( p_input, &p_input->counters.counters_lock );
- /* handle sout */
- psz = var_GetString( p_input, "sout" );
- if( *psz && strncasecmp( p_input->input.p_item->psz_uri, "vlc:", 4 ) )
+ /* Find a usable sout and attach it to p_input */
+ psz = var_GetNonEmptyString( p_input, "sout" );
+ if( psz && strncasecmp( p_input->p->input.p_item->psz_uri, "vlc:", 4 ) )
{
- p_input->p_sout = sout_NewInstance( p_input, psz );
- if( p_input->p_sout == NULL )
+ /* Check the validity of the provided sout */
+ if( p_input->p->p_sout )
{
- msg_Err( p_input, "cannot start stream output instance, " \
- "aborting" );
- free( psz );
- return VLC_EGENERIC;
+ if( strcmp( p_input->p->p_sout->psz_sout, psz ) )
+ {
+ msg_Dbg( p_input, "destroying unusable sout" );
+
+ sout_DeleteInstance( p_input->p->p_sout );
+ p_input->p->p_sout = NULL;
+ }
}
+
+ if( p_input->p->p_sout )
+ {
+ /* Reuse it */
+ msg_Dbg( p_input, "sout keep: reusing sout" );
+ msg_Dbg( p_input, "sout keep: you probably want to use "
+ "gather stream_out" );
+ vlc_object_attach( p_input->p->p_sout, p_input );
+ }
+ else
+ {
+ /* 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 );
+ msg_Err( p_input, "cannot start stream output instance, " \
+ "aborting" );
+ free( psz );
+ return VLC_EGENERIC;
+ }
+ }
+
if( p_input->p_libvlc->b_stats )
{
INIT_COUNTER( sout_sent_packets, INTEGER, COUNTER );
INIT_COUNTER (sout_sent_bytes, INTEGER, COUNTER );
INIT_COUNTER( sout_send_bitrate, FLOAT, DERIVATIVE );
- if( p_input->counters.p_sout_send_bitrate )
- p_input->counters.p_sout_send_bitrate->update_interval =
+ if( p_input->p->counters.p_sout_send_bitrate )
+ p_input->p->counters.p_sout_send_bitrate->update_interval =
1000000;
}
}
+ else if( p_input->p->p_sout )
+ {
+ msg_Dbg( p_input, "destroying useless sout" );
+
+ sout_DeleteInstance( p_input->p->p_sout );
+ p_input->p->p_sout = NULL;
+ }
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 );
+ 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 );
var_Create( p_input, "bit-rate", VLC_VAR_INTEGER );
var_Create( p_input, "sample-rate", VLC_VAR_INTEGER );
- if( InputSourceInit( p_input, &p_input->input,
- p_input->input.p_item->psz_uri, NULL ) )
+ if( InputSourceInit( p_input, &p_input->p->input,
+ p_input->p->input.p_item->psz_uri, NULL ) )
{
goto error;
}
/* Create global title (from master) */
if( !p_input->b_preparsing )
{
- 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 )
+ p_input->p->i_title = p_input->p->input.i_title;
+ p_input->p->title = p_input->p->input.title;
+ p_input->p->i_title_offset = p_input->p->input.i_title_offset;
+ p_input->p->i_seekpoint_offset = p_input->p->input.i_seekpoint_offset;
+ if( p_input->p->i_title > 0 )
{
/* Setup variables */
input_ControlVarNavigation( p_input );
}
/* 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;
+ 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 )
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 < 10 ) p_input->input.i_cr_average = 10;
+ p_input->p->input.i_cr_average *= (10 * p_input->i_pts_delay / 200000);
+ p_input->p->input.i_cr_average /= 10;
+ if( p_input->p->input.i_cr_average < 10 ) p_input->p->input.i_cr_average = 10;
}
/* Load master infos */
/* Init length */
- if( !demux2_Control( p_input->input.p_demux, DEMUX_GET_LENGTH,
+ if( !demux2_Control( p_input->p->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 );
- p_input->input.p_item->i_duration = 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 )
{
- 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 = p_input->p->input.i_title_start -
+ p_input->p->input.i_title_offset;
+ if( val.i_int > 0 && val.i_int < p_input->p->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;
+ val.i_int = p_input->p->input.i_seekpoint_start -
+ p_input->p->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);
+ p_input->p->i_start = I64C(1000000) * var_GetInteger( p_input, "start-time" );
+ p_input->p->i_stop = I64C(1000000) * var_GetInteger( p_input, "stop-time" );
+ p_input->p->i_run = I64C(1000000) * var_GetInteger( p_input, "run-time" );
+ if( p_input->p->i_run < 0 )
+ {
+ msg_Warn( p_input, "invalid run-time ignored" );
+ p_input->p->i_run = 0;
+ }
- if( p_input->i_start > 0 )
+ if( p_input->p->i_start > 0 )
{
- if( p_input->i_start >= val.i_time )
+ if( p_input->p->i_start >= val.i_time )
{
msg_Warn( p_input, "invalid start-time ignored" );
}
vlc_value_t s;
msg_Dbg( p_input, "starting at time: %ds",
- (int)( p_input->i_start / I64C(1000000) ) );
+ (int)( p_input->p->i_start / I64C(1000000) ) );
- s.i_time = p_input->i_start;
+ s.i_time = p_input->p->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 )
+ if( p_input->p->i_stop > 0 && p_input->p->i_stop <= p_input->p->i_start )
{
msg_Warn( p_input, "invalid stop-time ignored" );
- p_input->i_stop = 0;
+ p_input->p->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 ) &&
+ if( !demux2_Control( p_input->p->input.p_demux, DEMUX_GET_FPS, &f_fps ) &&
f_fps > 1.0 )
{
float f_requested_fps;
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 )
+ 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->input.p_item->psz_uri );
+ 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" ) )
{
- TAB_APPEND( p_input->i_slave, p_input->slave, sub );
+ TAB_APPEND( p_input->p->i_slave, p_input->p->slave, sub );
}
+ else free( sub );
}
free( subs[i] );
}
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;
slave = InputSourceNew( p_input );
if( !InputSourceInit( p_input, slave, psz, NULL ) )
{
- TAB_APPEND( p_input->i_slave, p_input->slave, slave );
+ TAB_APPEND( p_input->p->i_slave, p_input->p->slave, slave );
}
+ else free( slave );
psz = psz_delim;
}
+ free( psz );
}
- if( psz ) free( psz );
}
else
{
- p_input->i_start = 0;
- p_input->i_start = 0;
+ p_input->p->i_start = 0;
+ p_input->p->i_start = 0;
}
/* Set up es_out */
if( !p_input->b_preparsing )
{
- es_out_Control( p_input->p_es_out, ES_OUT_SET_ACTIVE, VLC_TRUE );
+ es_out_Control( p_input->p->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 )
+ if( p_input->p->p_sout )
{
var_Get( p_input, "sout-all", &val );
if ( val.b_bool )
NULL );
}
}
- es_out_Control( p_input->p_es_out, ES_OUT_SET_MODE, i_es_out_mode );
+ es_out_Control( p_input->p->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 );
+ demux2_Control( p_input->p->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,
+ demux2_Control( p_input->p->input.p_demux, DEMUX_SET_GROUP, -1,
val.p_list );
}
else
{
- demux2_Control( p_input->input.p_demux, DEMUX_SET_GROUP,
+ demux2_Control( p_input->p->input.p_demux, DEMUX_SET_GROUP,
(int) var_GetInteger( p_input, "program" ), NULL );
}
- if( p_input->p_sout )
+ if( p_input->p->p_sout )
{
- if( p_input->p_sout->i_out_pace_nocontrol > 0 )
+ if( p_input->p->p_sout->i_out_pace_nocontrol > 0 )
{
- p_input->b_out_pace_control = VLC_FALSE;
+ p_input->p->b_out_pace_control = VLC_FALSE;
}
else
{
- p_input->b_out_pace_control = VLC_TRUE;
+ p_input->p->b_out_pace_control = VLC_TRUE;
}
- if( p_input->b_can_pace_control && p_input->b_out_pace_control )
+ if( p_input->b_can_pace_control && p_input->p->b_out_pace_control )
{
/* We don't want a high input priority here or we'll
* end-up sucking up all the CPU time */
}
msg_Dbg( p_input, "starting in %s mode",
- p_input->b_out_pace_control ? "async" : "sync" );
+ p_input->p->b_out_pace_control ? "async" : "sync" );
}
}
- p_meta = p_input->input.p_item->p_meta;
+ p_meta = vlc_meta_New();
/* Get meta data from users */
- InputMetaUser( p_input );
+ InputMetaUser( p_input, p_meta );
+
/* Get meta data from master input */
- demux2_Control( p_input->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 )
{
- if( p_input->input.p_access )
- access2_Control( p_input->input.p_access, ACCESS_GET_META,
+ if( p_input->p->input.p_access )
+ access2_Control( p_input->p->input.p_access, ACCESS_GET_META,
p_meta );
/* Get meta data from slave input */
- for( i = 0; i < p_input->i_slave; i++ )
+ for( i = 0; i < p_input->p->i_slave; i++ )
{
- demux2_Control( p_input->slave[i]->p_demux,
- DEMUX_GET_META, p_meta );
- if( p_input->slave[i]->p_access )
+ DemuxMeta( p_input, p_meta, p_input->p->slave[i]->p_demux );
+ if( p_input->p->slave[i]->p_access )
{
- access2_Control( p_input->slave[i]->p_access,
+ access2_Control( p_input->p->slave[i]->p_access,
ACCESS_GET_META, p_meta );
}
}
}
- UpdateMeta( p_input );
+ InputUpdateMeta( p_input, p_meta );
if( !p_input->b_preparsing )
{
msg_Dbg( p_input, "`%s' successfully opened",
- p_input->input.p_item->psz_uri );
+ p_input->p->input.p_item->psz_uri );
}
/* initialization is complete */
- input_ChangeState(p_input, PLAYING_S);
+ input_ChangeState( p_input, PLAYING_S );
return VLC_SUCCESS;
error:
- if( p_input->p_es_out )
- input_EsOutDelete( p_input->p_es_out );
+ input_ChangeState( p_input, ERROR_S );
+
+ if( p_input->p->p_es_out )
+ input_EsOutDelete( p_input->p->p_es_out );
- if( p_input->p_sout )
- sout_DeleteInstance( p_input->p_sout );
+ if( p_input->p->p_sout )
+ {
+ vlc_object_detach( p_input->p->p_sout );
+ sout_DeleteInstance( p_input->p->p_sout );
+ }
+
+
+ if( !p_input->b_preparsing && p_input->p_libvlc->b_stats )
+ {
+#define EXIT_COUNTER( c ) do { if( p_input->p->counters.p_##c ) \
+ stats_CounterClean( p_input->p->counters.p_##c );\
+ p_input->p->counters.p_##c = NULL; } while(0)
+ EXIT_COUNTER( read_bytes );
+ EXIT_COUNTER( read_packets );
+ EXIT_COUNTER( demux_read );
+ EXIT_COUNTER( input_bitrate );
+ EXIT_COUNTER( demux_bitrate );
+ EXIT_COUNTER( played_abuffers );
+ EXIT_COUNTER( lost_abuffers );
+ EXIT_COUNTER( displayed_pictures );
+ EXIT_COUNTER( lost_pictures );
+ EXIT_COUNTER( decoded_audio );
+ EXIT_COUNTER( decoded_video );
+ EXIT_COUNTER( decoded_sub );
+
+ if( p_input->p->p_sout )
+ {
+ EXIT_COUNTER( sout_sent_packets );
+ EXIT_COUNTER (sout_sent_bytes );
+ EXIT_COUNTER( sout_send_bitrate );
+ }
+#undef EXIT_COUNTER
+ }
/* 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;
+ p_input->p->input.p_demux = NULL;
+ p_input->p->input.p_stream = NULL;
+ p_input->p->input.p_access = NULL;
+ p_input->p->p_es_out = NULL;
+ p_input->p->p_sout = NULL;
return VLC_EGENERIC;
}
*****************************************************************************/
static void Error( input_thread_t *p_input )
{
+ input_ChangeState( p_input, ERROR_S );
while( !p_input->b_die )
{
/* Sleep a while */
{
int i;
- msg_Dbg( p_input, "closing input" );
-
/* We are at the end */
- input_ChangeState(p_input, END_S);
+ input_ChangeState( p_input, END_S );
/* Clean control variables */
input_ControlVarClean( p_input );
/* Clean up master */
- InputSourceClean( p_input, &p_input->input );
+ InputSourceClean( &p_input->p->input );
/* Delete slave */
- for( i = 0; i < p_input->i_slave; i++ )
+ for( i = 0; i < p_input->p->i_slave; i++ )
{
- InputSourceClean( p_input, p_input->slave[i] );
- free( p_input->slave[i] );
+ InputSourceClean( p_input->p->slave[i] );
+ free( p_input->p->slave[i] );
}
- if( p_input->slave ) free( p_input->slave );
+ if( p_input->p->slave ) free( p_input->p->slave );
/* Unload all modules */
- if( p_input->p_es_out )
- input_EsOutDelete( p_input->p_es_out );
-
-#define CL_CO( c ) stats_CounterClean( p_input->counters.p_##c ); p_input->counters.p_##c = NULL;
- if( p_input->p_libvlc->b_stats )
- {
- vlc_mutex_lock( &p_input->counters.counters_lock );
- CL_CO( read_bytes );
- CL_CO( read_packets );
- CL_CO( demux_read );
- CL_CO( input_bitrate );
- CL_CO( demux_bitrate );
- CL_CO( played_abuffers );
- CL_CO( lost_abuffers );
- CL_CO( displayed_pictures );
- CL_CO( lost_pictures );
- CL_CO( decoded_audio) ;
- CL_CO( decoded_video );
- CL_CO( decoded_sub) ;
- vlc_mutex_unlock( &p_input->counters.counters_lock );
- }
-
- /* Close optional stream output instance */
- if( p_input->p_sout )
- {
- vlc_value_t keep;
-
- vlc_mutex_lock( &p_input->counters.counters_lock );
- CL_CO( sout_sent_packets );
- CL_CO( sout_sent_bytes );
- CL_CO( sout_send_bitrate );
- vlc_mutex_unlock( &p_input->counters.counters_lock );
-
- if( var_Get( p_input, "sout-keep", &keep ) >= 0 && keep.b_bool )
- {
- /* attach sout to the playlist */
- msg_Dbg( p_input, "keeping sout" );
- vlc_object_detach( p_input->p_sout );
- vlc_object_attach( p_input->p_sout, p_input->p_libvlc->p_playlist );
+ if( p_input->p->p_es_out )
+ input_EsOutDelete( p_input->p->p_es_out );
+
+ if( !p_input->b_preparsing )
+ {
+#define CL_CO( c ) stats_CounterClean( p_input->p->counters.p_##c ); p_input->p->counters.p_##c = NULL;
+ if( p_input->p_libvlc->b_stats )
+ {
+ /* make sure we are up to date */
+ stats_ComputeInputStats( p_input, p_input->p->input.p_item->p_stats );
+ if( p_input->p_libvlc->p_playlist->p_stats_computer == p_input )
+ {
+ stats_ComputeGlobalStats( p_input->p_libvlc->p_playlist,
+ p_input->p_libvlc->p_playlist->p_stats );
+ p_input->p_libvlc->p_playlist->p_stats_computer = NULL;
+ }
+ CL_CO( read_bytes );
+ CL_CO( read_packets );
+ CL_CO( demux_read );
+ CL_CO( input_bitrate );
+ CL_CO( demux_bitrate );
+ CL_CO( played_abuffers );
+ CL_CO( lost_abuffers );
+ CL_CO( displayed_pictures );
+ CL_CO( lost_pictures );
+ CL_CO( decoded_audio) ;
+ CL_CO( decoded_video );
+ CL_CO( decoded_sub) ;
}
- else
+
+ /* Close optional stream output instance */
+ if( p_input->p->p_sout )
{
- msg_Dbg( p_input, "destroying sout" );
- sout_DeleteInstance( p_input->p_sout );
+ CL_CO( sout_sent_packets );
+ CL_CO( sout_sent_bytes );
+ CL_CO( sout_send_bitrate );
+
+ vlc_object_detach( p_input->p->p_sout );
}
+#undef CL_CO
}
-#undef CL_CO
+ if( p_input->p->i_attachment > 0 )
+ {
+ for( i = 0; i < p_input->p->i_attachment; i++ )
+ vlc_input_attachment_Delete( p_input->p->attachment[i] );
+ TAB_CLEAN( p_input->p->i_attachment, p_input->p->attachment );
+ }
+
+ vlc_mutex_destroy( &p_input->p->counters.counters_lock );
+
/* Tell we're dead */
p_input->b_dead = VLC_TRUE;
}
+static sout_instance_t *SoutFind( vlc_object_t *p_parent, input_item_t *p_item, vlc_bool_t *pb_sout_keep )
+{
+ vlc_bool_t b_keep_sout = var_CreateGetBool( p_parent, "sout-keep" );
+ sout_instance_t *p_sout = NULL;
+ int i;
+
+ /* Search sout-keep options
+ * XXX it has to be done here, but it is duplicated work :( */
+ vlc_mutex_lock( &p_item->lock );
+ for( i = 0; i < p_item->i_options; i++ )
+ {
+ const char *psz_option = p_item->ppsz_options[i];
+ if( !psz_option )
+ continue;
+ if( *psz_option == ':' )
+ psz_option++;
+
+ if( !strcmp( psz_option, "sout-keep" ) )
+ b_keep_sout = VLC_TRUE;
+ else if( !strcmp( psz_option, "no-sout-keep" ) || !strcmp( psz_option, "nosout-keep" ) )
+ b_keep_sout = VLC_FALSE;
+ }
+ vlc_mutex_unlock( &p_item->lock );
+
+ /* Find a potential sout to reuse
+ * XXX it might be unusable but this will be checked later */
+ if( b_keep_sout )
+ {
+ /* Remove the sout from the playlist garbage collector */
+ playlist_t *p_playlist = pl_Yield( p_parent );
+
+ vlc_mutex_lock( &p_playlist->gc_lock );
+ p_sout = vlc_object_find( p_playlist, VLC_OBJECT_SOUT, FIND_CHILD );
+ if( p_sout )
+ {
+ if( p_sout->p_parent != VLC_OBJECT(p_playlist) )
+ {
+ vlc_object_release( p_sout );
+ p_sout = NULL;
+ }
+ else
+ {
+ vlc_object_detach( p_sout ); /* Remove it from the GC */
+
+ vlc_object_release( p_sout );
+ }
+ }
+ vlc_mutex_unlock( &p_playlist->gc_lock );
+
+ pl_Release( p_parent );
+ }
+
+ if( pb_sout_keep )
+ *pb_sout_keep = b_keep_sout;
+
+ return p_sout;
+}
+static void SoutKeep( sout_instance_t *p_sout )
+{
+ /* attach sout to the playlist */
+ playlist_t *p_playlist = pl_Yield( p_sout );
+
+ msg_Dbg( p_sout, "sout has been kept" );
+ vlc_object_attach( p_sout, p_playlist );
+
+ pl_Release( p_sout );
+}
+
/*****************************************************************************
* Control
*****************************************************************************/
static inline int ControlPopNoLock( input_thread_t *p_input,
int *pi_type, vlc_value_t *p_val )
{
- if( p_input->i_control <= 0 )
+ if( p_input->p->i_control <= 0 )
{
return VLC_EGENERIC;
}
- *pi_type = p_input->control[0].i_type;
- *p_val = p_input->control[0].val;
+ *pi_type = p_input->p->control[0].i_type;
+ *p_val = p_input->p->control[0].val;
- p_input->i_control--;
- if( p_input->i_control > 0 )
+ p_input->p->i_control--;
+ if( p_input->p->i_control > 0 )
{
int i;
- for( i = 0; i < p_input->i_control; i++ )
+ for( i = 0; i < p_input->p->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;
+ p_input->p->control[i].i_type = p_input->p->control[i+1].i_type;
+ p_input->p->control[i].val = p_input->p->control[i+1].val;
}
}
static void ControlReduce( input_thread_t *p_input )
{
int i;
- for( i = 1; i < p_input->i_control; i++ )
+
+ if( !p_input )
+ return;
+
+ for( i = 1; i < p_input->p->i_control; i++ )
{
- const int i_lt = p_input->control[i-1].i_type;
- const int i_ct = p_input->control[i].i_type;
+ const int i_lt = p_input->p->control[i-1].i_type;
+ const int i_ct = p_input->p->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,
+/* msg_Dbg( p_input, "[%d/%d] l=%d c=%d", i, p_input->p->i_control,
i_lt, i_ct );
*/
if( i_lt == i_ct &&
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--;
+ for( j = i; j < p_input->p->i_control; j++ )
+ p_input->p->control[j-1] = p_input->p->control[j];
+ p_input->p->i_control--;
}
else
{
case INPUT_CONTROL_SET_DIE:
msg_Dbg( p_input, "control: stopping input" );
/* 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;
+ if( p_input->p->input.p_access )
+ vlc_object_kill( p_input->p->input.p_access );
+ if( p_input->p->input.p_stream )
+ vlc_object_kill( p_input->p->input.p_stream );
+ vlc_object_kill( p_input->p->input.p_demux );
- p_input->b_die = VLC_TRUE;
+ vlc_object_kill( p_input );
break;
case INPUT_CONTROL_SET_POSITION:
else
{
/* Should not fail */
- demux2_Control( p_input->input.p_demux,
+ demux2_Control( p_input->p->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;
/* Reset the decoders states and clock sync (before calling the demuxer */
- es_out_Control( p_input->p_es_out, ES_OUT_RESET_PCR );
- input_EsOutDiscontinuity( p_input->p_es_out, VLC_FALSE );
- if( demux2_Control( p_input->input.p_demux, DEMUX_SET_POSITION,
+ input_EsOutChangePosition( p_input->p->p_es_out );
+ if( demux2_Control( p_input->p->input.p_demux, DEMUX_SET_POSITION,
f_pos ) )
{
msg_Err( p_input, "INPUT_CONTROL_SET_POSITION(_OFFSET) "
}
else
{
- if( p_input->i_slave > 0 )
+ if( p_input->p->i_slave > 0 )
SlaveSeek( p_input );
b_force_update = VLC_TRUE;
else
{
/* Should not fail */
- demux2_Control( p_input->input.p_demux,
+ demux2_Control( p_input->p->input.p_demux,
DEMUX_GET_TIME, &i_time );
i_time += val.i_time;
}
if( i_time < 0 ) i_time = 0;
/* Reset the decoders states and clock sync (before calling the demuxer */
- es_out_Control( p_input->p_es_out, ES_OUT_RESET_PCR );
- input_EsOutDiscontinuity( p_input->p_es_out, VLC_FALSE );
+ input_EsOutChangePosition( p_input->p->p_es_out );
- i_ret = demux2_Control( p_input->input.p_demux,
+ i_ret = demux2_Control( p_input->p->input.p_demux,
DEMUX_SET_TIME, i_time );
if( i_ret )
{
int64_t i_length;
/* Emulate it with a SET_POS */
- demux2_Control( p_input->input.p_demux,
+ demux2_Control( p_input->p->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,
+ i_ret = demux2_Control( p_input->p->input.p_demux,
DEMUX_SET_POSITION, f_pos );
}
}
}
else
{
- if( p_input->i_slave > 0 )
+ if( p_input->p->i_slave > 0 )
SlaveSeek( p_input );
b_force_update = VLC_TRUE;
( 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,
+ if( p_input->p->input.p_access )
+ i_ret = access2_Control( p_input->p->input.p_access,
ACCESS_SET_PAUSE_STATE, VLC_FALSE );
else
- i_ret = demux2_Control( p_input->input.p_demux,
+ i_ret = demux2_Control( p_input->p->input.p_demux,
DEMUX_SET_PAUSE_STATE, VLC_FALSE );
if( i_ret )
{
/* FIXME What to do ? */
msg_Warn( p_input, "cannot unset pause -> EOF" );
- vlc_mutex_unlock( &p_input->lock_control );
+ vlc_mutex_unlock( &p_input->p->lock_control );
input_ControlPush( p_input, INPUT_CONTROL_SET_DIE, NULL );
- vlc_mutex_lock( &p_input->lock_control );
+ vlc_mutex_lock( &p_input->p->lock_control );
}
b_force_update = VLC_TRUE;
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 );
- input_EsOutDiscontinuity( p_input->p_es_out, VLC_FALSE );
+ /* */
+ 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->b_can_pause )
+ p_input->p->b_can_pause )
{
int i_ret;
- if( p_input->input.p_access )
- i_ret = access2_Control( p_input->input.p_access,
+ if( p_input->p->input.p_access )
+ i_ret = access2_Control( p_input->p->input.p_access,
ACCESS_SET_PAUSE_STATE, VLC_TRUE );
else
- i_ret = demux2_Control( p_input->input.p_demux,
+ i_ret = demux2_Control( p_input->p->input.p_demux,
DEMUX_SET_PAUSE_STATE, VLC_TRUE );
b_force_update = VLC_TRUE;
/* Switch to new state */
p_input->i_state = val.i_int;
var_Change( p_input, "state", VLC_VAR_SETVALUE, &val, NULL );
+
+ /* */
+ if( !i_ret )
+ input_EsOutChangeState( p_input->p->p_es_out );
}
- else if( val.i_int == PAUSE_S && !p_input->b_can_pause )
+ else if( val.i_int == PAUSE_S && !p_input->p->b_can_pause )
{
b_force_update = VLC_TRUE;
{
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
+ 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->p_sout && !p_input->b_out_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->i_rate )
+ 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 )
{
- p_input->i_rate = 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 );
- /* 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 );
+ p_input->p->i_rate = i_rate;
- /* Reset clock */
- es_out_Control( p_input->p_es_out, ES_OUT_RESET_PCR );
+ /* 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;
}
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_Control( p_input->p->p_es_out,
ES_OUT_SET_GROUP, val.i_int );
- demux2_Control( p_input->input.p_demux, DEMUX_SET_GROUP, val.i_int,
+ demux2_Control( p_input->p->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,
+ es_out_Control( p_input->p->p_es_out, ES_OUT_SET_ES,
+ input_EsOutGetFromID( p_input->p->p_es_out,
val.i_int ) );
break;
case INPUT_CONTROL_SET_AUDIO_DELAY:
- input_EsOutSetDelay( p_input->p_es_out,
+ input_EsOutSetDelay( p_input->p->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,
+ input_EsOutSetDelay( p_input->p->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 )
+ if( p_input->p->input.b_title_demux &&
+ p_input->p->input.i_title > 0 )
{
/* TODO */
/* FIXME handle demux title */
- demux_t *p_demux = p_input->input.p_demux;
+ demux_t *p_demux = p_input->p->input.p_demux;
int i_title;
if( i_type == INPUT_CONTROL_SET_TITLE_PREV )
else
i_title = val.i_int;
- if( i_title >= 0 && i_title < p_input->input.i_title )
+ if( i_title >= 0 && i_title < p_input->p->input.i_title )
{
- input_EsOutDiscontinuity( p_input->p_es_out, VLC_FALSE );
- es_out_Control( p_input->p_es_out, ES_OUT_RESET_PCR );
+ input_EsOutChangePosition( p_input->p->p_es_out );
demux2_Control( p_demux, DEMUX_SET_TITLE, i_title );
input_ControlVarTitle( p_input, i_title );
}
}
- else if( p_input->input.i_title > 0 )
+ else if( p_input->p->input.i_title > 0 )
{
- access_t *p_access = p_input->input.p_access;
+ access_t *p_access = p_input->p->input.p_access;
int i_title;
if( i_type == INPUT_CONTROL_SET_TITLE_PREV )
else
i_title = val.i_int;
- if( i_title >= 0 && i_title < p_input->input.i_title )
+ if( i_title >= 0 && i_title < p_input->p->input.i_title )
{
- input_EsOutDiscontinuity( p_input->p_es_out, VLC_FALSE );
- es_out_Control( p_input->p_es_out, ES_OUT_RESET_PCR );
+ input_EsOutChangePosition( p_input->p->p_es_out );
access2_Control( p_access, ACCESS_SET_TITLE, i_title );
- stream_AccessReset( p_input->input.p_stream );
+ stream_AccessReset( p_input->p->input.p_stream );
}
}
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 )
+ if( p_input->p->input.b_title_demux &&
+ p_input->p->input.i_title > 0 )
{
- demux_t *p_demux = p_input->input.p_demux;
+ demux_t *p_demux = p_input->p->input.p_demux;
int i_seekpoint;
int64_t i_input_time;
int64_t i_seekpoint_time;
if( i_type == INPUT_CONTROL_SET_SEEKPOINT_PREV )
{
i_seekpoint = p_demux->info.i_seekpoint;
- i_seekpoint_time = p_input->input.title[p_demux->info.i_title]->seekpoint[i_seekpoint]->i_time_offset;
+ i_seekpoint_time = p_input->p->input.title[p_demux->info.i_title]->seekpoint[i_seekpoint]->i_time_offset;
if( i_seekpoint_time >= 0 &&
!demux2_Control( p_demux,
DEMUX_GET_TIME, &i_input_time ) )
i_seekpoint = val.i_int;
if( i_seekpoint >= 0 && i_seekpoint <
- p_input->input.title[p_demux->info.i_title]->i_seekpoint )
+ p_input->p->input.title[p_demux->info.i_title]->i_seekpoint )
{
- input_EsOutDiscontinuity( p_input->p_es_out, VLC_FALSE );
- es_out_Control( p_input->p_es_out, ES_OUT_RESET_PCR );
+
+ input_EsOutChangePosition( p_input->p->p_es_out );
demux2_Control( p_demux, DEMUX_SET_SEEKPOINT, i_seekpoint );
}
}
- else if( p_input->input.i_title > 0 )
+ else if( p_input->p->input.i_title > 0 )
{
- demux_t *p_demux = p_input->input.p_demux;
- access_t *p_access = p_input->input.p_access;
+ demux_t *p_demux = p_input->p->input.p_demux;
+ access_t *p_access = p_input->p->input.p_access;
int i_seekpoint;
int64_t i_input_time;
int64_t i_seekpoint_time;
if( i_type == INPUT_CONTROL_SET_SEEKPOINT_PREV )
{
i_seekpoint = p_access->info.i_seekpoint;
- i_seekpoint_time = p_input->input.title[p_access->info.i_title]->seekpoint[i_seekpoint]->i_time_offset;
+ i_seekpoint_time = p_input->p->input.title[p_access->info.i_title]->seekpoint[i_seekpoint]->i_time_offset;
if( i_seekpoint_time >= 0 &&
demux2_Control( p_demux,
DEMUX_GET_TIME, &i_input_time ) )
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->input.title[p_access->info.i_title]->i_seekpoint )
+ p_input->p->input.title[p_access->info.i_title]->i_seekpoint )
{
- input_EsOutDiscontinuity( p_input->p_es_out, VLC_FALSE );
- es_out_Control( p_input->p_es_out, ES_OUT_RESET_PCR );
+ input_EsOutChangePosition( p_input->p->p_es_out );
access2_Control( p_access, ACCESS_SET_SEEKPOINT,
i_seekpoint );
- stream_AccessReset( p_input->input.p_stream );
+ stream_AccessReset( p_input->p->input.p_stream );
}
}
break;
if( !InputSourceInit( p_input, slave, val.psz_string, NULL ) )
{
- vlc_meta_t *p_meta = p_input->input.p_item->p_meta;
+ vlc_meta_t *p_meta;
int64_t i_time;
/* Add the slave */
val.psz_string );
/* Set position */
- if( demux2_Control( p_input->input.p_demux,
+ if( demux2_Control( p_input->p->input.p_demux,
DEMUX_GET_TIME, &i_time ) )
{
msg_Err( p_input, "demux doesn't like DEMUX_GET_TIME" );
- InputSourceClean( p_input, slave );
+ InputSourceClean( slave );
free( slave );
break;
}
DEMUX_SET_TIME, i_time ) )
{
msg_Err( p_input, "seek failed for new slave" );
- InputSourceClean( p_input, slave );
+ InputSourceClean( slave );
free( slave );
break;
}
/* Get meta (access and demux) */
+ p_meta = vlc_meta_New();
access2_Control( slave->p_access, ACCESS_GET_META,
p_meta );
demux2_Control( slave->p_demux, DEMUX_GET_META, p_meta );
- UpdateMeta( p_input );
+ InputUpdateMeta( p_input, p_meta );
- TAB_APPEND( p_input->i_slave, p_input->slave, slave );
+ TAB_APPEND( p_input->p->i_slave, p_input->p->slave, slave );
}
else
{
+ free( slave );
msg_Warn( p_input, "failed to add %s as slave",
val.psz_string );
}
*****************************************************************************/
static int UpdateFromDemux( input_thread_t *p_input )
{
- demux_t *p_demux = p_input->input.p_demux;
+ demux_t *p_demux = p_input->p->input.p_demux;
vlc_value_t v;
if( p_demux->info.i_update & INPUT_UPDATE_TITLE )
p_demux->info.i_update &= ~INPUT_UPDATE_SIZE;
/* Hmmm only works with master input */
- if( p_input->input.p_demux == p_demux )
+ if( p_input->p->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;
+ int i_title_end = p_input->p->input.i_title_end -
+ p_input->p->input.i_title_offset;
+ int i_seekpoint_end = p_input->p->input.i_seekpoint_end -
+ p_input->p->input.i_seekpoint_offset;
if( i_title_end >= 0 && i_seekpoint_end >= 0 )
{
*****************************************************************************/
static int UpdateFromAccess( input_thread_t *p_input )
{
- access_t *p_access = p_input->input.p_access;
+ access_t *p_access = p_input->p->input.p_access;
vlc_value_t v;
if( p_access->info.i_update & INPUT_UPDATE_TITLE )
input_ControlVarTitle( p_input, p_access->info.i_title );
- stream_AccessUpdate( p_input->input.p_stream );
+ stream_AccessUpdate( p_input->p->input.p_stream );
p_access->info.i_update &= ~INPUT_UPDATE_TITLE;
}
if( p_access->info.i_update & INPUT_UPDATE_META )
{
/* TODO maybe multi - access ? */
- vlc_meta_t *p_meta = p_input->input.p_item->p_meta;
- access2_Control( p_input->input.p_access,ACCESS_GET_META, p_meta );
- UpdateMeta( p_input );
- var_SetBool( p_input, "item-change", p_input->input.p_item->i_id );
+ 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_SetInteger( pl_Get( p_input ), "item-change", p_input->p->input.p_item->i_id );
p_access->info.i_update &= ~INPUT_UPDATE_META;
}
p_access->info.i_update &= ~INPUT_UPDATE_SIZE;
/* Hmmm only works with master input */
- if( p_input->input.p_access == p_access )
+ if( p_input->p->input.p_access == p_access )
{
- 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;
+ int i_title_end = p_input->p->input.i_title_end -
+ p_input->p->input.i_title_offset;
+ int i_seekpoint_end = p_input->p->input.i_seekpoint_end -
+ p_input->p->input.i_seekpoint_offset;
if( i_title_end >= 0 && i_seekpoint_end >=0 )
{
return 1;
}
-/*****************************************************************************
- * UpdateMeta:
- *****************************************************************************/
-static int UpdateMeta( input_thread_t *p_input )
-{
- vlc_meta_t *p_meta = p_input->input.p_item->p_meta;
- if( !p_meta )
- return VLC_SUCCESS;
-
- if( p_meta->psz_title && !p_input->input.p_item->b_fixed_name )
- input_Control( p_input, INPUT_SET_NAME, p_meta->psz_title );
-
- /** \todo handle sout meta */
-
- return VLC_SUCCESS;
-}
-
/*****************************************************************************
* UpdateItemLength:
*****************************************************************************/
static void UpdateItemLength( input_thread_t *p_input, int64_t i_length )
{
- 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 );
+ input_item_SetDuration( p_input->p->input.p_item, (mtime_t) i_length );
if( !p_input->b_preparsing )
{
pl_Yield( p_input );
var_SetInteger( pl_Get( p_input ), "item-change",
- p_input->input.p_item->i_id );
- pl_Release( p_input )
+ p_input->p->input.p_item->i_id );
+ pl_Release( p_input );
}
}
in->p_stream = NULL;
in->p_demux = NULL;
in->b_title_demux = VLC_FALSE;
- in->i_title = 0;
- in->title = NULL;
+ 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;
return in;
* InputSourceInit:
*****************************************************************************/
static int InputSourceInit( input_thread_t *p_input,
- input_source_t *in, char *psz_mrl,
- char *psz_forced_demux )
+ input_source_t *in, const char *psz_mrl,
+ const char *psz_forced_demux )
{
- char *psz_dup = strdup( psz_mrl );
- char *psz_access;
- char *psz_demux;
+ char psz_dup[strlen (psz_mrl) + 1];
+ const char *psz_access;
+ const char *psz_demux;
char *psz_path;
char *psz_tmp;
char *psz;
vlc_value_t val;
+ double f_fps;
+
+ strcpy( psz_dup, psz_mrl );
if( !in ) return VLC_EGENERIC;
+ if( !p_input ) return VLC_EGENERIC;
/* 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 )
{
{
/* 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 */
if( *psz_demux == '\0' )
{
in->p_demux = demux2_New( p_input, psz_access, psz_demux, psz_path,
- NULL, p_input->p_es_out, VLC_FALSE );
+ NULL, p_input->p->p_es_out, VLC_FALSE );
}
}
else
{
- psz_path = psz_mrl;
+ psz_path = psz_dup;
+ if( !strncmp( psz_path, "file://", 7 ) )
+ psz_path += 7;
msg_Dbg( p_input, "trying to pre-parse %s", psz_path );
- psz_demux = strdup( "" );
- psz_access = strdup( "file" );
+ psz_demux = "";
+ psz_access = "file";
}
if( in->p_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;
- /* FIXME todo
- demux2_Control( in->p_demux, DEMUX_CAN_SEEK,
+ 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 );
+
+ 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
{
int64_t i_pts_delay;
- input_ChangeState( p_input, OPENING_S);
+ input_ChangeState( p_input, OPENING_S );
/* Now try a real access */
in->p_access = access2_New( p_input, psz_access, psz_demux, psz_path,
/* Access failed, URL encoded ? */
if( in->p_access == NULL && strchr( psz_path, '%' ) )
{
- DecodeUrl( psz_path );
+ decode_URI( psz_path );
msg_Dbg( p_input, "retrying with access `%s' demux `%s' path `%s'",
psz_access, psz_demux, psz_path );
psz_access, psz_demux, psz_path,
p_input->b_preparsing );
}
-#ifndef WIN32 /* Remove this gross hack from the win32 build as colons
- * are forbidden in filenames on Win32. */
-
- /* Maybe we got something like: /Volumes/toto:titi/gabu.mpg */
- if( in->p_access == NULL &&
- *psz_access == '\0' && ( *psz_demux || *psz_path ) )
+ /* access failed, maybe our access detection was wrong.
+ * Retry with the full name */
+ if( in->p_access == NULL && strchr( psz_mrl, ':' ) )
{
- if( psz_dup ) free( psz_dup );
- psz_dup = strdup( psz_mrl );
- psz_access = "";
- if( psz_forced_demux && *psz_forced_demux )
- {
- psz_demux = psz_forced_demux;
- }
- else psz_demux = "";
- psz_path = psz_dup;
-
+ msg_Dbg( p_input, "retrying with access `' demux `' path `%s'",
+ psz_mrl );
+ psz_demux = "" ;
in->p_access = access2_New( p_input,
- psz_access, psz_demux, psz_path,
- p_input->b_preparsing );
+ "", "", psz_mrl,
+ p_input->b_preparsing );
}
-#endif
-
if( in->p_access == NULL )
{
- msg_Err( p_input, "no suitable access module for `%s'", psz_mrl );
+ msg_Err( p_input, "open of `%s' failed: %s", psz_mrl,
+ msg_StackMsg() );
intf_UserFatal( VLC_OBJECT( p_input), VLC_FALSE,
_("Your input can't be opened"),
_("VLC is unable to open the MRL '%s'."
}
/* */
- 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 )
}
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 );
}
- input_ChangeState( p_input, BUFFERING_S);
+ input_ChangeState( p_input, BUFFERING_S );
/* Create the stream_t */
in->p_stream = stream_AccessNew( in->p_access, p_input->b_preparsing );
{
psz_demux = in->p_access->psz_demux;
}
- in->p_demux = demux2_New( p_input, psz_access, psz_demux, psz_path,
- in->p_stream, p_input->p_es_out,
- p_input->b_preparsing );
+
+ {
+ /* Take access redirections into account */
+ char *psz_real_path;
+ char *psz_buf = NULL;
+ if( in->p_access->psz_path )
+ {
+ const char *psz_a, *psz_d;
+ psz_buf = strdup( in->p_access->psz_path );
+ MRLSplit( psz_buf, &psz_a, &psz_d, &psz_real_path );
+ }
+ else
+ {
+ psz_real_path = psz_path;
+ }
+ in->p_demux = demux2_New( p_input, psz_access, psz_demux,
+ psz_real_path,
+ in->p_stream, p_input->p->p_es_out,
+ p_input->b_preparsing );
+ free( psz_buf );
+ }
+
if( in->p_demux == NULL )
{
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. "
+ intf_UserFatal( VLC_OBJECT( p_input ), VLC_FALSE,
+ _("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;
}
- /* TODO get title from demux */
+ /* Get title from demux */
if( !p_input->b_preparsing && in->i_title <= 0 )
{
if( demux2_Control( in->p_demux, DEMUX_GET_TITLE_INFO,
&in->title, &in->i_title,
&in->i_title_offset, &in->i_seekpoint_offset ))
{
- in->i_title = 0;
- in->title = NULL;
+ TAB_INIT( in->i_title, in->title );
}
else
{
}
}
+ /* 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 ) )
+ {
+ 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" );
- if( psz_dup ) free( psz_dup );
return VLC_SUCCESS;
error:
+ input_ChangeState( p_input, ERROR_S );
+
if( in->p_demux )
demux2_Delete( in->p_demux );
if( in->p_access )
access2_Delete( in->p_access );
- if( psz_dup ) free( psz_dup );
return VLC_EGENERIC;
}
/*****************************************************************************
* InputSourceClean:
*****************************************************************************/
-static void InputSourceClean( input_thread_t *p_input, input_source_t *in )
+static void InputSourceClean( input_source_t *in )
{
+ int i;
+
if( in->p_demux )
demux2_Delete( in->p_demux );
if( in->i_title > 0 )
{
- int i;
for( i = 0; i < in->i_title; i++ )
- {
vlc_input_title_Delete( in->title[i] );
- }
- free( in->title );
+ TAB_CLEAN( in->i_title, in->title );
}
}
{
int64_t i_time;
int i;
-
- if( demux2_Control( p_input->input.p_demux, DEMUX_GET_TIME, &i_time ) )
+
+ if( demux2_Control( p_input->p->input.p_demux, DEMUX_GET_TIME, &i_time ) )
{
msg_Err( p_input, "demux doesn't like DEMUX_GET_TIME" );
return;
}
- for( i = 0; i < p_input->i_slave; i++ )
+ for( i = 0; i < p_input->p->i_slave; i++ )
{
- input_source_t *in = p_input->slave[i];
+ input_source_t *in = p_input->p->slave[i];
int i_ret = 1;
if( in->b_eof )
int64_t i_time;
int i;
- if( demux2_Control( p_input->input.p_demux, DEMUX_GET_TIME, &i_time ) )
+ if( !p_input ) return;
+
+ if( demux2_Control( p_input->p->input.p_demux, DEMUX_GET_TIME, &i_time ) )
{
msg_Err( p_input, "demux doesn't like DEMUX_GET_TIME" );
return;
}
- for( i = 0; i < p_input->i_slave; i++ )
+ for( i = 0; i < p_input->p->i_slave; i++ )
{
- input_source_t *in = p_input->slave[i];
+ input_source_t *in = p_input->p->slave[i];
if( demux2_Control( in->p_demux, DEMUX_SET_TIME, i_time ) )
{
}
}
}
+
/*****************************************************************************
* InputMetaUser:
*****************************************************************************/
-static void InputMetaUser( input_thread_t *p_input )
+static void InputMetaUser( input_thread_t *p_input, vlc_meta_t *p_meta )
{
- vlc_meta_t *p_meta = p_input->input.p_item->p_meta;
vlc_value_t val;
if( !p_meta ) return;
/* Get meta information from user */
#define GET_META( field, s ) \
var_Get( p_input, (s), &val ); \
- if( *val.psz_string ) { \
- if( p_meta->psz_ ## field ) free ( p_meta->psz_ ## field ); \
- p_meta->psz_ ## field = strdup( val.psz_string ); \
- } \
+ if( *val.psz_string ) \
+ vlc_meta_Set( p_meta, vlc_meta_ ## field, val.psz_string ); \
free( val.psz_string )
- GET_META( title, "meta-title" );
- GET_META( author, "meta-author" );
- GET_META( artist, "meta-artist" );
- GET_META( genre, "meta-genre" );
- GET_META( copyright, "meta-copyright" );
- GET_META( description, "meta-description" );
- GET_META( date, "meta-date" );
- GET_META( url, "meta-url" );
+ GET_META( Title, "meta-title" );
+ GET_META( Artist, "meta-artist" );
+ GET_META( Genre, "meta-genre" );
+ GET_META( Copyright, "meta-copyright" );
+ GET_META( Description, "meta-description" );
+ GET_META( Date, "meta-date" );
+ GET_META( URL, "meta-url" );
#undef GET_META
}
/*****************************************************************************
- * DecodeUrl: decode a given encoded url
+ * InputUpdateMeta: merge p_item meta data with p_meta taking care of
+ * arturl and locking issue.
*****************************************************************************/
-static void DecodeUrl( char *psz )
+static void InputUpdateMeta( input_thread_t *p_input, vlc_meta_t *p_meta )
{
- char *dup = strdup( psz );
- char *p = dup;
+ input_item_t *p_item = p_input->p->input.p_item;
+ char * psz_arturl = NULL;
+ char *psz_title = NULL;
+ int i;
+ int i_arturl_event = VLC_FALSE;
+
+ if( !p_meta )
+ return;
- while( *p )
+ 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 ) );
+
+ vlc_meta_Merge( p_item->p_meta, p_meta );
+
+ if( psz_arturl && *psz_arturl )
{
- if( *p == '%' )
- {
- char val[3];
- p++;
- if( !*p )
- {
- break;
- }
+ vlc_meta_Set( p_item->p_meta, vlc_meta_ArtworkURL, psz_arturl );
+ i_arturl_event = VLC_TRUE;
+ }
- val[0] = *p++;
- val[1] = *p++;
- val[2] = '\0';
+ vlc_meta_Delete( p_meta );
- *psz++ = strtol( val, NULL, 16 );
- }
- else if( *p == '+' )
+ 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 )
{
- *psz++ = ' ';
- p++;
+ vlc_meta_Set( p_item->p_meta, vlc_meta_ArtworkURL, "" );
+ i_arturl_event = VLC_TRUE;
+
}
else
+ input_ExtractAttachmentAndCacheArt( p_input );
+ }
+ free( psz_arturl );
+
+ /* A bit ugly */
+ p_meta = NULL;
+ if( vlc_dictionary_keys_count( &p_item->p_meta->extra_tags ) > 0 )
+ {
+ p_meta = vlc_meta_New();
+ vlc_meta_Merge( p_meta, input_item_GetMetaObject( p_item ) );
+ }
+ 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 );
+ free( psz_title );
+ }
+
+ if( p_meta )
+ {
+ char ** ppsz_all_keys = vlc_dictionary_all_keys( &p_meta->extra_tags );
+ for( i = 0; ppsz_all_keys[i]; i++ )
{
- *psz++ = *p++;
+ input_Control( p_input, INPUT_ADD_INFO, _(VLC_META_INFO_CAT), _(ppsz_all_keys[i]),
+ vlc_dictionary_value_for_key( &p_meta->extra_tags, ppsz_all_keys[i] ) );
+ free( ppsz_all_keys[i] );
}
+ free( ppsz_all_keys );
+ vlc_meta_Delete( p_meta );
}
- if( psz ) *psz++ ='\0';
- if( dup ) free( dup );
+
+ /** \todo handle sout meta */
}
-/*****************************************************************************
- * MRLSplit: parse the access, demux and url part of the
- * Media Resource Locator.
- *****************************************************************************/
-void MRLSplit( vlc_object_t *p_input, char *psz_dup,
- char **ppsz_access, char **ppsz_demux, char **ppsz_path )
+
+static void AppendAttachment( int *pi_attachment, input_attachment_t ***ppp_attachment,
+ int i_new, input_attachment_t **pp_new )
{
- char *psz_access = NULL;
- char *psz_demux = NULL;
- char *psz_path = NULL;
- char *psz, *psz_check;
+ int i_attachment = *pi_attachment;
+ input_attachment_t **attachment = *ppp_attachment;
+ int i;
- psz = strchr( psz_dup, ':' );
+ 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 );
- /* '@' not allowed in access/demux part */
- psz_check = strchr( psz_dup, '@' );
- if( psz_check && psz_check < psz ) psz = 0;
+ /* */
+ *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 defined( WIN32 ) || defined( UNDER_CE )
- if( psz - psz_dup == 1 )
+
+#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 ) )
{
- msg_Dbg( p_input, "drive letter %c: found in source", *psz_dup );
- psz_path = psz_dup;
+ vlc_mutex_unlock( &p_item->lock );
+ return;
}
- else
+ vlc_mutex_unlock( &p_item->lock );
#endif
- if( 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 )
{
- *psz++ = '\0';
- if( psz[0] == '/' && psz[1] == '/' ) psz += 2;
+ demux_meta_t *p_demux_meta = (demux_meta_t *)p_demux->p_private;
- psz_path = psz;
+ if( p_demux_meta->p_meta )
+ {
+ vlc_meta_Merge( p_meta, p_demux_meta->p_meta );
+ vlc_meta_Delete( p_demux_meta->p_meta );
+ }
- psz = strchr( psz_dup, '/' );
- if( psz )
+ if( p_demux_meta->i_attachments > 0 )
{
- *psz++ = '\0';
- psz_demux = psz;
+ 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
+ * Media Resource Locator.
+ *****************************************************************************/
+void MRLSplit( char *psz_dup, const char **ppsz_access, const char **ppsz_demux,
+ char **ppsz_path )
+{
+ char *psz_access = NULL;
+ char *psz_demux = NULL;
+ char *psz_path;
+
+ /* 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 )
+ {
+ *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;
}
- if( !psz_access ) *ppsz_access = "";
- else *ppsz_access = psz_access;
-
- if( !psz_demux ) *ppsz_demux = "";
- else *ppsz_demux = psz_demux;
-
- if( !psz_path ) *ppsz_path = "";
- else *ppsz_path = psz_path;
+ *ppsz_access = psz_access ? psz_access : "";
+ *ppsz_demux = psz_demux ? psz_demux : "";
+ *ppsz_path = psz_path ? psz_path : "";
}
/*****************************************************************************
sub = InputSourceNew( p_input );
if( !InputSourceInit( p_input, sub, psz_subtitle, "subtitle" ) )
{
- TAB_APPEND( p_input->i_slave, p_input->slave, sub );
+ TAB_APPEND( p_input->p->i_slave, p_input->p->slave, sub );
/* Select the ES */
if( !var_Change( p_input, "spu-es", VLC_VAR_GETLIST, &list, NULL ) )
var_Change( p_input, "spu-es", VLC_VAR_FREELIST, &list, NULL );
}
}
+ else free( sub );
return VLC_TRUE;
}
-
-#ifndef MAX_PATH
-# define MAX_PATH 250
-#endif
-int input_DownloadAndCacheArt( vlc_object_t *p_parent, input_item_t *p_item )
-{
- char *psz_artist;
- char *psz_album;
- char *psz_type;
- char *psz_filename;
- int i_status = VLC_EGENERIC;
- int i_ret;
- struct stat a;
-
- if( !p_item->p_meta
- || !p_item->p_meta->psz_arturl
- || !*p_item->p_meta->psz_arturl )
- {
- return VLC_EGENERIC;
- }
- if( !strncmp( p_item->p_meta->psz_arturl, "file", 4 ) )
- {
- return VLC_SUCCESS;
- }
-
- psz_artist = p_item->p_meta->psz_artist;
- psz_album = p_item->p_meta->psz_album;
- psz_type = strrchr( p_item->p_meta->psz_arturl, '.' );
- psz_filename = (char *)malloc( MAX_PATH );
-
-
- snprintf( psz_filename, MAX_PATH,
- "file://%s" DIR_SEP CONFIG_DIR DIR_SEP "art"
- DIR_SEP "%s" DIR_SEP "%s" DIR_SEP "art%s",
- p_parent->p_libvlc->psz_homedir,
- psz_artist, psz_album, psz_type );
- msg_Dbg( p_parent, "Saving album art to %s", psz_filename );
-
- /* Check if file exists */
- i_ret = utf8_stat( psz_filename+7, &a );
- if( i_ret == 0 )
- {
- msg_Dbg( p_parent, "Album art %s already exists", psz_filename );
- }
- else
- {
- //if( i_ret == -1 && errno == ENOTDIR )
- {
- /* GRUIKKKKKKKKKK (make sure that all the directories exist) */
- char *psz_dir = malloc( MAX_PATH );
- snprintf( psz_dir, MAX_PATH, "%s" DIR_SEP CONFIG_DIR,
- p_parent->p_libvlc->psz_homedir );
- utf8_mkdir( psz_dir );
- snprintf( psz_dir, MAX_PATH, "%s" DIR_SEP CONFIG_DIR DIR_SEP "art",
- p_parent->p_libvlc->psz_homedir );
- utf8_mkdir( psz_dir );
- snprintf( psz_dir, MAX_PATH, "%s" DIR_SEP CONFIG_DIR DIR_SEP
- "art" DIR_SEP "%s",
- p_parent->p_libvlc->psz_homedir, psz_artist );
- utf8_mkdir( psz_dir );
- snprintf( psz_dir, MAX_PATH, "%s" DIR_SEP CONFIG_DIR DIR_SEP
- "art" DIR_SEP "%s" DIR_SEP "%s",
- p_parent->p_libvlc->psz_homedir,
- psz_artist, psz_album );
- utf8_mkdir( psz_dir );
- free( psz_dir );
- }
-
- stream_t *p_stream = stream_UrlNew( p_parent,
- p_item->p_meta->psz_arturl );
-
- if( p_stream )
- {
- void *p_buffer = malloc( 1<<16 );
- long int l_read;
- FILE *p_file = utf8_fopen( psz_filename+7, "w" );
- while( ( l_read = stream_Read( p_stream, p_buffer, 1<<16 ) ) )
- {
- fwrite( p_buffer, l_read, 1, p_file );
- }
- free( p_buffer );
- fclose( p_file );
- stream_Delete( p_stream );
- msg_Dbg( p_parent, "Album art saved to %s\n", psz_filename );
- free( p_item->p_meta->psz_arturl );
- p_item->p_meta->psz_arturl = strdup( psz_filename );
- i_status = VLC_SUCCESS;
- }
- }
- free( psz_filename );
-
- return i_status;
-}
projects / vlc / blobdiff