mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-05-18 00:12:46 +00:00
Merge branch 'essentialproperty-thumbnails' into 'main'
dashdemux2: add support to parse EssentialProperty in representations See merge request gstreamer/gstreamer!3299
This commit is contained in:
commit
28b0047bd9
|
@ -658,6 +658,10 @@ gst_mpdparser_parse_representation_node (GList ** list, xmlNode * a_node,
|
|||
(xmlChar *) "SubRepresentation") == 0) {
|
||||
gst_mpdparser_parse_subrepresentation_node
|
||||
(&new_representation->SubRepresentations, cur_node);
|
||||
} else if (xmlStrcmp (cur_node->name, (xmlChar *) "EssentialProperty") ==
|
||||
0) {
|
||||
gst_mpdparser_parse_descriptor_type
|
||||
(&new_representation->EssentialProperty, cur_node);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -88,6 +88,7 @@ gst_mpd_representation_node_finalize (GObject * object)
|
|||
g_strfreev (self->mediaStreamStructureId);
|
||||
g_list_free_full (self->SubRepresentations,
|
||||
(GDestroyNotify) gst_mpd_sub_representation_node_free);
|
||||
g_list_free (self->EssentialProperty);
|
||||
gst_mpd_segment_base_node_free (self->SegmentBase);
|
||||
gst_mpd_segment_template_node_free (self->SegmentTemplate);
|
||||
gst_mpd_segment_list_node_free (self->SegmentList);
|
||||
|
@ -132,6 +133,8 @@ gst_mpd_representation_get_xml_node (GstMPDNode * node)
|
|||
representation_xml_node);
|
||||
g_list_foreach (self->SubRepresentations,
|
||||
gst_mpd_representation_base_node_get_list_item, representation_xml_node);
|
||||
g_list_foreach (self->EssentialProperty,
|
||||
gst_mpd_node_get_list_item, representation_xml_node);
|
||||
|
||||
gst_mpd_node_add_child_node (GST_MPD_NODE (self->SegmentBase),
|
||||
representation_xml_node);
|
||||
|
@ -182,6 +185,7 @@ gst_mpd_representation_node_init (GstMPDRepresentationNode * self)
|
|||
self->SegmentBase = NULL;
|
||||
self->SegmentTemplate = NULL;
|
||||
self->SegmentList = NULL;
|
||||
self->EssentialProperty = NULL;
|
||||
}
|
||||
|
||||
GstMPDRepresentationNode *
|
||||
|
|
|
@ -53,6 +53,8 @@ struct _GstMPDRepresentationNode2
|
|||
GstMPDSegmentTemplateNode *SegmentTemplate;
|
||||
/* SegmentList node */
|
||||
GstMPDSegmentListNode *SegmentList;
|
||||
/* Essential property node */
|
||||
GList *EssentialProperty;
|
||||
};
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue