From 9e125e7bab92259d2d3317c2bf47da081c03ba8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
Date: Thu, 2 Jan 2014 13:34:52 +0100
Subject: [PATCH] pad: Add unit test for adding/removing blocking probes while
 a pad is blocked

And make sure that these new probes are actually called if they should
instead of silently blocking the pad forever.

https://bugzilla.gnome.org/show_bug.cgi?id=721289
---
 tests/check/gst/gstpad.c | 102 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 101 insertions(+), 1 deletion(-)

diff --git a/tests/check/gst/gstpad.c b/tests/check/gst/gstpad.c
index 406d1ce07b..2b193b170d 100644
--- a/tests/check/gst/gstpad.c
+++ b/tests/check/gst/gstpad.c
@@ -1109,7 +1109,6 @@ test_pad_blocking_with_type (GstPadProbeType type)
 
   id = gst_pad_add_probe (pad, type, block_async_cb_return_ok, NULL, NULL);
 
-
   thread = g_thread_try_new ("gst-check", (GThreadFunc) push_buffer_async,
       pad, NULL);
 
@@ -1192,6 +1191,106 @@ GST_START_TEST (test_pad_probe_remove)
 
 GST_END_TEST;
 
+static GstPadProbeReturn
+probe_block_a (GstPad * pad, GstPadProbeInfo * info, gpointer user_data)
+{
+  return GST_PAD_PROBE_OK;
+}
+
+static GstPadProbeReturn
+probe_block_b (GstPad * pad, GstPadProbeInfo * info, gpointer user_data)
+{
+  gboolean *probe_b_called = user_data;
+
+  *probe_b_called = TRUE;
+
+  return GST_PAD_PROBE_OK;
+}
+
+static GstPadProbeReturn
+probe_block_c (GstPad * pad, GstPadProbeInfo * info, gpointer user_data)
+{
+  gboolean *probe_c_called = user_data;
+
+  *probe_c_called = TRUE;
+
+  return GST_PAD_PROBE_REMOVE;
+}
+
+GST_START_TEST (test_pad_probe_block_add_remove)
+{
+  GstPad *pad;
+  GThread *thread;
+  gulong probe_a, probe_b;
+  gboolean probe_b_called = FALSE;
+  gboolean probe_c_called = FALSE;
+
+  pad = gst_pad_new ("src", GST_PAD_SRC);
+  fail_unless (pad != NULL);
+
+  gst_pad_set_active (pad, TRUE);
+  fail_unless (pad->num_probes == 0);
+  fail_unless (pad->num_blocked == 0);
+
+  fail_unless (gst_pad_push_event (pad,
+          gst_event_new_stream_start ("test")) == TRUE);
+  fail_unless (gst_pad_push_event (pad,
+          gst_event_new_segment (&dummy_segment)) == TRUE);
+
+  probe_a = gst_pad_add_probe (pad,
+      GST_PAD_PROBE_TYPE_BLOCK | GST_PAD_PROBE_TYPE_BUFFER,
+      probe_block_a, NULL, NULL);
+
+  fail_unless (pad->num_probes == 1);
+  fail_unless (pad->num_blocked == 1);
+
+  thread = g_thread_try_new ("gst-check", (GThreadFunc) push_buffer_async,
+      pad, NULL);
+
+  /* wait for the block */
+  while (!gst_pad_is_blocking (pad)) {
+    g_usleep (10000);
+  }
+
+  probe_b = gst_pad_add_probe (pad,
+      GST_PAD_PROBE_TYPE_BLOCK | GST_PAD_PROBE_TYPE_BUFFER,
+      probe_block_b, &probe_b_called, NULL);
+
+  gst_pad_remove_probe (pad, probe_a);
+
+  /* wait for the callback */
+  while (!probe_b_called) {
+    g_usleep (10000);
+  }
+
+  /* wait for the block */
+  while (!gst_pad_is_blocking (pad)) {
+    g_usleep (10000);
+  }
+
+  gst_pad_add_probe (pad,
+      GST_PAD_PROBE_TYPE_BLOCK | GST_PAD_PROBE_TYPE_BUFFER,
+      probe_block_c, &probe_c_called, NULL);
+
+  gst_pad_remove_probe (pad, probe_b);
+
+  /* wait for the callback */
+  while (!probe_c_called) {
+    g_usleep (10000);
+  }
+
+  /* wait for the unblock */
+  while (gst_pad_is_blocking (pad)) {
+    g_usleep (10000);
+  }
+
+  gst_object_unref (pad);
+
+  g_thread_join (thread);
+}
+
+GST_END_TEST;
+
 static gboolean src_flush_start_probe_called = FALSE;
 static gboolean src_flush_stop_probe_called = FALSE;
 static gboolean sink_flush_start_probe_called = FALSE;
@@ -1746,6 +1845,7 @@ gst_pad_suite (void)
   tcase_add_test (tc_chain, test_pad_blocking_with_probe_type_block);
   tcase_add_test (tc_chain, test_pad_blocking_with_probe_type_blocking);
   tcase_add_test (tc_chain, test_pad_probe_remove);
+  tcase_add_test (tc_chain, test_pad_probe_block_add_remove);
   tcase_add_test (tc_chain, test_pad_probe_flush_events);
   tcase_add_test (tc_chain, test_queue_src_caps_notify_linked);
   tcase_add_test (tc_chain, test_queue_src_caps_notify_not_linked);