[gst-cvs] rbultje gst-plugins: gst-plugins/gst/avi/

[Ronald B. <rb...@us...>]

CVS Root:       /cvsroot/gstreamer
Module:         gst-plugins
Changes by:     rbultje
Date:           Thu Oct 09 2003  15:12:05 PDT

Log message:
Remove can_seek () because eventmasks was removed from sink pads - grrr

Modified files:
    gst/avi         : gstavimux.c

Links:
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/gst/avi/gstavimux.c.diff?r1=1.48&r2=1.49

====Begin Diffs====
Index: gstavimux.c
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/gst/avi/gstavimux.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- gstavimux.c	8 Oct 2003 16:07:53 -0000	1.48
+++ gstavimux.c	9 Oct 2003 22:11:53 -0000	1.49
@@ -308,6 +308,7 @@
   memset(&(avimux->auds),0,sizeof(gst_riff_strf_auds));
   avimux->vids_hdr.type = GST_MAKE_FOURCC('v','i','d','s');
   avimux->vids_hdr.rate = 1000000;
+  avimux->avi_hdr.max_bps = 10000000;
   avimux->auds_hdr.type = GST_MAKE_FOURCC('a','u','d','s');
   avimux->vids_hdr.quality = 0xFFFFFFFF;
   avimux->auds_hdr.quality = 0xFFFFFFFF;
@@ -934,27 +935,13 @@
   avimux->avi_hdr.flags |= GST_RIFF_AVIH_HASINDEX;
 }
 
-static gboolean
-gst_avimux_can_seek(GstAviMux *avimux)
-{
-  const GstEventMask *masks = gst_pad_get_event_masks(GST_PAD_PEER(avimux->srcpad));
-
-  while (masks->type != 0) {
-    if (masks->type == GST_EVENT_SEEK) {
-      return TRUE;
-    }
-  }
-
-  return FALSE;
-}
-
 static void
 gst_avimux_bigfile(GstAviMux *avimux, gboolean last)
 {
   GstBuffer *header;
   GstEvent *event;
     
-  if (avimux->is_bigfile && gst_avimux_can_seek(avimux))
+  if (avimux->is_bigfile)
   {
     /* sarch back */
     event = gst_event_new_seek (GST_FORMAT_BYTES | 
@@ -1076,16 +1063,14 @@
   }
 
   /* seek and rewrite the header */
-  if (gst_avimux_can_seek(avimux)) {
-    header = gst_avimux_riff_get_avi_header(avimux);
-    event = gst_event_new_seek (GST_FORMAT_BYTES | 
-				GST_SEEK_METHOD_SET, 0);
-    gst_pad_push(avimux->srcpad, GST_DATA(event));
-    gst_pad_push(avimux->srcpad, GST_DATA (header));
-    event = gst_event_new_seek (GST_FORMAT_BYTES |
-				GST_SEEK_METHOD_SET, avimux->total_data);
-    gst_pad_push(avimux->srcpad, GST_DATA(event));
-  }
+  header = gst_avimux_riff_get_avi_header(avimux);
+  event = gst_event_new_seek (GST_FORMAT_BYTES | 
+			      GST_SEEK_METHOD_SET, 0);
+  gst_pad_push(avimux->srcpad, GST_DATA(event));
+  gst_pad_push(avimux->srcpad, GST_DATA (header));
+  event = gst_event_new_seek (GST_FORMAT_BYTES |
+			      GST_SEEK_METHOD_SET, avimux->total_data);
+  gst_pad_push(avimux->srcpad, GST_DATA(event));
 
   avimux->write_header = TRUE;
 }