From: <wt...@ke...> - 2007-01-24 12:26:55
|
CVS Root: /cvs/gstreamer Module: gst-plugins-good Changes by: wtay Date: Wed Jan 24 2007 12:26:53 UTC Log message: * gst/rtsp/gstrtspsrc.c: (pad_unblocked), (pad_blocked): Unblock pads after adding the pads to the element so that autopluggers get a change to link something. Possibly fixes #395688. Modified files: . : ChangeLog gst/rtsp : gstrtspsrc.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/ChangeLog.diff?r1=1.2704&r2=1.2705 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/gst/rtsp/gstrtspsrc.c.diff?r1=1.53&r2=1.54 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-plugins-good/ChangeLog,v retrieving revision 1.2704 retrieving revision 1.2705 diff -u -d -r1.2704 -r1.2705 --- ChangeLog 24 Jan 2007 12:22:50 -0000 1.2704 +++ ChangeLog 24 Jan 2007 12:26:40 -0000 1.2705 @@ -1,5 +1,11 @@ 2007-01-24 Wim Taymans <wi...@fl...> + * gst/rtsp/gstrtspsrc.c: (pad_unblocked), (pad_blocked): + Unblock pads after adding the pads to the element so that autopluggers + get a change to link something. Possibly fixes #395688. + +2007-01-24 Wim Taymans <wi...@fl...> * gst/rtp/gstrtpamrdepay.c: * gst/rtp/gstrtpgsmdepay.c: * gst/rtp/gstrtph263pdepay.c: Index: gstrtspsrc.c RCS file: /cvs/gstreamer/gst-plugins-good/gst/rtsp/gstrtspsrc.c,v retrieving revision 1.53 retrieving revision 1.54 diff -u -d -r1.53 -r1.54 --- gstrtspsrc.c 11 Jan 2007 09:30:59 -0000 1.53 +++ gstrtspsrc.c 24 Jan 2007 12:26:41 -0000 1.54 @@ -841,6 +841,7 @@ static void pad_unblocked (GstPad * pad, gboolean blocked, GstRTSPSrc * src) { + GST_DEBUG_OBJECT (src, "pad %s:%s unblocked", GST_DEBUG_PAD_NAME (pad)); } @@ -849,9 +850,6 @@ GST_DEBUG_OBJECT (src, "pad %s:%s blocked, activating streams", GST_DEBUG_PAD_NAME (pad)); - gst_pad_set_blocked_async (pad, FALSE, (GstPadBlockCallback) pad_unblocked, - src); - /* activate the streams */ GST_OBJECT_LOCK (src); if (!src->need_activate) @@ -862,12 +860,17 @@ gst_rtspsrc_activate_streams (src); +unblock: + /* now unblock and let it stream */ + gst_pad_set_blocked_async (pad, FALSE, (GstPadBlockCallback) pad_unblocked, + src); return; was_ok: { GST_OBJECT_UNLOCK (src); - return; + goto unblock; } |