mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-30 04:00:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

dashdemux: maxFrameRate & minFrameRate should be in RepresentationBase.

Browse source 
According to the spec, they can be in AdaptationSet, Representation and SubRepresentation.
So They should be in RepresentationBase.

https://bugzilla.gnome.org/show_bug.cgi?id=758515
This commit is contained in:
suhwang.kim 2015-12-08 09:23:22 +09:00 committed by Sebastian Dröge
parent 44c5985edd
commit 6d8dd482c4
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ext/dash/gstmpdparser.c
View file

@ -1736,6 +1736,10 @@ gst_mpdparser_parse_representation_base_type (GstRepresentationBaseType **
gst_mpdparser_get_xml_prop_ratio (a_node, "sar", &representation_base->sar); gst_mpdparser_get_xml_prop_ratio (a_node, "sar", &representation_base->sar);
gst_mpdparser_get_xml_prop_framerate (a_node, "frameRate", gst_mpdparser_get_xml_prop_framerate (a_node, "frameRate",
&representation_base->frameRate); &representation_base->frameRate);
gst_mpdparser_get_xml_prop_framerate (a_node, "minFrameRate",
&representation_base->minFrameRate);
gst_mpdparser_get_xml_prop_framerate (a_node, "maxFrameRate",
&representation_base->maxFrameRate);
gst_mpdparser_get_xml_prop_string (a_node, "audioSamplingRate", gst_mpdparser_get_xml_prop_string (a_node, "audioSamplingRate",
&representation_base->audioSamplingRate); &representation_base->audioSamplingRate);
gst_mpdparser_get_xml_prop_string (a_node, "mimeType", gst_mpdparser_get_xml_prop_string (a_node, "mimeType",
@ -1877,10 +1881,6 @@ gst_mpdparser_parse_adaptation_set_node (GList ** list, xmlNode * a_node,
&new_adap_set->minHeight); &new_adap_set->minHeight);
gst_mpdparser_get_xml_prop_unsigned_integer (a_node, "maxHeight", 0, gst_mpdparser_get_xml_prop_unsigned_integer (a_node, "maxHeight", 0,
&new_adap_set->maxHeight); &new_adap_set->maxHeight);
gst_mpdparser_get_xml_prop_framerate (a_node, "minFrameRate",
&new_adap_set->minFrameRate);
gst_mpdparser_get_xml_prop_framerate (a_node, "maxFrameRate",
&new_adap_set->maxFrameRate);
gst_mpdparser_get_xml_prop_cond_uint (a_node, "segmentAlignment", gst_mpdparser_get_xml_prop_cond_uint (a_node, "segmentAlignment",
&new_adap_set->segmentAlignment); &new_adap_set->segmentAlignment);
gst_mpdparser_get_xml_prop_boolean (a_node, "bitstreamSwitching", gst_mpdparser_get_xml_prop_boolean (a_node, "bitstreamSwitching",
@ -2743,6 +2743,8 @@ gst_mpdparser_free_representation_base_type (GstRepresentationBaseType *
xmlFree (representation_base->profiles); xmlFree (representation_base->profiles);
g_slice_free (GstRatio, representation_base->sar); g_slice_free (GstRatio, representation_base->sar);
g_slice_free (GstFrameRate, representation_base->frameRate); g_slice_free (GstFrameRate, representation_base->frameRate);
g_slice_free (GstFrameRate, representation_base->minFrameRate);
g_slice_free (GstFrameRate, representation_base->maxFrameRate);
if (representation_base->audioSamplingRate) if (representation_base->audioSamplingRate)
xmlFree (representation_base->audioSamplingRate); xmlFree (representation_base->audioSamplingRate);
if (representation_base->mimeType) if (representation_base->mimeType)
@ -2773,8 +2775,6 @@ gst_mpdparser_free_adaptation_set_node (GstAdaptationSetNode *
if (adaptation_set_node->contentType) if (adaptation_set_node->contentType)
xmlFree (adaptation_set_node->contentType); xmlFree (adaptation_set_node->contentType);
g_slice_free (GstRatio, adaptation_set_node->par); g_slice_free (GstRatio, adaptation_set_node->par);
g_slice_free (GstFrameRate, adaptation_set_node->minFrameRate);
g_slice_free (GstFrameRate, adaptation_set_node->maxFrameRate);
g_slice_free (GstConditionalUintType, g_slice_free (GstConditionalUintType,
adaptation_set_node->segmentAlignment); adaptation_set_node->segmentAlignment);
g_slice_free (GstConditionalUintType, g_slice_free (GstConditionalUintType,

4
ext/dash/gstmpdparser.h
View file

@ -221,6 +221,8 @@ struct _GstRepresentationBaseType
guint width; guint width;
guint height; guint height;
GstRatio *sar; GstRatio *sar;
GstFrameRate *minFrameRate;
GstFrameRate *maxFrameRate;
GstFrameRate *frameRate; GstFrameRate *frameRate;
gchar *audioSamplingRate; gchar *audioSamplingRate;
gchar *mimeType; gchar *mimeType;
@ -306,8 +308,6 @@ struct _GstAdaptationSetNode
guint maxWidth; guint maxWidth;
guint minHeight; guint minHeight;
guint maxHeight; guint maxHeight;
GstFrameRate *minFrameRate;
GstFrameRate *maxFrameRate;
GstConditionalUintType *segmentAlignment; GstConditionalUintType *segmentAlignment;
GstConditionalUintType *subsegmentAlignment; GstConditionalUintType *subsegmentAlignment;
GstSAPType subsegmentStartsWithSAP; GstSAPType subsegmentStartsWithSAP;