rpms/gstreamer-plugins-good/F-11 autoconvert-fix-caps.patch, NONE, 1.1 gstreamer-plugins-good.spec, 1.99, 1.100

[Bastien Nocera]

Author: hadess

Update of /cvs/pkgs/rpms/gstreamer-plugins-good/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21834

Modified Files:
	gstreamer-plugins-good.spec 
Added Files:
	autoconvert-fix-caps.patch 
Log Message:
* Fri Oct 16 2009 Bastien Nocera <bnocera at redhat.com> 0.10.16-2
- Fix autoconvert caps negotiation


autoconvert-fix-caps.patch:
 gstautoconvert.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE autoconvert-fix-caps.patch ---
>From 76d3a625dad9dc3e655e0272434caf42f787098f Mon Sep 17 00:00:00 2001
From: Jan Schmidt <thaytan at noraisin.net>
Date: Fri, 16 Oct 2009 01:26:10 +0100
Subject: [PATCH] autoconvert: Use gst_pad_peer_accept_caps instead of gst_pad_set_caps.

gst_pad_set_caps on the internal source pad always succeeds, because
caps propagate to the peer with buffers, not immediately. Using
gst_pad_peer_accept_caps properly checks whether the actual
sub-element can accept caps when they change.

https://bugzilla.gnome.org/show_bug.cgi?id=575568
---
 gst/autoconvert/gstautoconvert.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/farsight/autoconvert/gstautoconvert.c b/gst/autoconvert/gstautoconvert.c
index 39b9c78..4675c41 100644
--- a/farsight/autoconvert/gstautoconvert.c
+++ b/farsight/autoconvert/gstautoconvert.c
@@ -692,7 +692,7 @@ gst_auto_convert_sink_setcaps (GstPad * pad, GstCaps * caps)
 
   subelement = gst_auto_convert_get_subelement (autoconvert);
   if (subelement) {
-    if (gst_pad_set_caps (autoconvert->current_internal_srcpad, caps)) {
+    if (gst_pad_peer_accept_caps (autoconvert->current_internal_srcpad, caps)) {
       /* If we can set the new caps on the current element,
        * then we just get out
        */
@@ -777,7 +777,7 @@ gst_auto_convert_sink_setcaps (GstPad * pad, GstCaps * caps)
         internal_sinkpad_quark);
 
     /* Now we check if the element can really accept said caps */
-    if (!gst_pad_set_caps (internal_srcpad, caps)) {
+    if (!gst_pad_peer_accept_caps (internal_srcpad, caps)) {
       GST_DEBUG_OBJECT (autoconvert, "Could not set %s:%s to %" GST_PTR_FORMAT,
           GST_DEBUG_PAD_NAME (internal_srcpad), caps);
       goto next_element;
-- 
1.6.0.4


Index: gstreamer-plugins-good.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-good/F-11/gstreamer-plugins-good.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- gstreamer-plugins-good.spec	7 Oct 2009 10:26:09 -0000	1.99
+++ gstreamer-plugins-good.spec	16 Oct 2009 14:46:53 -0000	1.100
@@ -6,7 +6,7 @@
 
 Name: 		%{gstreamer}-plugins-good
 Version: 	0.10.16
-Release:  	1%{?dist}
+Release:  	2%{?dist}
 Summary: 	GStreamer plug-ins with good code and licensing
 
 Group: 		Applications/Multimedia
@@ -67,6 +67,8 @@ Obsoletes: gstreamer-plugins-pulse < 0.9
 
 # farsight plugins
 Patch0: 0001-Move-farsight-plugins-from-bad-to-good.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=575568#c22
+Patch1: autoconvert-fix-caps.patch
 BuildRequires: automake autoconf libtool
 Provides: gstreamer-plugins-farsight = 0.12.12-1
 Obsoletes: gstreamer-plugins-farsight < 0.12.12
@@ -106,6 +108,7 @@ This is a dummy package to make gstreame
 
 # Farsight plugins
 %patch0 -p1 -b .farsight
+%patch1 -p1 -b .autoconvert-caps
 libtoolize -f
 autoreconf
 
@@ -271,6 +274,9 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gstreamer-%{majorminor}.schemas > /dev/null || :
 
 %changelog
+* Fri Oct 16 2009 Bastien Nocera <bnocera at redhat.com> 0.10.16-2
+- Fix autoconvert caps negotiation
+
 * Wed Oct 07 2009 Bastien Nocera <bnocera at redhat.com> 0.10.16-1
 - Update to 0.10.16