[farsight2/master] Revert "rtp: Keep a ref on the session/stream while calling into it from an async callback"
Olivier Crête
olivier.crete at collabora.co.uk
Fri Jul 17 10:42:16 PDT 2009
This reverts commit a82b8a42f594a37b3299645c67b7ccf58025994c.
---
gst/fsrtpconference/fs-rtp-substream.c | 15 ---------------
1 files changed, 0 insertions(+), 15 deletions(-)
diff --git a/gst/fsrtpconference/fs-rtp-substream.c b/gst/fsrtpconference/fs-rtp-substream.c
index f58ba8a..178caaa 100644
--- a/gst/fsrtpconference/fs-rtp-substream.c
+++ b/gst/fsrtpconference/fs-rtp-substream.c
@@ -514,9 +514,7 @@ rtpbin_pad_unlinked (GstPad *pad, GstPad *peer, gpointer user_data)
{
FsRtpSubStream *self = user_data;
- g_object_ref (self->priv->session);
g_signal_emit (self, signals[UNLINKED], 0);
- g_object_unref (self->priv->session);
}
static void
@@ -1304,23 +1302,10 @@ static void
_rtpbin_pad_blocked_callback (GstPad *pad, gboolean blocked, gpointer user_data)
{
FsRtpSubStream *substream = user_data;
- FsRtpStream *stream = NULL;
-
- g_object_ref (substream->priv->session);
-
- FS_RTP_SESSION_LOCK (substream->priv->session);
- if (substream->priv->stream)
- stream = g_object_ref (substream->priv->stream);
- FS_RTP_SESSION_UNLOCK (substream->priv->session);
g_signal_emit (substream, signals[BLOCKED], 0, substream->priv->stream);
gst_pad_set_blocked_async (pad, FALSE, do_nothing_blocked_callback, NULL);
-
- if (stream)
- g_object_unref (stream);
-
- g_object_unref (substream->priv->session);
}
static void
--
1.5.6.5
More information about the farsight-commits
mailing list