mpdparser: Parse xlink attributes from Period, AdaptationSet and SegmentList

We still have to do something useful with them, like actually loading the
content behind the URL.

https://bugzilla.gnome.org/show_bug.cgi?id=752230
This commit is contained in:
Sebastian Dröge 2015-07-10 18:56:29 +03:00
parent 7c9525830e
commit 07ee57228b
2 changed files with 78 additions and 0 deletions

View file

@ -35,6 +35,9 @@
/* Property parsing */ /* Property parsing */
static gboolean gst_mpdparser_get_xml_prop_string (xmlNode * a_node, static gboolean gst_mpdparser_get_xml_prop_string (xmlNode * a_node,
const gchar * property_name, gchar ** property_value); const gchar * property_name, gchar ** property_value);
static gboolean gst_mpdparser_get_xml_ns_prop_string (xmlNode * a_node,
const gchar * ns_name, const gchar * property_name,
gchar ** property_value);
static gboolean gst_mpdparser_get_xml_prop_string_vector_type (xmlNode * a_node, static gboolean gst_mpdparser_get_xml_prop_string_vector_type (xmlNode * a_node,
const gchar * property_name, gchar *** property_value); const gchar * property_name, gchar *** property_value);
static gboolean gst_mpdparser_get_xml_prop_signed_integer (xmlNode * a_node, static gboolean gst_mpdparser_get_xml_prop_signed_integer (xmlNode * a_node,
@ -257,6 +260,25 @@ gst_mpdparser_get_xml_prop_string (xmlNode * a_node,
return exists; return exists;
} }
static gboolean
gst_mpdparser_get_xml_ns_prop_string (xmlNode * a_node,
const gchar * ns_name, const gchar * property_name, gchar ** property_value)
{
xmlChar *prop_string;
gboolean exists = FALSE;
prop_string =
xmlGetNsProp (a_node, (const xmlChar *) property_name,
(const xmlChar *) ns_name);
if (prop_string) {
*property_value = (gchar *) prop_string;
exists = TRUE;
GST_LOG (" - %s:%s: %s", ns_name, property_name, prop_string);
}
return exists;
}
static gboolean static gboolean
gst_mpdparser_get_xml_prop_string_vector_type (xmlNode * a_node, gst_mpdparser_get_xml_prop_string_vector_type (xmlNode * a_node,
const gchar * property_name, gchar *** property_value) const gchar * property_name, gchar *** property_value)
@ -1427,6 +1449,7 @@ gst_mpdparser_parse_segment_list_node (GstSegmentListNode ** pointer,
{ {
xmlNode *cur_node; xmlNode *cur_node;
GstSegmentListNode *new_segment_list; GstSegmentListNode *new_segment_list;
gchar *actuate;
gst_mpdparser_free_segment_list_node (*pointer); gst_mpdparser_free_segment_list_node (*pointer);
*pointer = new_segment_list = g_slice_new0 (GstSegmentListNode); *pointer = new_segment_list = g_slice_new0 (GstSegmentListNode);
@ -1444,6 +1467,16 @@ gst_mpdparser_parse_segment_list_node (GstSegmentListNode ** pointer,
} }
} }
new_segment_list->actuate = GST_XLINK_ACTUATE_ON_REQUEST;
if (gst_mpdparser_get_xml_ns_prop_string (a_node,
"http://www.w3.org/1999/xlink", "href", &new_segment_list->xlink_href)
&& gst_mpdparser_get_xml_ns_prop_string (a_node,
"http://www.w3.org/1999/xlink", "actuate", &actuate)) {
if (strcmp (actuate, "onLoad") == 0)
new_segment_list->actuate = GST_XLINK_ACTUATE_ON_LOAD;
xmlFree (actuate);
}
GST_LOG ("extension of SegmentList node:"); GST_LOG ("extension of SegmentList node:");
gst_mpdparser_parse_mult_seg_base_type_ext gst_mpdparser_parse_mult_seg_base_type_ext
(&new_segment_list->MultSegBaseType, a_node, (&new_segment_list->MultSegBaseType, a_node,
@ -1574,11 +1607,23 @@ gst_mpdparser_parse_adaptation_set_node (GList ** list, xmlNode * a_node,
{ {
xmlNode *cur_node; xmlNode *cur_node;
GstAdaptationSetNode *new_adap_set; GstAdaptationSetNode *new_adap_set;
gchar *actuate;
new_adap_set = g_slice_new0 (GstAdaptationSetNode); new_adap_set = g_slice_new0 (GstAdaptationSetNode);
*list = g_list_append (*list, new_adap_set); *list = g_list_append (*list, new_adap_set);
GST_LOG ("attributes of AdaptationSet node:"); GST_LOG ("attributes of AdaptationSet node:");
new_adap_set->actuate = GST_XLINK_ACTUATE_ON_REQUEST;
if (gst_mpdparser_get_xml_ns_prop_string (a_node,
"http://www.w3.org/1999/xlink", "href", &new_adap_set->xlink_href)
&& gst_mpdparser_get_xml_ns_prop_string (a_node,
"http://www.w3.org/1999/xlink", "actuate", &actuate)) {
if (strcmp (actuate, "onLoad") == 0)
new_adap_set->actuate = GST_XLINK_ACTUATE_ON_LOAD;
xmlFree (actuate);
}
gst_mpdparser_get_xml_prop_unsigned_integer (a_node, "id", 0, gst_mpdparser_get_xml_prop_unsigned_integer (a_node, "id", 0,
&new_adap_set->id); &new_adap_set->id);
gst_mpdparser_get_xml_prop_unsigned_integer (a_node, "group", 0, gst_mpdparser_get_xml_prop_unsigned_integer (a_node, "group", 0,
@ -1726,11 +1771,23 @@ gst_mpdparser_parse_period_node (GList ** list, xmlNode * a_node)
{ {
xmlNode *cur_node; xmlNode *cur_node;
GstPeriodNode *new_period; GstPeriodNode *new_period;
gchar *actuate;
new_period = g_slice_new0 (GstPeriodNode); new_period = g_slice_new0 (GstPeriodNode);
*list = g_list_append (*list, new_period); *list = g_list_append (*list, new_period);
GST_LOG ("attributes of Period node:"); GST_LOG ("attributes of Period node:");
new_period->actuate = GST_XLINK_ACTUATE_ON_REQUEST;
if (gst_mpdparser_get_xml_ns_prop_string (a_node,
"http://www.w3.org/1999/xlink", "href", &new_period->xlink_href)
&& gst_mpdparser_get_xml_ns_prop_string (a_node,
"http://www.w3.org/1999/xlink", "actuate", &actuate)) {
if (strcmp (actuate, "onLoad") == 0)
new_period->actuate = GST_XLINK_ACTUATE_ON_LOAD;
xmlFree (actuate);
}
gst_mpdparser_get_xml_prop_string (a_node, "id", &new_period->id); gst_mpdparser_get_xml_prop_string (a_node, "id", &new_period->id);
gst_mpdparser_get_xml_prop_duration (a_node, "start", -1, &new_period->start); gst_mpdparser_get_xml_prop_duration (a_node, "start", -1, &new_period->start);
gst_mpdparser_get_xml_prop_duration (a_node, "duration", -1, gst_mpdparser_get_xml_prop_duration (a_node, "duration", -1,
@ -2230,6 +2287,8 @@ gst_mpdparser_free_period_node (GstPeriodNode * period_node)
(GDestroyNotify) gst_mpdparser_free_subset_node); (GDestroyNotify) gst_mpdparser_free_subset_node);
g_list_free_full (period_node->BaseURLs, g_list_free_full (period_node->BaseURLs,
(GDestroyNotify) gst_mpdparser_free_base_url_node); (GDestroyNotify) gst_mpdparser_free_base_url_node);
if (period_node->xlink_href)
xmlFree (period_node->xlink_href);
g_slice_free (GstPeriodNode, period_node); g_slice_free (GstPeriodNode, period_node);
} }
} }
@ -2329,6 +2388,8 @@ gst_mpdparser_free_adaptation_set_node (GstAdaptationSetNode *
(GDestroyNotify) gst_mpdparser_free_representation_node); (GDestroyNotify) gst_mpdparser_free_representation_node);
g_list_free_full (adaptation_set_node->ContentComponents, g_list_free_full (adaptation_set_node->ContentComponents,
(GDestroyNotify) gst_mpdparser_free_content_component_node); (GDestroyNotify) gst_mpdparser_free_content_component_node);
if (adaptation_set_node->xlink_href)
xmlFree (adaptation_set_node->xlink_href);
g_slice_free (GstAdaptationSetNode, adaptation_set_node); g_slice_free (GstAdaptationSetNode, adaptation_set_node);
} }
} }
@ -2444,6 +2505,8 @@ gst_mpdparser_free_segment_list_node (GstSegmentListNode * segment_list_node)
/* MultipleSegmentBaseType extension */ /* MultipleSegmentBaseType extension */
gst_mpdparser_free_mult_seg_base_type_ext gst_mpdparser_free_mult_seg_base_type_ext
(segment_list_node->MultSegBaseType); (segment_list_node->MultSegBaseType);
if (segment_list_node->xlink_href)
xmlFree (segment_list_node->xlink_href);
g_slice_free (GstSegmentListNode, segment_list_node); g_slice_free (GstSegmentListNode, segment_list_node);
} }
} }

