mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-04 14:38:48 +00:00
Code Issues 1 Projects Releases Wiki Activity

tests: dashdemux: corrected return type for duration_to_ms function

Browse source 
The duration_to_ms function converts a time specified by year, month, day,
hour, minute, second, millisecond to a millisecond value. Because all the
arguments are positive numbers, the result must also be positive.

This patch changes the returned value from a gint64 to a guint64 type.
This commit is contained in:
Florin Apostol 2015-06-15 16:59:33 +01:00 committed by Sebastian Dröge
parent 4b40c41035
commit d02f9d30af
1 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
tests/check/elements/dash_mpd.c
View file

@ -32,15 +32,15 @@ GST_DEBUG_CATEGORY (gst_dash_demux_debug);
* This function must use the same conversion algorithm implemented in * This function must use the same conversion algorithm implemented in
* gst_mpdparser_get_xml_prop_duration from gstmpdparser.c file. * gst_mpdparser_get_xml_prop_duration from gstmpdparser.c file.
*/ */
static gint64 static guint64
duration_to_ms (guint year, guint month, guint day, guint hour, guint minute, duration_to_ms (guint year, guint month, guint day, guint hour, guint minute,
guint second, guint millisecond) guint second, guint millisecond)
{ {
gint64 days = (gint64) year * 365 + month * 30 + day; guint64 days = (guint64) year * 365 + (guint64) month * 30 + day;
gint64 hours = days * 24 + hour; guint64 hours = days * 24 + hour;
gint64 minutes = hours * 60 + minute; guint64 minutes = hours * 60 + minute;
gint64 seconds = minutes * 60 + second; guint64 seconds = minutes * 60 + second;
gint64 ms = seconds * 1000 + millisecond; guint64 ms = seconds * 1000 + millisecond;
return ms; return ms;
} }
@ -130,25 +130,25 @@ GST_START_TEST (dash_mpdparser_mpd)
assert_equals_int (gst_date_time_get_second (availabilityEndTime), 50); assert_equals_int (gst_date_time_get_second (availabilityEndTime), 50);
assert_equals_int64 (mpdclient->mpd_node->mediaPresentationDuration, assert_equals_int64 (mpdclient->mpd_node->mediaPresentationDuration,
duration_to_ms (0, 1, 2, 12, 10, 20, 500)); (gint64) duration_to_ms (0, 1, 2, 12, 10, 20, 500));
assert_equals_int64 (mpdclient->mpd_node->minimumUpdatePeriod, assert_equals_int64 (mpdclient->mpd_node->minimumUpdatePeriod,
duration_to_ms (0, 1, 2, 12, 10, 20, 500)); (gint64) duration_to_ms (0, 1, 2, 12, 10, 20, 500));
assert_equals_int64 (mpdclient->mpd_node->minBufferTime, assert_equals_int64 (mpdclient->mpd_node->minBufferTime,
duration_to_ms (0, 1, 2, 12, 10, 20, 500)); (gint64) duration_to_ms (0, 1, 2, 12, 10, 20, 500));
assert_equals_int64 (mpdclient->mpd_node->timeShiftBufferDepth, assert_equals_int64 (mpdclient->mpd_node->timeShiftBufferDepth,
duration_to_ms (0, 1, 2, 12, 10, 20, 500)); (gint64) duration_to_ms (0, 1, 2, 12, 10, 20, 500));
assert_equals_int64 (mpdclient->mpd_node->suggestedPresentationDelay, assert_equals_int64 (mpdclient->mpd_node->suggestedPresentationDelay,
duration_to_ms (0, 1, 2, 12, 10, 20, 500)); (gint64) duration_to_ms (0, 1, 2, 12, 10, 20, 500));
assert_equals_int64 (mpdclient->mpd_node->maxSegmentDuration, assert_equals_int64 (mpdclient->mpd_node->maxSegmentDuration,
duration_to_ms (0, 1, 2, 12, 10, 20, 500)); (gint64) duration_to_ms (0, 1, 2, 12, 10, 20, 500));
assert_equals_int64 (mpdclient->mpd_node->maxSubsegmentDuration, assert_equals_int64 (mpdclient->mpd_node->maxSubsegmentDuration,
duration_to_ms (0, 1, 2, 12, 10, 20, 500)); (gint64) duration_to_ms (0, 1, 2, 12, 10, 20, 500));
gst_mpd_client_free (mpdclient); gst_mpd_client_free (mpdclient);
} }
@ -299,9 +299,9 @@ GST_START_TEST (dash_mpdparser_metrics_range)
assert_equals_pointer (metricsNode->metrics, NULL); assert_equals_pointer (metricsNode->metrics, NULL);
metricsRangeNode = (GstMetricsRangeNode *) metricsNode->MetricsRanges->data; metricsRangeNode = (GstMetricsRangeNode *) metricsNode->MetricsRanges->data;
assert_equals_int64 (metricsRangeNode->starttime, assert_equals_int64 (metricsRangeNode->starttime,
duration_to_ms (0, 1, 2, 12, 10, 20, 500)); (gint64) duration_to_ms (0, 1, 2, 12, 10, 20, 500));
assert_equals_int64 (metricsRangeNode->duration, assert_equals_int64 (metricsRangeNode->duration,
duration_to_ms (0, 1, 2, 12, 10, 20, 123)); (gint64) duration_to_ms (0, 1, 2, 12, 10, 20, 123));
gst_mpd_client_free (mpdclient); gst_mpd_client_free (mpdclient);
} }