CVS Root: /cvs/gstreamer
Module: gst-plugins-good
Changes by: wtay
Date: Tue Nov 25 2008 16:26:31 UTC
Log message:
* gst/autodetect/gstautoaudiosink.c: (gst_auto_audio_sink_detect):
* gst/autodetect/gstautoaudiosrc.c: (gst_auto_audio_src_detect):
* gst/autodetect/gstautovideosink.c: (gst_auto_video_sink_reset),
(gst_auto_video_sink_detect):
* gst/autodetect/gstautovideosrc.c: (gst_auto_video_src_detect):
Post an error when we can't set the internal ghostpad target.
Modified files:
. : ChangeLog
gst/autodetect : gstautoaudiosink.c gstautoaudiosrc.c
gstautovideosink.c gstautovideosrc.c
Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/ChangeLog.diff?r1=1.3832&r2=1.3833
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/gst/autodetect/gstautoaudiosink.c.diff?r1=1.30&r2=1.31
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/gst/autodetect/gstautoaudiosrc.c.diff?r1=1.2&r2=1.3
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/gst/autodetect/gstautovideosink.c.diff?r1=1.23&r2=1.24
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/gst/autodetect/gstautovideosrc.c.diff?r1=1.2&r2=1.3
====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-good/ChangeLog,v
retrieving revision 1.3832
retrieving revision 1.3833
diff -u -d -r1.3832 -r1.3833
--- ChangeLog 25 Nov 2008 16:06:19 -0000 1.3832
+++ ChangeLog 25 Nov 2008 16:26:14 -0000 1.3833
@@ -1,5 +1,14 @@
2008-11-25 Wim Taymans <[email protected]>
+ * gst/autodetect/gstautoaudiosink.c: (gst_auto_audio_sink_detect):
+ * gst/autodetect/gstautoaudiosrc.c: (gst_auto_audio_src_detect):
+ * gst/autodetect/gstautovideosink.c: (gst_auto_video_sink_reset),
+ (gst_auto_video_sink_detect):
+ * gst/autodetect/gstautovideosrc.c: (gst_auto_video_src_detect):
+ Post an error when we can't set the internal ghostpad target.
+
+2008-11-25 Wim Taymans <[email protected]>
* gst/videocrop/gstvideocrop.c: (gst_video_crop_init),
(gst_video_crop_transform), (gst_video_crop_transform_caps),
(gst_video_crop_set_caps), (gst_video_crop_set_property):
Index: gstautoaudiosink.c
RCS file: /cvs/gstreamer/gst-plugins-good/gst/autodetect/gstautoaudiosink.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- gstautoaudiosink.c 27 Oct 2008 08:54:29 -0000 1.30
+++ gstautoaudiosink.c 25 Nov 2008 16:26:16 -0000 1.31
@@ -361,7 +361,9 @@
/* attach ghost pad */
GST_DEBUG_OBJECT (sink, "Re-assigning ghostpad");
targetpad = gst_element_get_static_pad (sink->kid, "sink");
- gst_ghost_pad_set_target (GST_GHOST_PAD (sink->pad), targetpad);
+ if (!gst_ghost_pad_set_target (GST_GHOST_PAD (sink->pad), targetpad))
+ goto target_failed;
gst_object_unref (targetpad);
GST_DEBUG_OBJECT (sink, "done changing auto audio sink");
@@ -374,6 +376,13 @@
("Failed to find a supported audio sink"));
return FALSE;
}
+target_failed:
+ {
+ GST_ELEMENT_ERROR (sink, LIBRARY, INIT, (NULL),
+ ("Failed to set target pad"));
+ gst_object_unref (targetpad);
+ return FALSE;
+ }
}
static GstStateChangeReturn
Index: gstautoaudiosrc.c
RCS file: /cvs/gstreamer/gst-plugins-good/gst/autodetect/gstautoaudiosrc.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gstautoaudiosrc.c 27 Oct 2008 09:04:37 -0000 1.2
+++ gstautoaudiosrc.c 25 Nov 2008 16:26:16 -0000 1.3
@@ -362,7 +362,9 @@
GST_DEBUG_OBJECT (src, "Re-assigning ghostpad");
targetpad = gst_element_get_static_pad (src->kid, "src");
- gst_ghost_pad_set_target (GST_GHOST_PAD (src->pad), targetpad);
+ if (!gst_ghost_pad_set_target (GST_GHOST_PAD (src->pad), targetpad))
GST_DEBUG_OBJECT (src, "done changing auto audio source");
@@ -375,6 +377,13 @@
("Failed to find a supported audio source"));
+ GST_ELEMENT_ERROR (src, LIBRARY, INIT, (NULL),
Index: gstautovideosink.c
RCS file: /cvs/gstreamer/gst-plugins-good/gst/autodetect/gstautovideosink.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- gstautovideosink.c 27 Oct 2008 08:54:29 -0000 1.23
+++ gstautovideosink.c 25 Nov 2008 16:26:16 -0000 1.24
@@ -157,7 +157,7 @@
sink->kid = gst_element_factory_make ("fakesink", "tempsink");
gst_bin_add (GST_BIN (sink), sink->kid);
- /* pad */
+ /* pad, setting this target should always work */
gst_ghost_pad_set_target (GST_GHOST_PAD (sink->pad), targetpad);
@@ -352,7 +352,9 @@
GST_DEBUG_OBJECT (sink, "done changing auto video sink");
@@ -365,6 +367,13 @@
("Failed to find a supported video sink"));
Index: gstautovideosrc.c
RCS file: /cvs/gstreamer/gst-plugins-good/gst/autodetect/gstautovideosrc.c,v
--- gstautovideosrc.c 27 Oct 2008 09:04:37 -0000 1.2
+++ gstautovideosrc.c 25 Nov 2008 16:26:16 -0000 1.3
@@ -353,7 +353,9 @@
GST_DEBUG_OBJECT (src, "done changing auto video source");
@@ -366,6 +368,13 @@
("Failed to find a supported video source"));
-------------------------------------------------------------------------
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=/
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.