From: Thomas Vander Stichele <thomas (at) apestaart (dot) org>
Date: Fri, 27 Jan 2012 11:58:12 +0000 (+0100)
Subject: multisocketsink: fix refcounting bug
X-Git-Tag: 1.19.3~511^2~6804
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=99185cc8f56a61977459d3561de29b5523647c2f;p=platform%2Fupstream%2Fgstreamer.git

multisocketsink: fix refcounting bug
---

diff --git a/gst/tcp/gstmultisocketsink.c b/gst/tcp/gstmultisocketsink.c
index 503abe2844..0414aea19b 100644
--- a/gst/tcp/gstmultisocketsink.c
+++ b/gst/tcp/gstmultisocketsink.c
@@ -2137,6 +2137,7 @@ gst_multi_socket_sink_render (GstBaseSink * bsink, GstBuffer * buf)
     gst_buffer_ref (buf);
   }
 #endif
+  gst_buffer_ref (buf);
 
   GST_LOG_OBJECT (sink, "received buffer %p, in_caps: %s, offset %"
       G_GINT64_FORMAT ", offset_end %" G_GINT64_FORMAT
diff --git a/tests/check/elements/multisocketsink.c b/tests/check/elements/multisocketsink.c
index 719fedcdf3..293d848716 100644
--- a/tests/check/elements/multisocketsink.c
+++ b/tests/check/elements/multisocketsink.c
@@ -292,9 +292,9 @@ GST_START_TEST (test_streamheader)
 
   fail_unless (gst_pad_push (mysrcpad, hbuf1) == GST_FLOW_OK);
   fail_unless (gst_pad_push (mysrcpad, hbuf2) == GST_FLOW_OK);
-  ASSERT_BUFFER_REFCOUNT (hbuf1, "hbuf1", 1);
   // FIXME: we can't assert on the refcount because giving away the ref
   //        doesn't mean the refcount decreases
+  // ASSERT_BUFFER_REFCOUNT (hbuf1, "hbuf1", 1);
   // ASSERT_BUFFER_REFCOUNT (hbuf2, "hbuf2", 1);
 
   //FIXME:
@@ -338,13 +338,10 @@ GST_START_TEST (test_streamheader)
   ASSERT_SET_STATE (sink, GST_STATE_NULL, GST_STATE_CHANGE_SUCCESS);
   cleanup_multisocketsink (sink);
 
-  // FIXME for slomo: these refcounts end up as 0 instead of 1
-  //ASSERT_BUFFER_REFCOUNT (hbuf1, "hbuf1", 1);
-  ASSERT_BUFFER_REFCOUNT (hbuf1, "hbuf1", 0);
-  //ASSERT_BUFFER_REFCOUNT (hbuf2, "hbuf2", 1);
-  ASSERT_BUFFER_REFCOUNT (hbuf2, "hbuf2", 0);
-  //gst_buffer_unref (hbuf1);
-  //gst_buffer_unref (hbuf2);
+  ASSERT_BUFFER_REFCOUNT (hbuf1, "hbuf1", 1);
+  ASSERT_BUFFER_REFCOUNT (hbuf2, "hbuf2", 1);
+  gst_buffer_unref (hbuf1);
+  gst_buffer_unref (hbuf2);
 
   ASSERT_CAPS_REFCOUNT (caps, "caps", 1);
   gst_caps_unref (caps);
@@ -417,14 +414,10 @@ GST_START_TEST (test_change_streamheader)
   /* change the streamheader */
 
   /* before we change, multisocketsink still has a list of the old streamheaders */
-  // FIXME for slomo: it actually has refcount 1
-  // ASSERT_BUFFER_REFCOUNT (hbuf1, "hbuf1", 2);
-  ASSERT_BUFFER_REFCOUNT (hbuf1, "hbuf1", 1);
-  //ASSERT_BUFFER_REFCOUNT (hbuf2, "hbuf2", 2);
-  ASSERT_BUFFER_REFCOUNT (hbuf2, "hbuf2", 1);
-  // FIXME: which means we can't drop our refs
-  // gst_buffer_unref (hbuf1);
-  // gst_buffer_unref (hbuf2);
+  ASSERT_BUFFER_REFCOUNT (hbuf1, "hbuf1", 2);
+  ASSERT_BUFFER_REFCOUNT (hbuf2, "hbuf2", 2);
+  gst_buffer_unref (hbuf1);
+  gst_buffer_unref (hbuf2);
 
   /* drop our ref to the previous caps */
   gst_caps_unref (caps);
@@ -466,12 +459,10 @@ GST_START_TEST (test_change_streamheader)
   ASSERT_SET_STATE (sink, GST_STATE_NULL, GST_STATE_CHANGE_SUCCESS);
 
   /* setting to NULL should have cleared the streamheader */
-  /* FIXME for slomo: again, these buffers end up with rc 0
-     ASSERT_BUFFER_REFCOUNT (hbuf1, "hbuf1", 1);
-     ASSERT_BUFFER_REFCOUNT (hbuf2, "hbuf2", 1);
-     gst_buffer_unref (hbuf1);
-     gst_buffer_unref (hbuf2);
-   */
+  ASSERT_BUFFER_REFCOUNT (hbuf1, "hbuf1", 1);
+  ASSERT_BUFFER_REFCOUNT (hbuf2, "hbuf2", 1);
+  gst_buffer_unref (hbuf1);
+  gst_buffer_unref (hbuf2);
   cleanup_multisocketsink (sink);
 
   ASSERT_CAPS_REFCOUNT (caps, "caps", 1);