tee: Check for the removed pad flag also in the slow pushing path

[platform/upstream/gstreamer.git] / gst / gsttaskpool.c

diff --git a/gst/gsttaskpool.c b/gst/gsttaskpool.c
index e065fca..89c8905 100644 (file)
--- a/gst/gsttaskpool.c
+++ b/gst/gsttaskpool.c
@@ -15,12 +15,13 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 /**
  * SECTION:gsttaskpool
+ * @title: GstTaskPool
  * @short_description: Pool of GStreamer streaming threads
  * @see_also: #GstTask, #GstPad
  *
@@ -28,21 +29,20 @@
  * implementation uses a regular GThreadPool to start tasks.
  *
  * Subclasses can be made to create custom threads.
- *
- * Last reviewed on 2009-04-23 (0.10.24)
  */
 
 #include "gst_private.h"
 
 #include "gstinfo.h"
 #include "gsttaskpool.h"
+#include "gsterror.h"
 
 GST_DEBUG_CATEGORY_STATIC (taskpool_debug);
 #define GST_CAT_DEFAULT (taskpool_debug)
 
-static void gst_task_pool_class_init (GstTaskPoolClass * klass);
-static void gst_task_pool_init (GstTaskPool * pool);
+#ifndef GST_DISABLE_GST_DEBUG
 static void gst_task_pool_finalize (GObject * object);
+#endif
 
 #define _do_init \
 { \
@@ -74,22 +74,26 @@ static void
 default_prepare (GstTaskPool * pool, GError ** error)
 {
   GST_OBJECT_LOCK (pool);
-  pool->pool = g_thread_pool_new ((GFunc) default_func, pool, -1, FALSE, NULL);
+  pool->pool = g_thread_pool_new ((GFunc) default_func, pool, -1, FALSE, error);
   GST_OBJECT_UNLOCK (pool);
 }
 
 static void
 default_cleanup (GstTaskPool * pool)
 {
+  GThreadPool *pool_;
+
   GST_OBJECT_LOCK (pool);
-  if (pool->pool) {
+  pool_ = pool->pool;
+  pool->pool = NULL;
+  GST_OBJECT_UNLOCK (pool);
+
+  if (pool_) {
     /* Shut down all the threads, we still process the ones scheduled
      * because the unref happens in the thread function.
      * Also wait for currently running ones to finish. */
-    g_thread_pool_free (pool->pool, FALSE, TRUE);
-    pool->pool = NULL;
+    g_thread_pool_free (pool_, FALSE, TRUE);
   }
-  GST_OBJECT_UNLOCK (pool);
 }
 
 static gpointer
@@ -107,6 +111,9 @@ default_push (GstTaskPool * pool, GstTaskPoolFunction func,
     g_thread_pool_push (pool->pool, tdata, error);
   else {
     g_slice_free (TaskData, tdata);
+    g_set_error_literal (error, GST_CORE_ERROR, GST_CORE_ERROR_FAILED,
+        "No thread pool");
+
   }
   GST_OBJECT_UNLOCK (pool);
 
@@ -128,7 +135,9 @@ gst_task_pool_class_init (GstTaskPoolClass * klass)
   gobject_class = (GObjectClass *) klass;
   gsttaskpool_class = (GstTaskPoolClass *) klass;
 
+#ifndef GST_DISABLE_GST_DEBUG
   gobject_class->finalize = gst_task_pool_finalize;
+#endif
 
   gsttaskpool_class->prepare = default_prepare;
   gsttaskpool_class->cleanup = default_cleanup;
@@ -141,6 +150,7 @@ gst_task_pool_init (GstTaskPool * pool)
 {
 }
 
+#ifndef GST_DISABLE_GST_DEBUG
 static void
 gst_task_pool_finalize (GObject * object)
 {
@@ -148,21 +158,24 @@ gst_task_pool_finalize (GObject * object)
 
   G_OBJECT_CLASS (gst_task_pool_parent_class)->finalize (object);
 }
-
+#endif
 /**
  * gst_task_pool_new:
  *
  * Create a new default task pool. The default task pool will use a regular
  * GThreadPool for threads.
  *
- * Returns: a new #GstTaskPool. gst_object_unref() after usage.
+ * Returns: (transfer full): a new #GstTaskPool. gst_object_unref() after usage.
  */
 GstTaskPool *
 gst_task_pool_new (void)
 {
   GstTaskPool *pool;
 
-  pool = g_object_newv (GST_TYPE_TASK_POOL, 0, NULL);
+  pool = g_object_new (GST_TYPE_TASK_POOL, NULL);
+
+  /* clear floating flag */
+  gst_object_ref_sink (pool);
 
   return pool;
 }
@@ -214,15 +227,15 @@ gst_task_pool_cleanup (GstTaskPool * pool)
 /**
  * gst_task_pool_push:
  * @pool: a #GstTaskPool
- * @func: the function to call
- * @user_data: data to pass to @func
+ * @func: (scope async): the function to call
+ * @user_data: (closure): data to pass to @func
  * @error: return location for an error
  *
  * Start the execution of a new thread from @pool.
  *
- * Returns: a pointer that should be used for the gst_task_pool_join
- * function. This pointer can be NULL, you must check @error to detect
- * errors.
+ * Returns: (transfer none) (nullable): a pointer that should be used
+ * for the gst_task_pool_join function. This pointer can be %NULL, you
+ * must check @error to detect errors.
  */
 gpointer
 gst_task_pool_push (GstTaskPool * pool, GstTaskPoolFunction func,
@@ -252,7 +265,7 @@ not_supported:
  * @pool: a #GstTaskPool
  * @id: the id
  *
- * Join a task and/or return it to the pool. @id is the id obtained from 
+ * Join a task and/or return it to the pool. @id is the id obtained from
  * gst_task_pool_push().
  */
 void