wtay gstreamer: gstreamer/ gstreamer/libs/gst/base/

CVS Root:       /cvs/gstreamer
Module:         gstreamer
Changes by:     wtay
Date:           Mon Nov 24 2008  15:28:09 UTC

Log message:
* libs/gst/base/gstbasetransform.c:
(gst_base_transform_acceptcaps):
Revert quick accepcaps attempt, it's not fully equivalent to the old
behaviour and thus causes regressions.

Modified files:
    .               : ChangeLog
    libs/gst/base   : gstbasetransform.c

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.4175&r2=1.4176
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/libs/gst/base/gstbasetransform.c.diff?r1=1.131&r2=1.132

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v
retrieving revision 1.4175
retrieving revision 1.4176
diff -u -d -r1.4175 -r1.4176
--- ChangeLog	24 Nov 2008 11:56:41 -0000	1.4175
+++ ChangeLog	24 Nov 2008 15:27:53 -0000	1.4176
@@ -1,3 +1,10 @@
+2008-11-24  Wim Taymans  <[email protected]>
+
+	* libs/gst/base/gstbasetransform.c:
+	(gst_base_transform_acceptcaps):
+	Revert quick accepcaps attempt, it's not fully equivalent to the old
+	behaviour and thus causes regressions.
 2008-11-24  Edward Hervey  <[email protected]>
 
 	* plugins/elements/gstfilesrc.c: (gst_file_src_uri_set_uri):
Index: gstbasetransform.c
RCS file: /cvs/gstreamer/gstreamer/libs/gst/base/gstbasetransform.c,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -d -r1.131 -r1.132
--- gstbasetransform.c	22 Nov 2008 15:09:20 -0000	1.131
+++ gstbasetransform.c	24 Nov 2008 15:27:55 -0000	1.132
@@ -979,9 +979,12 @@
   trans = GST_BASE_TRANSFORM (gst_pad_get_parent (pad));
   otherpad = (pad == trans->srcpad) ? trans->sinkpad : trans->srcpad;
+#if 0
   /* we need fixed caps for the check, fall back to the default implementation
    * if we don't */
-  if (!gst_caps_is_fixed (caps)) {
+  if (!gst_caps_is_fixed (caps))
+#endif
+  {
     GstCaps *allowed, *intersect;
     GST_DEBUG_OBJECT (pad, "non fixed accept caps %" GST_PTR_FORMAT, caps);
@@ -1003,7 +1006,9 @@
     if (!ret)
       goto no_transform_possible;
-  } else {
+  }
+  else {
     GST_DEBUG_OBJECT (pad, "accept caps %" GST_PTR_FORMAT, caps);
     /* find best possible caps for the other pad as a way to see if we can
@@ -1014,6 +1019,7 @@
     GST_DEBUG_OBJECT (pad, "we can transform to %" GST_PTR_FORMAT, othercaps);
   }
 done:
   if (othercaps)

-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/