libvlc_media_es_t: export ES id

[vlc] / include / vlc / libvlc_media.h

diff --git a/include/vlc/libvlc_media.h b/include/vlc/libvlc_media.h
index 3eed6053848ad13c7d1f8b787a903e85e990c7b6..18fbb515d6c3695217532c951a295030cf387444 100644 (file)
--- a/include/vlc/libvlc_media.h
+++ b/include/vlc/libvlc_media.h
@@ -31,6 +31,10 @@
 #ifndef VLC_LIBVLC_MEDIA_H
 #define VLC_LIBVLC_MEDIA_H 1
 
+# ifdef __cplusplus
+extern "C" {
+# endif
+
 /*****************************************************************************
  * media
  *****************************************************************************/
@@ -99,6 +103,13 @@ typedef enum libvlc_media_option_t
     libvlc_media_option_unique = 0x100
 } libvlc_media_option_t;
 
+typedef enum libvlc_es_type_t
+{
+    libvlc_es_unknown   = -1,
+    libvlc_es_audio     = 0,
+    libvlc_es_video     = 1,
+    libvlc_es_text      = 2,
+} libvlc_es_type_t;
 
 /** defgroup libvlc_media_stats_t libvlc_media_stats_t
  * \ingroup libvlc_media
@@ -136,6 +147,27 @@ typedef struct libvlc_media_stats_t
 } libvlc_media_stats_t;
 /** @}*/
 
+typedef struct libvlc_media_es_t
+{
+    /* Codec fourcc */
+    uint32_t    i_codec;
+    int         i_id;
+    libvlc_es_type_t i_type;
+
+    /* Codec specific */
+    int         i_profile;
+    int         i_level;
+
+    /* Audio specific */
+    unsigned    i_channels;
+    unsigned    i_rate;
+
+    /* Video specific */
+    unsigned    i_height;
+    unsigned    i_width;
+
+} libvlc_media_es_t;
+
 
 /**
  * Create a media with the given MRL.
@@ -249,7 +281,7 @@ VLC_PUBLIC_API char * libvlc_media_get_meta( libvlc_media_t *p_md,
  * libvlc_media_save_meta in order to save the meta)
  *
  * \param p_md the media descriptor
- * \param e_meta the meta to read
+ * \param e_meta the meta to write
  * \param the media's meta
  */
 VLC_PUBLIC_API void libvlc_media_set_meta( libvlc_media_t *p_md,
@@ -261,7 +293,7 @@ VLC_PUBLIC_API void libvlc_media_set_meta( libvlc_media_t *p_md,
  * Save the meta previously set
  *
  * \param p_md the media desriptor
- * \return true if the werite was successfull
+ * \return true if the write operation was successfull
  */
 VLC_PUBLIC_API int libvlc_media_save_meta( libvlc_media_t *p_md );
 
@@ -359,6 +391,25 @@ VLC_PUBLIC_API void
 VLC_PUBLIC_API void *
     libvlc_media_get_user_data( libvlc_media_t * p_md );
 
+/**
+ * Get media descriptor's elementary streams description
+ *
+ * Note, you need to play the media _one_ time with --sout="#description"
+ * Not doing this will result in an empty array, and doing it more than once
+ * will duplicate the entries in the array each time.
+ *
+ * \param p_md media descriptor object
+ * \param pp_es adress to store an allocated array of Elementary Streams descriptions (must be freed by the caller)
+ *
+ * return the number of Elementary Streams
+ */
+VLC_PUBLIC_API int
+    libvlc_media_get_es( libvlc_media_t * p_md, libvlc_media_es_t ** pp_es );
+
 /** @}*/
 
+# ifdef __cplusplus
+}
+# endif
+
 #endif /* VLC_LIBVLC_MEDIA_H */