From: Stefan Sauer <ensonic@users.sf.net>
Date: Tue, 15 May 2012 13:46:28 +0000 (+0200)
Subject: hls: use gst api for timestamps instead of the (wrong) api from a too new glib
X-Git-Tag: 1.19.3~507^2~15540
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5b39799cf0e782e5a1da023aed6d5ad09482acd6;p=platform%2Fupstream%2Fgstreamer.git

hls: use gst api for timestamps instead of the (wrong) api from a too new glib

Conflicts:

	gst/hls/gstfragment.c
---

diff --git a/gst/hls/gstfragment.c b/gst/hls/gstfragment.c
index e21c14010b..71c3e2b075 100644
--- a/gst/hls/gstfragment.c
+++ b/gst/hls/gstfragment.c
@@ -159,7 +159,7 @@ gst_fragment_init (GstFragment * fragment)
 
   g_mutex_init (&fragment->priv->lock);
   priv->buffer = NULL;
-  fragment->download_start_time = g_get_real_time ();
+  fragment->download_start_time = gst_util_get_timestamp ();
   fragment->start_time = 0;
   fragment->stop_time = 0;
   fragment->index = 0;
diff --git a/gst/hls/gsturidownloader.c b/gst/hls/gsturidownloader.c
index bd59075c05..68eefad9bf 100644
--- a/gst/hls/gsturidownloader.c
+++ b/gst/hls/gsturidownloader.c
@@ -163,7 +163,8 @@ gst_uri_downloader_sink_event (GstPad * pad, GstObject * parent,
       if (downloader->priv->download != NULL) {
         /* signal we have fetched the URI */
         downloader->priv->download->completed = TRUE;
-        downloader->priv->download->download_stop_time = g_get_real_time ();
+        downloader->priv->download->download_stop_time =
+            gst_util_get_timestamp ();
         GST_OBJECT_UNLOCK (downloader);
         GST_DEBUG_OBJECT (downloader, "Signaling chain funtion");
         g_cond_signal (&downloader->priv->cond);