[gst-cvs] rbultje gstreamer: gstreamer/gst/autoplug/

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

CVS Root:       /cvsroot/gstreamer
Module:         gstreamer
Changes by:     rbultje
Date:           Sun Aug 17 2003  12:27:51 PDT
Branch:         BRANCH-GSTREAMER-0_6

Log message:
Fix mp3 typefind failures for quite some files. Fixes #94113 mostly.

Modified files:
    gst/autoplug    : gstspideridentity.c

Links:
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/autoplug/gstspideridentity.c.diff?r1=1.29.4.1&r2=1.29.4.2

====Begin Diffs====
Index: gstspideridentity.c
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/gst/autoplug/gstspideridentity.c,v
retrieving revision 1.29.4.1
retrieving revision 1.29.4.2
diff -u -d -r1.29.4.1 -r1.29.4.2
--- gstspideridentity.c	8 Apr 2003 10:04:27 -0000	1.29.4.1
+++ gstspideridentity.c	17 Aug 2003 19:27:39 -0000	1.29.4.2
@@ -417,7 +417,7 @@
   GstCaps *caps;
 
   /* this should possibly be a property */
-  guint bufsizelimit = 4096;
+  guint bufsizelimit = 8192;
   
   /* checks - disable for speed */
   g_return_if_fail (ident != NULL);
@@ -448,21 +448,15 @@
       /* handle DISCONT events, please */
     }
 
-    typefindbuf = buf;
-    getmorebuf = FALSE;
-    /* FIXME merging doesn't work for some reason so 
-     * we'll just typefind with the first element
     if (!typefindbuf){
       typefindbuf = buf;
-      gst_buffer_ref(buf);
     }
     else {
       GstBuffer *oldbuf = typefindbuf;
       typefindbuf = gst_buffer_merge(typefindbuf, buf);
-      gst_buffer_unref(oldbuf);
-      gst_buffer_unref(buf);
+      gst_buffer_unref (oldbuf);
+      gst_buffer_unref (buf);
     }
-    */
   }
   
   if (!typefindbuf){
@@ -485,7 +479,7 @@
       GstTypeFactory *factory = GST_TYPE_FACTORY (factories->data);
       GstTypeFindFunc typefindfunc = (GstTypeFindFunc)factory->typefindfunc;
 
-      if (typefindfunc && (caps = typefindfunc (buf, factory))) {
+      if (typefindfunc && (caps = typefindfunc (typefindbuf, factory))) {
 
 	if (gst_pad_try_set_caps (ident->sink, caps) <= 0) {
           g_warning ("typefind: found type but peer didn't accept it");
@@ -499,8 +493,8 @@
     type_list = g_list_next (type_list);
   }
   gst_element_error(GST_ELEMENT(ident), "Could not find media type", NULL);
-  gst_buffer_unref(buf);
-  buf = GST_BUFFER (gst_event_new (GST_EVENT_EOS));
+  gst_buffer_unref(typefindbuf);
+  typefindbuf = GST_BUFFER (gst_event_new (GST_EVENT_EOS));
 
 end:
 
@@ -509,7 +503,7 @@
                                 (GstElementLoopFunction) GST_DEBUG_FUNCPTR (gst_spider_identity_dumb_loop));
   
   /* push the buffer */
-  gst_spider_identity_chain (ident->sink, buf);
+  gst_spider_identity_chain (ident->sink, typefindbuf);
 
   return;