p_md_child = libvlc_media_new_from_input_item(
p_md->p_libvlc_instance,
- p_event->u.input_item_subitem_added.p_new_child, NULL );
+ p_event->u.input_item_subitem_added.p_new_child );
/* Add this to our media list */
if( !p_md->p_subitems )
{
- p_md->p_subitems = libvlc_media_list_new( p_md->p_libvlc_instance, NULL );
- libvlc_media_list_set_media( p_md->p_subitems, p_md, NULL );
+ p_md->p_subitems = libvlc_media_list_new( p_md->p_libvlc_instance );
+ libvlc_media_list_set_media( p_md->p_subitems, p_md );
}
if( p_md->p_subitems )
{
**************************************************************************/
libvlc_media_t * libvlc_media_new_from_input_item(
libvlc_instance_t *p_instance,
- input_item_t *p_input_item,
- libvlc_exception_t *p_e )
+ input_item_t *p_input_item )
{
libvlc_media_t * p_md;
if (!p_input_item)
{
- libvlc_exception_raise( p_e );
libvlc_printerr( "No input item given" );
return NULL;
}
p_md = calloc( 1, sizeof(libvlc_media_t) );
if( !p_md )
{
- libvlc_exception_raise( p_e );
libvlc_printerr( "Not enough memory" );
return NULL;
}
* It can give a bunch of item to read. */
p_md->p_subitems = NULL;
- p_md->p_event_manager = libvlc_event_manager_new( p_md, p_instance, p_e );
+ p_md->p_event_manager = libvlc_event_manager_new( p_md, p_instance );
+ if( unlikely(p_md->p_event_manager == NULL) )
+ {
+ free(p_md);
+ return NULL;
+ }
libvlc_event_manager_register_event_type( p_md->p_event_manager,
- libvlc_MediaMetaChanged, p_e );
+ libvlc_MediaMetaChanged );
libvlc_event_manager_register_event_type( p_md->p_event_manager,
- libvlc_MediaSubItemAdded, p_e );
+ libvlc_MediaSubItemAdded );
libvlc_event_manager_register_event_type( p_md->p_event_manager,
- libvlc_MediaFreed, p_e );
+ libvlc_MediaFreed );
libvlc_event_manager_register_event_type( p_md->p_event_manager,
- libvlc_MediaDurationChanged, p_e );
+ libvlc_MediaDurationChanged );
libvlc_event_manager_register_event_type( p_md->p_event_manager,
- libvlc_MediaStateChanged, p_e );
+ libvlc_MediaStateChanged );
vlc_gc_incref( p_md->p_input_item );
/**************************************************************************
* Create a new media descriptor object
**************************************************************************/
-libvlc_media_t * libvlc_media_new(
- libvlc_instance_t *p_instance,
- const char * psz_mrl,
- libvlc_exception_t *p_e )
+libvlc_media_t * libvlc_media_new( libvlc_instance_t *p_instance,
+ const char * psz_mrl )
{
input_item_t * p_input_item;
libvlc_media_t * p_md;
if (!p_input_item)
{
- libvlc_exception_raise( p_e );
libvlc_printerr( "Not enough memory" );
return NULL;
}
- p_md = libvlc_media_new_from_input_item( p_instance,
- p_input_item, p_e );
+ p_md = libvlc_media_new_from_input_item( p_instance, p_input_item );
/* The p_input_item is retained in libvlc_media_new_from_input_item */
vlc_gc_decref( p_input_item );
/**************************************************************************
* Create a new media descriptor object
**************************************************************************/
-libvlc_media_t * libvlc_media_new_as_node(
- libvlc_instance_t *p_instance,
- const char * psz_name,
- libvlc_exception_t *p_e )
+libvlc_media_t * libvlc_media_new_as_node( libvlc_instance_t *p_instance,
+ const char * psz_name )
{
input_item_t * p_input_item;
libvlc_media_t * p_md;
if (!p_input_item)
{
- libvlc_exception_raise( p_e );
libvlc_printerr( "Not enough memory" );
return NULL;
}
- p_md = libvlc_media_new_from_input_item( p_instance,
- p_input_item, p_e );
+ p_md = libvlc_media_new_from_input_item( p_instance, p_input_item );
- p_md->p_subitems = libvlc_media_list_new( p_md->p_libvlc_instance, NULL );
+ p_md->p_subitems = libvlc_media_list_new( p_md->p_libvlc_instance );
return p_md;
}
libvlc_media_duplicate( libvlc_media_t *p_md_orig )
{
return libvlc_media_new_from_input_item(
- p_md_orig->p_libvlc_instance, p_md_orig->p_input_item, NULL );
+ p_md_orig->p_libvlc_instance, p_md_orig->p_input_item );
}
/**************************************************************************
* Get duration of media object (in ms)
**************************************************************************/
int64_t
-libvlc_media_get_duration( libvlc_media_t * p_md, libvlc_exception_t *p_e )
+libvlc_media_get_duration( libvlc_media_t * p_md )
{
assert( p_md );
if( !p_md->p_input_item )
{
- libvlc_exception_raise( p_e );
libvlc_printerr( "No input item" );
return -1;
}
assert( p_md );
return p_md->p_user_data;
}
+
+/**************************************************************************
+ * Get media descriptor's elementary streams description
+ **************************************************************************/
+int
+libvlc_media_get_es( libvlc_media_t *p_md, libvlc_media_es_t ** pp_es )
+{
+ assert( p_md );
+
+ input_item_t *p_input_item = p_md->p_input_item;
+ vlc_mutex_lock( &p_input_item->lock );
+
+ const int i_es = p_input_item->i_es;
+ *pp_es = (i_es > 0) ? malloc( i_es * sizeof(libvlc_media_es_t) ) : NULL;
+
+ if( !pp_es ) /* no ES, or OOM */
+ {
+ vlc_mutex_unlock( &p_input_item->lock );
+ return 0;
+ }
+
+ /* Fill array */
+ for( int i = 0; i < i_es; i++ )
+ {
+ libvlc_media_es_t *p_mes = *pp_es+i;
+ const es_format_t *p_es = p_input_item->es[i];
+
+ p_mes->i_channels = p_mes->i_rate = 0;
+ p_mes->i_width = p_mes->i_height = 0;
+
+
+ p_mes->i_codec = p_es->i_codec;
+ p_mes->i_id = p_es->i_id;
+
+ p_mes->i_profile = p_es->i_profile;
+ p_mes->i_level = p_es->i_level;
+
+ switch(p_es->i_cat)
+ {
+ case UNKNOWN_ES:
+ default:
+ p_mes->i_type = libvlc_es_unknown;
+ break;
+ case VIDEO_ES:
+ p_mes->i_type = libvlc_es_video;
+ p_mes->i_height = p_es->video.i_height;
+ p_mes->i_width = p_es->video.i_width;
+ break;
+ case AUDIO_ES:
+ p_mes->i_type = libvlc_es_audio;
+ p_mes->i_channels = p_es->audio.i_channels;
+ p_mes->i_rate = p_es->audio.i_rate;
+ break;
+ case SPU_ES:
+ p_mes->i_type = libvlc_es_text;
+ break;
+ }
+ }
+
+ vlc_mutex_unlock( &p_input_item->lock );
+ return i_es;
+}
projects / vlc / blobdiff