CVS Root: /cvs/gstreamer Module: gst-plugins-bad Changes by: ds Date: Tue Jan 01 2008 01:18:34 UTC Log message: * ext/musicbrainz/gsttrm.c: Don't emit signiture when going to READY, because it might not be ready. * ext/nas/nassink.c: Remove useless call that sleeps for 5 seconds. Yup, it calls sleep(1) 5 times. Go NAS. * gst/librfb/gstrfbsrc.c: * gst/librfb/rfbdecoder.c: Initialize our debug categories properly. * gst/rawparse/gstrawparse.c: Don't register element details for a non-element. Be much more rude when subclass doesn't set a pad template (assert!). Don't unref the pad template; we don't own it. * gst/videosignal/gstvideoanalyse.c: Initialize debug category. * tests/check/Makefile.am: Ignore nassink element in tests because it has unavoidable long timeouts. Modified files: . : ChangeLog ext/musicbrainz : gsttrm.c ext/nas : nassink.c gst/librfb : gstrfbsrc.c rfbdecoder.c gst/rawparse : gstrawparse.c gst/videosignal : gstvideoanalyse.c tests/check : Makefile.am Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/ChangeLog.diff?r1=1.2982&r2=1.2983 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/ext/musicbrainz/gsttrm.c.diff?r1=1.19&r2=1.20 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/ext/nas/nassink.c.diff?r1=1.20&r2=1.21 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst/librfb/gstrfbsrc.c.diff?r1=1.22&r2=1.23 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst/librfb/rfbdecoder.c.diff?r1=1.21&r2=1.22 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst/rawparse/gstrawparse.c.diff?r1=1.2&r2=1.3 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst/videosignal/gstvideoanalyse.c.diff?r1=1.1&r2=1.2 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/tests/check/Makefile.am.diff?r1=1.31&r2=1.32 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-plugins-bad/ChangeLog,v retrieving revision 1.2982 retrieving revision 1.2983 diff -u -d -r1.2982 -r1.2983 --- ChangeLog 31 Dec 2007 13:12:05 -0000 1.2982 +++ ChangeLog 1 Jan 2008 01:18:17 -0000 1.2983 @@ -1,3 +1,24 @@ +2007-12-31 David Schleef <ds...@sc...> + + * ext/musicbrainz/gsttrm.c: + Don't emit signiture when going to READY, because it might + not be ready. + * ext/nas/nassink.c: + Remove useless call that sleeps for 5 seconds. Yup, it calls + sleep(1) 5 times. Go NAS. + * gst/librfb/gstrfbsrc.c: + * gst/librfb/rfbdecoder.c: + Initialize our debug categories properly. + * gst/rawparse/gstrawparse.c: + Don't register element details for a non-element. Be much more + rude when subclass doesn't set a pad template (assert!). Don't + unref the pad template; we don't own it. + * gst/videosignal/gstvideoanalyse.c: + Initialize debug category. + * tests/check/Makefile.am: + Ignore nassink element in tests because it has unavoidable + long timeouts. 2007-12-31 Wim Taymans <wim...@co...> * gst/rtpmanager/gstrtpssrcdemux.c: Index: gsttrm.c RCS file: /cvs/gstreamer/gst-plugins-bad/ext/musicbrainz/gsttrm.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- gsttrm.c 5 Oct 2006 18:14:46 -0000 1.19 +++ gsttrm.c 1 Jan 2008 01:18:18 -0000 1.20 @@ -372,7 +372,6 @@ switch (transition) { case GST_STATE_CHANGE_PAUSED_TO_READY: - gst_trm_emit_signature (trm); trm_Delete (trm->trm); trm->trm = NULL; trm->data_available = FALSE; Index: nassink.c RCS file: /cvs/gstreamer/gst-plugins-bad/ext/nas/nassink.c,v retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- nassink.c 10 Mar 2007 20:10:09 -0000 1.20 +++ nassink.c 1 Jan 2008 01:18:18 -0000 1.21 @@ -171,12 +171,6 @@ server = nassink->audio; - if (server == NULL) { - /* FIXME: is it really a good idea to do a potentially long blocking call - * like this here? (tpm) */ - server = AuOpenServer (nassink->host, 0, NULL, 0, NULL, NULL); - } - templatecaps = gst_static_pad_template_get_caps (&sink_factory); if (server == NULL) @@ -333,8 +327,10 @@ /* Open Server */ sink->audio = AuOpenServer (sink->host, 0, NULL, 0, NULL, NULL); - if (sink->audio == NULL) + if (sink->audio == NULL) { + GST_DEBUG_OBJECT (sink, "opening failed"); return FALSE; + } sink->flow = AuNone; sink->need_data = 0; Index: gstrfbsrc.c RCS file: /cvs/gstreamer/gst-plugins-bad/gst/librfb/gstrfbsrc.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- gstrfbsrc.c 29 Nov 2007 13:32:10 -0000 1.22 +++ gstrfbsrc.c 1 Jan 2008 01:18:19 -0000 1.23 @@ -86,7 +86,11 @@ static GstFlowReturn gst_rfb_src_create (GstPushSrc * psrc, GstBuffer ** outbuf); -GST_BOILERPLATE (GstRfbSrc, gst_rfb_src, GstPushSrc, GST_TYPE_PUSH_SRC); +#define DEBUG_INIT(bla) \ + GST_DEBUG_CATEGORY_INIT (rfbsrc_debug, "rfbsrc", 0, "rfb src element"); +GST_BOILERPLATE_FULL (GstRfbSrc, gst_rfb_src, GstPushSrc, GST_TYPE_PUSH_SRC, + DEBUG_INIT); static void gst_rfb_src_base_init (gpointer g_class) @@ -148,8 +152,6 @@ gstbasesrc_class->stop = GST_DEBUG_FUNCPTR (gst_rfb_src_stop); gstbasesrc_class->event = GST_DEBUG_FUNCPTR (gst_rfb_src_event); gstpushsrc_class->create = GST_DEBUG_FUNCPTR (gst_rfb_src_create); - GST_DEBUG_CATEGORY_INIT (rfbsrc_debug, "rfbsrc", 0, "Rfb source"); } Index: rfbdecoder.c RCS file: /cvs/gstreamer/gst-plugins-bad/gst/librfb/rfbdecoder.c,v diff -u -d -r1.21 -r1.22 --- rfbdecoder.c 3 Dec 2007 13:08:26 -0000 1.21 +++ rfbdecoder.c 1 Jan 2008 01:18:19 -0000 1.22 @@ -61,6 +61,13 @@ rfb_decoder_new (void) { RfbDecoder *decoder = g_new0 (RfbDecoder, 1); + static gboolean debug_inited = FALSE; + if (!debug_inited) { + /* FIXME this is the wrong place to int this */ + GST_DEBUG_CATEGORY_INIT (rfbdecoder_debug, "rfbdecoder", 0, "Rfb source"); + debug_inited = TRUE; decoder->fd = -1; @@ -108,6 +115,7 @@ if (connect (decoder->fd, (struct sockaddr *) &sa, sizeof (struct sockaddr)) == -1) { close (decoder->fd); + decoder->fd = -1; GST_WARNING ("connection failed"); } @@ -126,8 +134,6 @@ gboolean rfb_decoder_iterate (RfbDecoder * decoder) - GST_DEBUG_CATEGORY_INIT (rfbdecoder_debug, "rfbdecoder", 0, "Rfb source"); g_return_val_if_fail (decoder != NULL, FALSE); g_return_val_if_fail (decoder->fd != -1, FALSE); Index: gstrawparse.c RCS file: /cvs/gstreamer/gst-plugins-bad/gst/rawparse/gstrawparse.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- gstrawparse.c 23 Dec 2007 10:34:39 -0000 1.2 +++ gstrawparse.c 1 Jan 2008 01:18:19 -0000 1.3 @@ -53,12 +53,6 @@ GST_DEBUG_CATEGORY_STATIC (gst_raw_parse_debug); #define GST_CAT_DEFAULT gst_raw_parse_debug -static const GstElementDetails raw_parse_details = -GST_ELEMENT_DETAILS ("Raw parser base class", - "Filter/Raw", - "Parses byte streams into raw frames", - "Sebastian Dröge <sl...@ci...>"); GST_BOILERPLATE (GstRawParse, gst_raw_parse, GstElement, GST_TYPE_ELEMENT); @@ -71,7 +65,6 @@ gst_element_class_add_pad_template (gstelement_class, gst_static_pad_template_get (&gst_raw_parse_sink_pad_template)); - gst_element_class_set_details (gstelement_class, &raw_parse_details); @@ -101,17 +94,11 @@ if (src_pad_template) { rp->srcpad = gst_pad_new_from_template (src_pad_template, "src"); } else { - GstCaps *caps; - GST_WARNING ("Subclass didn't specify a src pad template, using ANY caps"); - rp->srcpad = gst_pad_new ("src", GST_PAD_SRC); - caps = gst_caps_new_any (); - gst_pad_set_caps (rp->srcpad, caps); - gst_caps_unref (caps); + g_warning ("Subclass didn't specify a src pad template"); + g_assert_not_reached (); gst_element_add_pad (GST_ELEMENT (rp), rp->srcpad); - g_object_unref (src_pad_template); gst_pad_set_event_function (rp->srcpad, gst_raw_parse_src_event); Index: gstvideoanalyse.c RCS file: /cvs/gstreamer/gst-plugins-bad/gst/videosignal/gstvideoanalyse.c,v retrieving revision 1.1 diff -u -d -r1.1 -r1.2 --- gstvideoanalyse.c 30 May 2007 14:52:07 -0000 1.1 +++ gstvideoanalyse.c 1 Jan 2008 01:18:19 -0000 1.2 @@ -348,6 +348,9 @@ video_analyse_type = g_type_register_static (GST_TYPE_VIDEO_FILTER, "GstVideoAnalyse", &video_analyse_info, 0); + GST_DEBUG_CATEGORY_INIT (video_analyse_debug, "videoanalyse", 0, + "Video Analyse element"); return video_analyse_type; Index: Makefile.am RCS file: /cvs/gstreamer/gst-plugins-bad/tests/check/Makefile.am,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- Makefile.am 7 Nov 2007 15:18:53 -0000 1.31 +++ Makefile.am 1 Jan 2008 01:18:19 -0000 1.32 @@ -13,7 +13,7 @@ $(REGISTRY_ENVIRONMENT) \ GST_PLUGIN_SYSTEM_PATH= \ GST_PLUGIN_PATH=$(top_builddir)/gst:$(top_builddir)/sys:$(top_builddir)/ext:$(GSTPB_PLUGINS_DIR):$(GST_PLUGINS_DIR) \ - STATE_IGNORE_ELEMENTS="glimagesink" + STATE_IGNORE_ELEMENTS="nassink glimagesink" plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ |