gst/matroska/ebml-write.*: Make sure we send a newsegment event in BYTES format befor...

Original commit message from CVS:
* gst/matroska/ebml-write.c: (gst_ebml_write_reset),
(gst_ebml_write_flush_cache), (gst_ebml_write_element_push),
(gst_ebml_write_seek):
* gst/matroska/ebml-write.h:
Make sure we send a newsegment event in BYTES format
before sending buffers (#328531).

diff --git a/ChangeLog b/ChangeLog
index 4159930f375e77885a1f8ea27ecad98e46837d0b..3f6e9b99d1b4da467bb23355472c6bda788b85f9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-02-06  Tim-Philipp Müller  <tim at centricular dot net>
+
+       * gst/matroska/ebml-write.c: (gst_ebml_write_reset),
+       (gst_ebml_write_flush_cache), (gst_ebml_write_element_push),
+       (gst_ebml_write_seek):
+       * gst/matroska/ebml-write.h:
+         Make sure we send a newsegment event in BYTES format
+         before sending buffers (#328531).
+
 2006-02-06  Tim-Philipp Müller  <tim at centricular dot net>
 
        * ext/dv/gstdvdemux.c: (gst_dvdemux_src_query),

diff --git a/gst/matroska/ebml-write.c b/gst/matroska/ebml-write.c
index c25f76a7e3eb5f965443e0fb687dd2b58f0cf9f1..a834f8fc118b66d35d52662a6ebb67e0f1fb7984 100644 (file)
--- a/gst/matroska/ebml-write.c
+++ b/gst/matroska/ebml-write.c
@@ -115,6 +115,7 @@ gst_ebml_write_reset (GstEbmlWrite * ebml)
   ebml->cache_size = 0;
   ebml->last_write_result = GST_FLOW_OK;
   ebml->timestamp = GST_CLOCK_TIME_NONE;
+  ebml->need_newsegment = TRUE;
 }
 
 
@@ -181,8 +182,17 @@ gst_ebml_write_flush_cache (GstEbmlWrite * ebml)
   g_assert (GST_BUFFER_SIZE (ebml->cache) +
       GST_BUFFER_OFFSET (ebml->cache) == ebml->pos);
 
-  if (ebml->last_write_result == GST_FLOW_OK)
+  if (ebml->last_write_result == GST_FLOW_OK) {
+    if (ebml->need_newsegment) {
+      GstEvent *ev;
+
+      g_assert (ebml->handled == 0);
+      ev = gst_event_new_new_segment (FALSE, 1.0, GST_FORMAT_BYTES, 0, -1, 0);
+      if (gst_pad_push_event (ebml->srcpad, ev))
+        ebml->need_newsegment = FALSE;
+    }
     ebml->last_write_result = gst_pad_push (ebml->srcpad, ebml->cache);
+  }
 
   ebml->cache = NULL;
   ebml->cache_size = 0;
@@ -348,8 +358,17 @@ gst_ebml_write_element_push (GstEbmlWrite * ebml, GstBuffer * buf)
     return;
   }
 
-  if (ebml->last_write_result == GST_FLOW_OK)
+  if (ebml->last_write_result == GST_FLOW_OK) {
+    if (ebml->need_newsegment) {
+      GstEvent *ev;
+
+      g_assert (ebml->handled == 0);
+      ev = gst_event_new_new_segment (FALSE, 1.0, GST_FORMAT_BYTES, 0, -1, 0);
+      if (gst_pad_push_event (ebml->srcpad, ev))
+        ebml->need_newsegment = FALSE;
+    }
     ebml->last_write_result = gst_pad_push (ebml->srcpad, buf);
+  }
 }
 
 
@@ -363,8 +382,7 @@ gst_ebml_write_element_push (GstEbmlWrite * ebml, GstBuffer * buf)
 void
 gst_ebml_write_seek (GstEbmlWrite * ebml, guint64 pos)
 {
-  GstEvent *seek;
-  GstPad *peer_pad;
+  GstEvent *event;
 
   /* Cache seeking. A bit dangerous, we assume the client writer
    * knows what he's doing... */
@@ -384,14 +402,12 @@ gst_ebml_write_seek (GstEbmlWrite * ebml, guint64 pos)
     }
   }
 
-  seek = gst_event_new_new_segment (FALSE, 1.0, GST_FORMAT_BYTES, pos, -1, 0);
-  peer_pad = GST_PAD_PEER (ebml->srcpad);
-  if (peer_pad) {
-    gst_pad_send_event (peer_pad, seek);
+  event = gst_event_new_new_segment (FALSE, 1.0, GST_FORMAT_BYTES, pos, -1, 0);
+  if (gst_pad_push_event (ebml->srcpad, event)) {
+    GST_DEBUG ("Seek'd to offset %" G_GUINT64_FORMAT, pos);
   } else {
-    GST_WARNING_OBJECT (ebml, "Can not seek: no peer pad");
+    GST_WARNING ("Seek to offset %" G_GUINT64_FORMAT " failed", pos);
   }
-
   ebml->pos = pos;
 }
 

diff --git a/gst/matroska/ebml-write.h b/gst/matroska/ebml-write.h
index a0739c0b83a7578f1966529772d13d252cc42201..98286eba05d01dad67ebe53627d994a73887a4e2 100644 (file)
--- a/gst/matroska/ebml-write.h
+++ b/gst/matroska/ebml-write.h
@@ -54,6 +54,8 @@ typedef struct _GstEbmlWrite {
 
   GstFlowReturn last_write_result;
 
+  gboolean need_newsegment;
+
   /*< private >*/
   gpointer _gst_reserved[GST_PADDING];
 } GstEbmlWrite;