From 71814047036e4347ada045953b58030da5829262 Mon Sep 17 00:00:00 2001 From: David Schleef Date: Tue, 1 Jan 2008 01:18:19 +0000 Subject: ext/musicbrainz/gsttrm.c: Don't emit signiture when going to READY, because it might not be ready. Original commit message from CVS: * 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. --- ChangeLog | 21 +++++++++++++++++++++ ext/musicbrainz/gsttrm.c | 1 - ext/nas/nassink.c | 10 +++------- gst/librfb/gstrfbsrc.c | 8 +++++--- gst/librfb/rfbdecoder.c | 10 ++++++++-- gst/rawparse/gstrawparse.c | 17 ++--------------- gst/videosignal/gstvideoanalyse.c | 3 +++ tests/check/Makefile.am | 2 +- 8 files changed, 43 insertions(+), 29 deletions(-) diff --git a/ChangeLog b/ChangeLog index 44261b2d..62afd45a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,24 @@ +2007-12-31 David Schleef + + * 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 * gst/rtpmanager/gstrtpssrcdemux.c: diff --git a/ext/musicbrainz/gsttrm.c b/ext/musicbrainz/gsttrm.c index 5f092b72..a4441f26 100644 --- a/ext/musicbrainz/gsttrm.c +++ b/ext/musicbrainz/gsttrm.c @@ -372,7 +372,6 @@ gst_trm_change_state (GstElement * element, GstStateChange transition) 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; diff --git a/ext/nas/nassink.c b/ext/nas/nassink.c index a2ee0575..e2d91d18 100644 --- a/ext/nas/nassink.c +++ b/ext/nas/nassink.c @@ -171,12 +171,6 @@ gst_nas_sink_getcaps (GstBaseSink * bsink) 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 @@ gst_nas_sink_open (GstAudioSink * asink) /* 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; diff --git a/gst/librfb/gstrfbsrc.c b/gst/librfb/gstrfbsrc.c index d3f799cd..0df0555f 100644 --- a/gst/librfb/gstrfbsrc.c +++ b/gst/librfb/gstrfbsrc.c @@ -86,7 +86,11 @@ static gboolean gst_rfb_src_event (GstBaseSrc * bsrc, GstEvent * event); 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 @@ gst_rfb_src_class_init (GstRfbSrcClass * klass) 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"); } static void diff --git a/gst/librfb/rfbdecoder.c b/gst/librfb/rfbdecoder.c index 878183e1..2c688f0c 100644 --- a/gst/librfb/rfbdecoder.c +++ b/gst/librfb/rfbdecoder.c @@ -61,6 +61,13 @@ RfbDecoder * 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 @@ rfb_decoder_connect_tcp (RfbDecoder * decoder, gchar * addr, guint port) if (connect (decoder->fd, (struct sockaddr *) &sa, sizeof (struct sockaddr)) == -1) { close (decoder->fd); + decoder->fd = -1; GST_WARNING ("connection failed"); return FALSE; } @@ -126,8 +134,6 @@ rfb_decoder_connect_tcp (RfbDecoder * decoder, gchar * addr, guint port) 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); diff --git a/gst/rawparse/gstrawparse.c b/gst/rawparse/gstrawparse.c index 2f1ffba1..fa584d1a 100644 --- a/gst/rawparse/gstrawparse.c +++ b/gst/rawparse/gstrawparse.c @@ -53,12 +53,6 @@ GST_STATIC_PAD_TEMPLATE ("sink", 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 "); - GST_BOILERPLATE (GstRawParse, gst_raw_parse, GstElement, GST_TYPE_ELEMENT); static void @@ -71,7 +65,6 @@ gst_raw_parse_base_init (gpointer g_class) 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); } static void @@ -101,17 +94,11 @@ gst_raw_parse_init (GstRawParse * rp, GstRawParseClass * g_class) 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); diff --git a/gst/videosignal/gstvideoanalyse.c b/gst/videosignal/gstvideoanalyse.c index d0cdf70c..05b13ef5 100644 --- a/gst/videosignal/gstvideoanalyse.c +++ b/gst/videosignal/gstvideoanalyse.c @@ -348,6 +348,9 @@ gst_video_analyse_get_type (void) 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; } diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am index 0785ef59..1cf3c0de 100644 --- a/tests/check/Makefile.am +++ b/tests/check/Makefile.am @@ -13,7 +13,7 @@ TESTS_ENVIRONMENT = \ $(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@ -- cgit v1.2.1