Dead inline

[vlc] / src / control / media.c

diff --git a/src/control/media.c b/src/control/media.c
index 07c8b081975f05d8cb9fac7a1f53c39c23fcfec1..e97c4164939c38f37c0dce983cbcef5d6eb4aa9a 100644 (file)
--- a/src/control/media.c
+++ b/src/control/media.c
@@ -101,8 +101,8 @@ static void input_item_subitem_added( const vlc_event_t *p_event,
     /* 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 )
     {
@@ -252,7 +252,7 @@ libvlc_media_t * libvlc_media_new_from_input_item(
         return NULL;
     }
 
-    p_md = malloc( sizeof(libvlc_media_t) );
+    p_md = calloc( 1, sizeof(libvlc_media_t) );
     if( !p_md )
     {
         libvlc_exception_raise( p_e );
@@ -262,9 +262,7 @@ libvlc_media_t * libvlc_media_new_from_input_item(
 
     p_md->p_libvlc_instance = p_instance;
     p_md->p_input_item      = p_input_item;
-    p_md->b_preparsed       = false;
     p_md->i_refcount        = 1;
-    p_md->p_user_data       = NULL;
 
     p_md->state = libvlc_NothingSpecial;
 
@@ -272,17 +270,22 @@ libvlc_media_t * libvlc_media_new_from_input_item(
      * 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 );
 
@@ -343,7 +346,7 @@ libvlc_media_t * libvlc_media_new_as_node(
     p_md = libvlc_media_new_from_input_item( p_instance,
                 p_input_item, p_e );
 
-    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;
 }
@@ -453,8 +456,9 @@ char *libvlc_media_get_meta( libvlc_media_t *p_md, libvlc_meta_t e_meta )
     psz_meta = input_item_GetMeta( p_md->p_input_item,
                                    libvlc_to_vlc_meta[e_meta] );
 
-    if( e_meta == libvlc_meta_ArtworkURL && !psz_meta )
+    if( e_meta == libvlc_meta_ArtworkURL && !psz_meta && !p_md->has_asked_art )
     {
+        p_md->has_asked_art = true;
         playlist_AskForArtEnqueue(
                 libvlc_priv(p_md->p_libvlc_instance->p_libvlc_int)->p_playlist,
                 p_md->p_input_item, pl_Unlocked );
@@ -637,3 +641,65 @@ libvlc_media_get_user_data( libvlc_media_t * p_md )
     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;
+}