mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-17 11:45:25 +00:00
Code Issues 1 Projects Releases Wiki Activity

dashdemux: fix error calculating large presentationTimeOffset values

Browse source 
If the presentationTimeOffset attribute of a DASH manifest contains
a value that is larger than 2^32, gstmpdparser incorrectly calculates
the stream's presentation time offset. This is due to two bugs:

1: Using gst_mpdparser_get_xml_prop_unsigned_integer rather than
   gst_mpdparser_get_xml_prop_unsigned_integer_64 to parse the
   attribute
2: gst_mpd_client_setup_representation multiplying the value by
   GST_SECOND and then dividing by timescale

https://bugzilla.gnome.org/show_bug.cgi?id=750804
This commit is contained in:
Alex Ashley 2015-06-11 17:25:49 +01:00 committed by Sebastian Dröge
parent 0c647ec8a7
commit 5beeccdba2
2 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
ext/dash/gstmpdparser.c
View file

@ -1162,6 +1162,7 @@ gst_mpdparser_parse_seg_base_type_ext (GstSegmentBaseType ** pointer,
xmlNode *cur_node; xmlNode *cur_node;
GstSegmentBaseType *seg_base_type; GstSegmentBaseType *seg_base_type;
guint intval; guint intval;
guint64 int64val;
gboolean boolval; gboolean boolval;
GstRange *rangeval; GstRange *rangeval;
@ -1194,9 +1195,9 @@ gst_mpdparser_parse_seg_base_type_ext (GstSegmentBaseType ** pointer,
&intval)) { &intval)) {
seg_base_type->timescale = intval; seg_base_type->timescale = intval;
} }
if (gst_mpdparser_get_xml_prop_unsigned_integer (a_node, if (gst_mpdparser_get_xml_prop_unsigned_integer_64 (a_node,
"presentationTimeOffset", 0, &intval)) { "presentationTimeOffset", 0, &int64val)) {
seg_base_type->presentationTimeOffset = intval; seg_base_type->presentationTimeOffset = int64val;
} }
if (gst_mpdparser_get_xml_prop_range (a_node, "indexRange", &rangeval)) { if (gst_mpdparser_get_xml_prop_range (a_node, "indexRange", &rangeval)) {
if (seg_base_type->indexRange) { if (seg_base_type->indexRange) {
@ -3283,13 +3284,17 @@ gst_mpd_client_setup_representation (GstMpdClient * client,
GST_LOG ("Building media segment list using this template: %s", GST_LOG ("Building media segment list using this template: %s",
stream->cur_seg_template->media); stream->cur_seg_template->media);
stream->presentationTimeOffset =
mult_seg->SegBaseType->presentationTimeOffset * GST_SECOND;
/* Avoid dividing by zero */
if (mult_seg->SegBaseType->timescale)
stream->presentationTimeOffset /= mult_seg->SegBaseType->timescale;
/* Avoid dividing by zero and avoid overflows */
if (mult_seg->SegBaseType->timescale) {
stream->presentationTimeOffset =
gst_util_uint64_scale (mult_seg->
SegBaseType->presentationTimeOffset, GST_SECOND,
mult_seg->SegBaseType->timescale);
} else {
stream->presentationTimeOffset =
mult_seg->SegBaseType->presentationTimeOffset * GST_SECOND;
}
GST_LOG ("Setting stream's presentation time offset to %" GST_TIME_FORMAT, GST_LOG ("Setting stream's presentation time offset to %" GST_TIME_FORMAT,
GST_TIME_ARGS (stream->presentationTimeOffset)); GST_TIME_ARGS (stream->presentationTimeOffset));

2
ext/dash/gstmpdparser.h
View file

@ -143,7 +143,7 @@ struct _GstURLType
struct _GstSegmentBaseType struct _GstSegmentBaseType
{ {
guint timescale; guint timescale;
guint presentationTimeOffset; guint64 presentationTimeOffset;
GstRange *indexRange; GstRange *indexRange;
gboolean indexRangeExact; gboolean indexRangeExact;
/* Initialization node */ /* Initialization node */