gst/mpegdemux/gstmpegdemux.c: Make sure the mpegpsdemux element creates valid newsegm...

Original commit message from CVS:
* gst/mpegdemux/gstmpegdemux.c: (gst_flups_demux_send_data):
Make sure the mpegpsdemux element creates valid newsegment events.
Fixes #556428

diff --git a/ChangeLog b/ChangeLog
index 6cefd99df6ef2ffada92a3fd305f47fad4a9ce79..ca84492dfc065b43d3961ce2936ed0f54ff3d2b5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-10-16  Edward Hervey  <edward.hervey@collabora.co.uk>
+
+       * gst/mpegdemux/gstmpegdemux.c: (gst_flups_demux_send_data):
+       Make sure the mpegpsdemux element creates valid newsegment events.
+       Fixes #556428
+
 2008-10-16  Zaheer Abbas Merali  <zaheerabbas at merali dot org>
 
        patch by: Sebastian Pölsterl

diff --git a/gst/mpegdemux/gstmpegdemux.c b/gst/mpegdemux/gstmpegdemux.c
index d0926f7084e0fc2420a39058561c9f5695adce78..2b8168aef09b95b86500c6c272799ef9398d868f 100644 (file)
--- a/gst/mpegdemux/gstmpegdemux.c
+++ b/gst/mpegdemux/gstmpegdemux.c
@@ -453,12 +453,18 @@ gst_flups_demux_send_data (GstFluPSDemux * demux, GstFluPSStream * stream,
     gint64 time, start, stop;
     GstEvent *newsegment;
 
-    start = demux->base_time + demux->src_segment.start;
+    if (GST_CLOCK_TIME_IS_VALID (demux->base_time) &&
+        GST_CLOCK_TIME_IS_VALID (demux->src_segment.start))
+      start = demux->base_time + demux->src_segment.start;
+    else
+      start = 0;
+
     if (timestamp != GST_CLOCK_TIME_NONE &&
         GST_CLOCK_DIFF (start, timestamp) > GST_SECOND)
       start = timestamp;
 
-    if (demux->src_segment.stop != -1)
+    if (GST_CLOCK_TIME_IS_VALID (demux->src_segment.stop) &&
+        GST_CLOCK_TIME_IS_VALID (demux->base_time))
       stop = demux->base_time + demux->src_segment.stop;
     else
       stop = -1;