Merge branch 'tizen' into tizen_gst_1.19.2

[platform/upstream/gstreamer.git] / ext / hls / m3u8.h

diff --git a/ext/hls/m3u8.h b/ext/hls/m3u8.h
index 749aa45..ed9d1ee 100644 (file)
--- a/ext/hls/m3u8.h
+++ b/ext/hls/m3u8.h
@@ -24,12 +24,13 @@
 #ifndef __M3U8_H__
 #define __M3U8_H__
 
-#include <glib.h>
+#include <gst/gst.h>
 
 G_BEGIN_DECLS
 
 typedef struct _GstM3U8 GstM3U8;
 typedef struct _GstM3U8MediaFile GstM3U8MediaFile;
+typedef struct _GstM3U8InitFile GstM3U8InitFile;
 typedef struct _GstHLSMedia GstHLSMedia;
 typedef struct _GstM3U8Client GstM3U8Client;
 typedef struct _GstHLSVariantStream GstHLSVariantStream;
@@ -107,6 +108,14 @@ struct _GstM3U8MediaFile
   guint8 iv[16];
   gint64 offset, size;
   gint ref_count;               /* ATOMIC */
+  GstM3U8InitFile *init_file;   /* Media Initialization (hold ref) */
+};
+
+struct _GstM3U8InitFile
+{
+  gchar *uri;
+  gint64 offset, size;
+  guint ref_count;      /* ATOMIC */
 };
 
 #ifdef TIZEN_FEATURE_AD
@@ -198,9 +207,8 @@ GstHLSMedia * gst_hls_media_ref   (GstHLSMedia * media);
 
 void          gst_hls_media_unref (GstHLSMedia * media);
 
-#ifdef TIZEN_FEATURE_UPSTREAM
 const gchar * gst_hls_media_type_get_name (GstHLSMediaType mtype);
-#endif
+
 
 struct _GstHLSVariantStream {
   gchar *name;         /* This will be the "name" of the playlist, the original