From: Wim Taymans <wim.taymans@gmail.com>
Date: Tue, 15 May 2007 17:11:09 +0000 (+0000)
Subject: ext/ogg/gstoggdemux.c: Some more chained streaming ogg timestamp fixes.
X-Git-Tag: 1.19.3~511^2~11153
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f8f9935d7406a66307cec18b78f79f4b3687f573;p=platform%2Fupstream%2Fgstreamer.git

ext/ogg/gstoggdemux.c: Some more chained streaming ogg timestamp fixes.

Original commit message from CVS:
* ext/ogg/gstoggdemux.c: (gst_ogg_pad_submit_packet),
(gst_ogg_demux_perform_seek), (gst_ogg_demux_handle_page):
Some more chained streaming ogg timestamp fixes.
---

diff --git a/ChangeLog b/ChangeLog
index 8b7c2cb..55050e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
 2007-05-15  Wim Taymans  <wim@fluendo.com>
 
 	* ext/ogg/gstoggdemux.c: (gst_ogg_pad_submit_packet),
+	(gst_ogg_demux_perform_seek), (gst_ogg_demux_handle_page):
+	Some more chained streaming ogg timestamp fixes.
+
+2007-05-15  Wim Taymans  <wim@fluendo.com>
+
+	* ext/ogg/gstoggdemux.c: (gst_ogg_pad_submit_packet),
 	(gst_ogg_demux_activate_chain), (gst_ogg_demux_perform_seek),
 	(gst_ogg_demux_handle_page):
 	Add some FIXMEs.
diff --git a/ext/ogg/gstoggdemux.c b/ext/ogg/gstoggdemux.c
index 5dfa7a9..a806588 100644
--- a/ext/ogg/gstoggdemux.c
+++ b/ext/ogg/gstoggdemux.c
@@ -2759,19 +2759,12 @@ gst_ogg_demux_handle_page (GstOggDemux * ogg, ogg_page * page)
       current_time = ogg->segment.last_stop;
 
       if (current_chain) {
-        GstClockTime duration;
-
-        /* this was the duration of the previous chain */
-        duration = current_time - current_chain->segment_start;
-        /* the new chain time starts at duration + begin_time */
-        chain_time = duration + current_chain->begin_time;
-
         /* remove existing pads */
         gst_ogg_demux_deactivate_current_chain (ogg);
-      } else {
-        /* non previous chain, start at configured current time */
-        chain_time = current_time;
       }
+      /* time of new chain is current time */
+      chain_time = current_time;
+
       if (ogg->building_chain == NULL) {
         GstOggChain *newchain;