View file

@ -91,6 +91,12 @@ typedef enum
GST_SAP_TYPE_6 GST_SAP_TYPE_6
} GstSAPType; } GstSAPType;
typedef enum
{
GST_XLINK_ACTUATE_ON_REQUEST,
GST_XLINK_ACTUATE_ON_LOAD
} GstXLinkActuate;
typedef enum typedef enum
{ {
GST_MPD_UTCTIMING_TYPE_UNKNOWN = 0x00, GST_MPD_UTCTIMING_TYPE_UNKNOWN = 0x00,
@ -183,6 +189,9 @@ struct _GstSegmentListNode
GstMultSegmentBaseType *MultSegBaseType; GstMultSegmentBaseType *MultSegBaseType;
/* list of SegmentURL nodes */ /* list of SegmentURL nodes */
GList *SegmentURL; GList *SegmentURL;
gchar *xlink_href;
GstXLinkActuate actuate;
}; };
struct _GstSegmentTemplateNode struct _GstSegmentTemplateNode
@ -322,6 +331,9 @@ struct _GstAdaptationSetNode
GList *Representations; GList *Representations;
/* list of ContentComponent nodes */ /* list of ContentComponent nodes */
GList *ContentComponents; GList *ContentComponents;
gchar *xlink_href;
GstXLinkActuate actuate;
}; };
struct _GstSubsetNode struct _GstSubsetNode
@ -348,6 +360,9 @@ struct _GstPeriodNode
GList *Subsets; GList *Subsets;
/* list of BaseURL nodes */ /* list of BaseURL nodes */
GList *BaseURLs; GList *BaseURLs;
gchar *xlink_href;
GstXLinkActuate actuate;
}; };
struct _GstProgramInformationNode struct _GstProgramInformationNode