wtay gst-plugins-bad: gst-plugins-bad/ gst-plugins-bad/gst/mpegdemux/

CVS Root:       /cvs/gstreamer
Module:         gst-plugins-bad
Changes by:     wtay
Date:           Mon Dec 29 2008  17:55:32 UTC

Log message:
* gst/mpegdemux/gstmpegdemux.c: (gst_flups_demux_send_data):
* gst/mpegdemux/gstmpegdemux.h:
The position member in the newsegment event corresponds to the
stream_time of the segment start position.

Modified files:
    .               : ChangeLog
    gst/mpegdemux   : gstmpegdemux.c gstmpegdemux.h

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/ChangeLog.diff?r1=1.3841&r2=1.3842
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst/mpegdemux/gstmpegdemux.c.diff?r1=1.8&r2=1.9
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst/mpegdemux/gstmpegdemux.h.diff?r1=1.1&r2=1.2

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-bad/ChangeLog,v
retrieving revision 1.3841
retrieving revision 1.3842
diff -u -d -r1.3841 -r1.3842
--- ChangeLog	29 Dec 2008 17:30:01 -0000	1.3841
+++ ChangeLog	29 Dec 2008 17:55:16 -0000	1.3842
@@ -1,5 +1,12 @@
 2008-12-29  Wim Taymans  <[email protected]>
 
+	* gst/mpegdemux/gstmpegdemux.c: (gst_flups_demux_send_data):
+	* gst/mpegdemux/gstmpegdemux.h:
+	The position member in the newsegment event corresponds to the
+	stream_time of the segment start position.
+
+2008-12-29  Wim Taymans  <[email protected]>
 	Patch by: Robin Stocker <robin at nibor dot org>
 	* gst/mpegdemux/gstmpegdemux.c: (gst_flups_demux_src_query):
Index: gstmpegdemux.c
RCS file: /cvs/gstreamer/gst-plugins-bad/gst/mpegdemux/gstmpegdemux.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- gstmpegdemux.c	29 Dec 2008 17:30:03 -0000	1.8
+++ gstmpegdemux.c	29 Dec 2008 17:55:18 -0000	1.9
@@ -480,7 +480,10 @@
           stop = timestamp;
       }
     }
-    time = start;
+    if (GST_CLOCK_TIME_IS_VALID (demux->base_time) && start > demux->base_time)
+      time = start - demux->base_time;
+    else
+      time = 0;
 #ifdef HAVE_NEWSEG_FULL
     GST_INFO_OBJECT (demux, "sending new segment: rate %g applied_rate %g "
Index: gstmpegdemux.h
RCS file: /cvs/gstreamer/gst-plugins-bad/gst/mpegdemux/gstmpegdemux.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gstmpegdemux.h	2 Sep 2008 12:04:31 -0000	1.1
+++ gstmpegdemux.h	29 Dec 2008 17:55:18 -0000	1.2
@@ -102,9 +102,9 @@
   GstPESFilter   filter;
   gint64         mux_rate;
-  guint64	     first_scr;
-  guint64	     first_dts;
-  guint64	     base_time;
+  guint64        first_scr;
+  guint64        first_dts;
+  guint64        base_time;
   guint64        current_scr;
   guint64        next_scr;
   guint64        bytes_since_scr;

------------------------------------------------------------------------------