* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
+#if !defined( __LIBVLC__ )
+ #error You are not libvlc or one of its plugins. You cannot include this file
+#endif
+
/* __ is need because conflict with <vlc/input.h> */
#ifndef _VLC__INPUT_H
#define _VLC__INPUT_H 1
-#include <vlc_playlist.h>
+#include <vlc_es.h>
#include <vlc_meta.h>
+#include <vlc_epg.h>
struct vlc_meta_t;
static inline void input_ItemInit( vlc_object_t *p_o, input_item_t *p_i )
{
memset( p_i, 0, sizeof(input_item_t) );
- p_i->psz_name = 0;
- p_i->psz_uri = 0;
- p_i->i_es = 0;
- p_i->es = 0;
- p_i->i_options = 0;
- p_i->ppsz_options = 0;
- p_i->i_categories = 0 ;
- p_i->pp_categories = 0;
+ p_i->psz_name = NULL;
+ p_i->psz_uri = NULL;
+ TAB_INIT( p_i->i_es, p_i->es );
+ TAB_INIT( p_i->i_options, p_i->ppsz_options );
+ TAB_INIT( p_i->i_categories, p_i->pp_categories );
+
p_i->i_type = ITEM_TYPE_UNKNOWN;
p_i->b_fixed_name = VLC_TRUE;
static inline void input_ItemClean( input_item_t *p_i )
{
+ int i;
+
free( p_i->psz_name );
free( p_i->psz_uri );
if( p_i->p_stats )
free( p_i->p_stats );
}
- if( p_i->p_meta ) vlc_meta_Delete( p_i->p_meta );
+ if( p_i->p_meta )
+ vlc_meta_Delete( p_i->p_meta );
- while( p_i->i_options )
+ for( i = 0; i < p_i->i_options; i++ )
{
- p_i->i_options--;
- if( p_i->ppsz_options[p_i->i_options] )
- free( p_i->ppsz_options[p_i->i_options] );
- if( !p_i->i_options ) free( p_i->ppsz_options );
+ if( p_i->ppsz_options[i] )
+ free( p_i->ppsz_options[i] );
}
+ TAB_CLEAN( p_i->i_options, p_i->ppsz_options );
- while( p_i->i_es )
+ for( i = 0; i < p_i->i_es; i++ )
{
- p_i->i_es--;
- es_format_Clean( p_i->es[p_i->i_es] );
- if( !p_i->i_es ) free( p_i->es );
+ es_format_Clean( p_i->es[i] );
+ free( p_i->es[i] );
}
+ TAB_CLEAN( p_i->i_es, p_i->es );
- while( p_i->i_categories )
+ for( i = 0; i < p_i->i_categories; i++ )
{
- info_category_t *p_category =
- p_i->pp_categories[--(p_i->i_categories)];
+ info_category_t *p_category = p_i->pp_categories[i];
+ int j;
- while( p_category->i_infos )
+ for( j = 0; j < p_category->i_infos; j++ )
{
- p_category->i_infos--;
+ struct info_t *p_info = p_category->pp_infos[j];
- if( p_category->pp_infos[p_category->i_infos]->psz_name )
- free( p_category->pp_infos[p_category->i_infos]->psz_name);
- if( p_category->pp_infos[p_category->i_infos]->psz_value )
- free( p_category->pp_infos[p_category->i_infos]->psz_value );
- free( p_category->pp_infos[p_category->i_infos] );
-
- if( !p_category->i_infos ) free( p_category->pp_infos );
+ if( p_info->psz_name )
+ free( p_info->psz_name);
+ if( p_info->psz_value )
+ free( p_info->psz_value );
+ free( p_info );
}
+ TAB_CLEAN( p_category->i_infos, p_category->pp_infos );
if( p_category->psz_name ) free( p_category->psz_name );
free( p_category );
-
- if( !p_i->i_categories ) free( p_i->pp_categories );
}
+ TAB_CLEAN( p_i->i_categories, p_i->pp_categories );
vlc_mutex_destroy( &p_i->lock );
}
#define input_ItemNew( a,b,c ) input_ItemNewExt( a, b, c, 0, NULL, -1 )
#define input_ItemNewExt(a,b,c,d,e,f) __input_ItemNewExt( VLC_OBJECT(a),b,c,d,e,f)
-VLC_EXPORT( input_item_t *, __input_ItemNewExt, (vlc_object_t *, const char *, const char*, int, const char **, int) );
-VLC_EXPORT( input_item_t *, input_ItemNewWithType, ( vlc_object_t *, const char *, const char *e, int, const char **, int, int ) );
+VLC_EXPORT( input_item_t *, __input_ItemNewExt, (vlc_object_t *, const char *, const char*, int, const char *const *, mtime_t i_duration ) );
+VLC_EXPORT( input_item_t *, input_ItemNewWithType, ( vlc_object_t *, const char *, const char *e, int, const char *const *, mtime_t i_duration, int ) );
VLC_EXPORT( input_item_t *, input_ItemGetById, (playlist_t *, int ) );
+/*****************************************************************************
+ * Meta data helpers
+ *****************************************************************************/
+static inline void vlc_audio_replay_gain_MergeFromMeta( audio_replay_gain_t *p_dst,
+ const vlc_meta_t *p_meta )
+{
+ int i;
+ if( !p_meta )
+ return;
+
+ for( i = 0; i < p_meta->i_extra; i++ )
+ {
+ const char *psz_name = p_meta->ppsz_extra_name[i];
+ const char *psz_value = p_meta->ppsz_extra_value[i];
+
+ if( !strcasecmp( psz_name, "REPLAYGAIN_TRACK_GAIN" ) ||
+ !strcasecmp( psz_name, "RG_RADIO" ) )
+ {
+ p_dst->pb_gain[AUDIO_REPLAY_GAIN_TRACK] = VLC_TRUE;
+ p_dst->pf_gain[AUDIO_REPLAY_GAIN_TRACK] = atof( psz_value );
+ }
+ else if( !strcasecmp( psz_name, "REPLAYGAIN_TRACK_PEAK" ) ||
+ !strcasecmp( psz_name, "RG_PEAK" ) )
+ {
+ p_dst->pb_peak[AUDIO_REPLAY_GAIN_TRACK] = VLC_TRUE;
+ p_dst->pf_peak[AUDIO_REPLAY_GAIN_TRACK] = atof( psz_value );
+ }
+ else if( !strcasecmp( psz_name, "REPLAYGAIN_ALBUM_GAIN" ) ||
+ !strcasecmp( psz_name, "RG_AUDIOPHILE" ) )
+ {
+ p_dst->pb_gain[AUDIO_REPLAY_GAIN_ALBUM] = VLC_TRUE;
+ p_dst->pf_gain[AUDIO_REPLAY_GAIN_ALBUM] = atof( psz_value );
+ }
+ else if( !strcasecmp( psz_name, "REPLAYGAIN_ALBUM_PEAK" ) )
+ {
+ p_dst->pb_peak[AUDIO_REPLAY_GAIN_ALBUM] = VLC_TRUE;
+ p_dst->pf_peak[AUDIO_REPLAY_GAIN_ALBUM] = atof( psz_value );
+ }
+ }
+}
/*****************************************************************************
* Seek point: (generalisation of chapters)
return dup;
}
+/*****************************************************************************
+ * Attachments
+ *****************************************************************************/
+struct input_attachment_t
+{
+ char *psz_name;
+ char *psz_mime;
+ char *psz_description;
+ int i_data;
+ void *p_data;
+};
+static inline input_attachment_t *vlc_input_attachment_New( const char *psz_name,
+ const char *psz_mime,
+ const char *psz_description,
+ const void *p_data,
+ int i_data )
+{
+ input_attachment_t *a =
+ (input_attachment_t*)malloc( sizeof(input_attachment_t) );
+ if( !a )
+ return NULL;
+ a->psz_name = strdup( psz_name ? psz_name : "" );
+ a->psz_mime = strdup( psz_mime ? psz_mime : "" );
+ a->psz_description = strdup( psz_description ? psz_description : "" );
+ a->i_data = i_data;
+ a->p_data = NULL;
+ if( i_data > 0 )
+ {
+ a->p_data = malloc( i_data );
+ if( a->p_data && p_data )
+ memcpy( a->p_data, p_data, i_data );
+ }
+ return a;
+}
+static inline input_attachment_t *vlc_input_attachment_Duplicate( const input_attachment_t *a )
+{
+ return vlc_input_attachment_New( a->psz_name, a->psz_mime, a->psz_description,
+ a->p_data, a->i_data );
+}
+static inline void vlc_input_attachment_Delete( input_attachment_t *a )
+{
+ if( !a )
+ return;
+ free( a->psz_name );
+ free( a->psz_mime );
+ free( a->psz_description );
+ if( a->p_data )
+ free( a->p_data );
+ free( a );
+}
/*****************************************************************************
* input defines/constants.
*****************************************************************************/
BUFFERING_S,
PLAYING_S,
PAUSE_S,
- END_S
+ END_S,
+ ERROR_S
};
/* "rate" default, min/max
*/
#define INPUT_RATE_DEFAULT 1000
#define INPUT_RATE_MIN 125 /* Up to 8/1 */
-#define INPUT_RATE_MAX 8000 /* Up to 1/8 */
-
-/* input_source_t: gathers all information per input source */
-typedef struct
-{
- /* Input item description */
- input_item_t *p_item;
-
- /* Access/Stream/Demux plugins */
- access_t *p_access;
- stream_t *p_stream;
- demux_t *p_demux;
-
- /* Title infos for that input */
- vlc_bool_t b_title_demux; /* Titles/Seekpoints provided by demux */
- int i_title;
- input_title_t **title;
-
- int i_title_offset;
- int i_seekpoint_offset;
-
- int i_title_start;
- int i_title_end;
- int i_seekpoint_start;
- int i_seekpoint_end;
-
- /* Properties */
- vlc_bool_t b_can_pace_control;
- vlc_bool_t b_can_pause;
- vlc_bool_t b_eof; /* eof of demuxer */
-
- /* Clock average variation */
- int i_cr_average;
-
-} input_source_t;
+#define INPUT_RATE_MAX 32000 /* Up to 1/32 */
/* i_update field of access_t/demux_t */
#define INPUT_UPDATE_NONE 0x0000
/* Input control XXX: internal */
#define INPUT_CONTROL_FIFO_SIZE 100
-/*****************************************************************************
- * input_thread_t
- *****************************************************************************
- * XXX: this strucrures is *PRIVATE* so nobody can touch it out of src/input.
- * I plan to move it to src/input/input_internal.h anyway
- *
- * XXX: look at src/input/input.c:input_CreateThread for accessible variables
- * YOU CANNOT HAVE ACCESS TO THE CONTENT OF input_thread_t except
- * p_input->input.p_item (and it's only temporary).
- * XXX: move the docs somewhere (better than src/input )
- *****************************************************************************/
+/** Get the input item for an input thread */
+VLC_EXPORT(input_item_t*, input_GetItem, (input_thread_t*));
+
+typedef struct input_thread_private_t input_thread_private_t;
+
+/**
+ * Main structure representing an input thread. This structure is mostly
+ * private. The only public fields are READ-ONLY. You must use the helpers
+ * to modify them
+ */
struct input_thread_t
{
- VLC_COMMON_MEMBERS
+ VLC_COMMON_MEMBERS;
- /* Global properties */
vlc_bool_t b_eof;
- vlc_bool_t b_can_pace_control;
- vlc_bool_t b_can_pause;
- vlc_bool_t b_preparsing;
-
- /* Global state */
- int i_state;
- int i_rate;
+ vlc_bool_t b_preparsing;
- /* */
- int64_t i_start; /* :start-time,0 by default */
+ int i_state;
+ vlc_bool_t b_can_pace_control;
int64_t i_time; /* Current time */
- int64_t i_stop; /* :stop-time, 0 if none */
-
- /* Title infos FIXME multi-input (not easy) ? */
- int i_title;
- input_title_t **title;
-
- int i_title_offset;
- int i_seekpoint_offset;
-
- /* User bookmarks FIXME won't be easy with multiples input */
- int i_bookmark;
- seekpoint_t **bookmark;
-
- /* Global meta datas FIXME move to input_item_t ? */
- vlc_meta_t *p_meta;
-
- /* Output */
- es_out_t *p_es_out;
- sout_instance_t *p_sout; /* XXX Move it to es_out ? */
- vlc_bool_t b_out_pace_control; /* idem ? */
-
- /* Internal caching common for all inputs */
- int64_t i_pts_delay;
-
- /* Main input properties */
- input_source_t input;
-
- /* Slave demuxers (subs, and others) */
- int i_slave;
- input_source_t **slave;
-
- /* Stats counters */
- struct {
- counter_t *p_read_packets;
- counter_t *p_read_bytes;
- counter_t *p_input_bitrate;
- counter_t *p_demux_read;
- counter_t *p_demux_bitrate;
- counter_t *p_decoded_audio;
- counter_t *p_decoded_video;
- counter_t *p_decoded_sub;
- counter_t *p_sout_sent_packets;
- counter_t *p_sout_sent_bytes;
- counter_t *p_sout_send_bitrate;
- counter_t *p_played_abuffers;
- counter_t *p_lost_abuffers;
- counter_t *p_displayed_pictures;
- counter_t *p_lost_pictures;
- vlc_mutex_t counters_lock;
- } counters;
-
- /* Buffer of pending actions */
- vlc_mutex_t lock_control;
- int i_control;
- struct
- {
- /* XXX: val isn't duplicated so it won't works with string */
- int i_type;
- vlc_value_t val;
- } control[INPUT_CONTROL_FIFO_SIZE];
+
+ /* Internal caching common to all inputs */
+ int i_pts_delay;
+
+ /* All other data is input_thread is PRIVATE. You can't access it
+ * outside of src/input */
+ input_thread_private_t *p;
};
/*****************************************************************************
*****************************************************************************/
#define input_CreateThread(a,b) __input_CreateThread(VLC_OBJECT(a),b)
VLC_EXPORT( input_thread_t *, __input_CreateThread, ( vlc_object_t *, input_item_t * ) );
-#define input_CreateThread2(a,b,c) __input_CreateThread2(VLC_OBJECT(a),b,c)
-VLC_EXPORT( input_thread_t *, __input_CreateThread2, ( vlc_object_t *, input_item_t *, char * ) );
#define input_Preparse(a,b) __input_Preparse(VLC_OBJECT(a),b)
VLC_EXPORT( int, __input_Preparse, ( vlc_object_t *, input_item_t * ) );
VLC_EXPORT( void, input_StopThread, ( input_thread_t * ) );
VLC_EXPORT( void, input_DestroyThread, ( input_thread_t * ) );
-typedef struct playlist_album_t
-{
- char *psz_artist;
- char *psz_album;
- vlc_bool_t b_found;
-} playlist_album_t;
-
-int input_MetaFetch ( playlist_t *, input_item_t * );
-int input_ArtFind ( playlist_t *, input_item_t * );
-vlc_bool_t input_MetaSatisfied ( playlist_t*, input_item_t*,
- uint32_t*, uint32_t* );
-int input_DownloadAndCacheArt ( playlist_t *, input_item_t * );
-
enum input_query_e
{
/* input variable "position" */
INPUT_DEL_BOOKMARK, /* arg1= seekpoint_t * res=can fail */
INPUT_SET_BOOKMARK, /* arg1= int res=can fail */
+ /* Attachments */
+ INPUT_GET_ATTACHMENTS, /* arg1=input_attachment_t***, arg2=int* res=can fail */
+ INPUT_GET_ATTACHMENT, /* arg1=input_attachment_t**, arg2=char* res=can fail */
+
/* On the fly input slave */
INPUT_ADD_SLAVE /* arg1= char * */
};
VLC_EXPORT( vlc_bool_t, input_AddSubtitles, ( input_thread_t *, char *, vlc_bool_t ) );
-
-
#endif