mirror of
https://gitlab.freedesktop.org/pipewire/pipewire.git
synced 2025-11-10 13:30:05 -05:00
mainloop: add threaded mainloop
Add a mainloop wrapper that runs the mainloop in a separate thread and has some synchronization primitives. Use new mainloop in gstreamer source and sink elements
This commit is contained in:
Wim Taymans
parent
a3505fb880
commit
cbeee04809
9 changed files with 710 additions and 195 deletions
|
|
@ -123,8 +123,6 @@ static void
|
|||
gst_pinos_sink_init (GstPinosSink * sink)
|
||||
{
|
||||
sink->allocator = gst_tmpfile_allocator_new ();
|
||||
g_mutex_init (&sink->lock);
|
||||
g_cond_init (&sink->cond);
|
||||
}
|
||||
|
||||
static GstCaps *
|
||||
|
|
@ -198,7 +196,7 @@ on_new_buffer (GObject *gobject,
|
|||
{
|
||||
GstPinosSink *pinossink = user_data;
|
||||
|
||||
g_cond_signal (&pinossink->cond);
|
||||
pinos_main_loop_signal (pinossink->loop, FALSE);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
@ -207,17 +205,26 @@ on_stream_notify (GObject *gobject,
|
|||
gpointer user_data)
|
||||
{
|
||||
PinosStreamState state;
|
||||
PinosStream *stream = PINOS_STREAM (gobject);
|
||||
GstPinosSink *pinossink = user_data;
|
||||
|
||||
state = pinos_stream_get_state (pinossink->stream);
|
||||
g_print ("got stream state %d\n", state);
|
||||
g_cond_broadcast (&pinossink->cond);
|
||||
state = pinos_stream_get_state (stream);
|
||||
GST_DEBUG ("got stream state %d\n", state);
|
||||
|
||||
if (state == PINOS_STREAM_STATE_ERROR) {
|
||||
GST_ELEMENT_ERROR (pinossink, RESOURCE, FAILED,
|
||||
("Failed to connect stream: %s",
|
||||
pinos_stream_get_error (pinossink->stream)->message), (NULL));
|
||||
switch (state) {
|
||||
case PINOS_STREAM_STATE_UNCONNECTED:
|
||||
case PINOS_STREAM_STATE_CONNECTING:
|
||||
case PINOS_STREAM_STATE_STARTING:
|
||||
case PINOS_STREAM_STATE_STREAMING:
|
||||
case PINOS_STREAM_STATE_READY:
|
||||
break;
|
||||
case PINOS_STREAM_STATE_ERROR:
|
||||
GST_ELEMENT_ERROR (pinossink, RESOURCE, FAILED,
|
||||
("stream error: %s",
|
||||
pinos_stream_get_error (stream)->message), (NULL));
|
||||
break;
|
||||
}
|
||||
pinos_main_loop_signal (pinossink->loop, FALSE);
|
||||
}
|
||||
|
||||
static GstCaps *
|
||||
|
|
@ -238,7 +245,7 @@ gst_pinos_sink_setcaps (GstBaseSink * bsink, GstCaps * caps)
|
|||
str = gst_caps_to_string (caps);
|
||||
format = g_bytes_new_take (str, strlen (str) + 1);
|
||||
|
||||
g_mutex_lock (&pinossink->lock);
|
||||
pinos_main_loop_lock (pinossink->loop);
|
||||
pinossink->stream = pinos_stream_new (pinossink->ctx, "test", NULL);
|
||||
g_signal_connect (pinossink->stream, "notify::state", (GCallback) on_stream_notify, pinossink);
|
||||
g_signal_connect (pinossink->stream, "new-buffer", (GCallback) on_new_buffer, pinossink);
|
||||
|
|
@ -254,7 +261,7 @@ gst_pinos_sink_setcaps (GstBaseSink * bsink, GstCaps * caps)
|
|||
if (state == PINOS_STREAM_STATE_ERROR)
|
||||
goto connect_error;
|
||||
|
||||
g_cond_wait (&pinossink->cond, &pinossink->lock);
|
||||
pinos_main_loop_wait (pinossink->loop);
|
||||
}
|
||||
|
||||
pinos_stream_start (pinossink->stream, format, PINOS_STREAM_MODE_BUFFER);
|
||||
|
|
@ -268,9 +275,9 @@ gst_pinos_sink_setcaps (GstBaseSink * bsink, GstCaps * caps)
|
|||
if (state == PINOS_STREAM_STATE_ERROR)
|
||||
goto connect_error;
|
||||
|
||||
g_cond_wait (&pinossink->cond, &pinossink->lock);
|
||||
pinos_main_loop_wait (pinossink->loop);
|
||||
}
|
||||
g_mutex_unlock (&pinossink->lock);
|
||||
pinos_main_loop_unlock (pinossink->loop);
|
||||
|
||||
pinossink->negotiated = TRUE;
|
||||
|
||||
|
|
@ -278,7 +285,7 @@ gst_pinos_sink_setcaps (GstBaseSink * bsink, GstCaps * caps)
|
|||
|
||||
connect_error:
|
||||
{
|
||||
g_mutex_unlock (&pinossink->lock);
|
||||
pinos_main_loop_unlock (pinossink->loop);
|
||||
return FALSE;
|
||||
}
|
||||
}
|
||||
|
|
@ -323,11 +330,11 @@ gst_pinos_sink_render (GstBaseSink * bsink, GstBuffer * buffer)
|
|||
gst_memory_unref (mem);
|
||||
info.message = mesg;
|
||||
|
||||
g_mutex_lock (&pinossink->lock);
|
||||
pinos_main_loop_lock (pinossink->loop);
|
||||
if (pinos_stream_get_state (pinossink->stream) != PINOS_STREAM_STATE_STREAMING)
|
||||
goto streaming_error;
|
||||
pinos_stream_provide_buffer (pinossink->stream, &info);
|
||||
g_mutex_unlock (&pinossink->lock);
|
||||
pinos_main_loop_unlock (pinossink->loop);
|
||||
|
||||
return GST_FLOW_OK;
|
||||
|
||||
|
|
@ -341,7 +348,7 @@ map_error:
|
|||
}
|
||||
streaming_error:
|
||||
{
|
||||
g_mutex_unlock (&pinossink->lock);
|
||||
pinos_main_loop_unlock (pinossink->loop);
|
||||
return GST_FLOW_ERROR;
|
||||
}
|
||||
}
|
||||
|
|
@ -366,63 +373,48 @@ gst_pinos_sink_stop (GstBaseSink * basesink)
|
|||
return TRUE;
|
||||
}
|
||||
|
||||
static GPrivate sink_key;
|
||||
|
||||
static gint
|
||||
do_poll (GPollFD *ufds, guint nfsd, gint timeout_)
|
||||
{
|
||||
gint res;
|
||||
GstPinosSink *this = g_private_get (&sink_key);
|
||||
|
||||
g_mutex_unlock (&this->lock);
|
||||
res = this->poll_func (ufds, nfsd, timeout_);
|
||||
g_mutex_lock (&this->lock);
|
||||
|
||||
return res;
|
||||
}
|
||||
|
||||
static gpointer
|
||||
handle_mainloop (GstPinosSink *this)
|
||||
{
|
||||
g_mutex_lock (&this->lock);
|
||||
g_private_set (&sink_key, this);
|
||||
this->poll_func = g_main_context_get_poll_func (this->context);
|
||||
g_main_context_set_poll_func (this->context, do_poll);
|
||||
g_main_context_push_thread_default (this->context);
|
||||
g_print ("run mainloop\n");
|
||||
g_main_loop_run (this->loop);
|
||||
g_print ("quit mainloop\n");
|
||||
g_main_context_pop_thread_default (this->context);
|
||||
g_mutex_unlock (&this->lock);
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static void
|
||||
on_state_notify (GObject *gobject,
|
||||
GParamSpec *pspec,
|
||||
gpointer user_data)
|
||||
on_context_notify (GObject *gobject,
|
||||
GParamSpec *pspec,
|
||||
gpointer user_data)
|
||||
{
|
||||
GstPinosSink *pinossink = user_data;
|
||||
PinosContext *ctx = PINOS_CONTEXT (gobject);
|
||||
PinosContextState state;
|
||||
|
||||
state = pinos_context_get_state (pinossink->ctx);
|
||||
g_print ("got context state %d\n", state);
|
||||
g_cond_broadcast (&pinossink->cond);
|
||||
state = pinos_context_get_state (ctx);
|
||||
GST_DEBUG ("got context state %d\n", state);
|
||||
|
||||
if (state == PINOS_CONTEXT_STATE_ERROR) {
|
||||
GST_ELEMENT_ERROR (pinossink, RESOURCE, FAILED,
|
||||
("Failed to connect stream: %s",
|
||||
pinos_context_get_error (pinossink->ctx)->message), (NULL));
|
||||
switch (state) {
|
||||
case PINOS_CONTEXT_STATE_UNCONNECTED:
|
||||
case PINOS_CONTEXT_STATE_CONNECTING:
|
||||
case PINOS_CONTEXT_STATE_REGISTERING:
|
||||
case PINOS_CONTEXT_STATE_READY:
|
||||
break;
|
||||
case PINOS_CONTEXT_STATE_ERROR:
|
||||
GST_ELEMENT_ERROR (pinossink, RESOURCE, FAILED,
|
||||
("context error: %s",
|
||||
pinos_context_get_error (pinossink->ctx)->message), (NULL));
|
||||
break;
|
||||
}
|
||||
pinos_main_loop_signal (pinossink->loop, FALSE);
|
||||
}
|
||||
|
||||
static gboolean
|
||||
gst_pinos_sink_open (GstPinosSink * pinossink)
|
||||
{
|
||||
g_mutex_lock (&pinossink->lock);
|
||||
GError *error = NULL;
|
||||
|
||||
pinossink->context = g_main_context_new ();
|
||||
GST_DEBUG ("context %p\n", pinossink->context);
|
||||
|
||||
pinossink->loop = pinos_main_loop_new (pinossink->context, "pinos-sink-loop");
|
||||
if (!pinos_main_loop_start (pinossink->loop, &error))
|
||||
goto mainloop_error;
|
||||
|
||||
pinos_main_loop_lock (pinossink->loop);
|
||||
pinossink->ctx = pinos_context_new (pinossink->context, "test-client", NULL);
|
||||
g_signal_connect (pinossink->ctx, "notify::state", (GCallback) on_state_notify, pinossink);
|
||||
g_signal_connect (pinossink->ctx, "notify::state", (GCallback) on_context_notify, pinossink);
|
||||
|
||||
pinos_context_connect(pinossink->ctx, PINOS_CONTEXT_FLAGS_NONE);
|
||||
|
||||
|
|
@ -435,16 +427,22 @@ gst_pinos_sink_open (GstPinosSink * pinossink)
|
|||
if (state == PINOS_CONTEXT_STATE_ERROR)
|
||||
goto connect_error;
|
||||
|
||||
g_cond_wait (&pinossink->cond, &pinossink->lock);
|
||||
pinos_main_loop_wait (pinossink->loop);
|
||||
}
|
||||
g_mutex_unlock (&pinossink->lock);
|
||||
pinos_main_loop_unlock (pinossink->loop);
|
||||
|
||||
return TRUE;
|
||||
|
||||
/* ERRORS */
|
||||
mainloop_error:
|
||||
{
|
||||
GST_ELEMENT_ERROR (pinossink, RESOURCE, FAILED,
|
||||
("Failed to start mainloop: %s", error->message), (NULL));
|
||||
return FALSE;
|
||||
}
|
||||
connect_error:
|
||||
{
|
||||
g_mutex_unlock (&pinossink->lock);
|
||||
pinos_main_loop_unlock (pinossink->loop);
|
||||
return FALSE;
|
||||
}
|
||||
}
|
||||
|
|
@ -452,13 +450,12 @@ connect_error:
|
|||
static gboolean
|
||||
gst_pinos_sink_close (GstPinosSink * pinossink)
|
||||
{
|
||||
|
||||
g_mutex_lock (&pinossink->lock);
|
||||
pinos_main_loop_lock (pinossink->loop);
|
||||
if (pinossink->stream) {
|
||||
pinos_stream_disconnect (pinossink->stream);
|
||||
}
|
||||
if (pinossink->ctx) {
|
||||
pinos_context_disconnect(pinossink->ctx);
|
||||
pinos_context_disconnect (pinossink->ctx);
|
||||
|
||||
while (TRUE) {
|
||||
PinosContextState state = pinos_context_get_state (pinossink->ctx);
|
||||
|
|
@ -469,10 +466,16 @@ gst_pinos_sink_close (GstPinosSink * pinossink)
|
|||
if (state == PINOS_CONTEXT_STATE_ERROR)
|
||||
break;
|
||||
|
||||
g_cond_wait (&pinossink->cond, &pinossink->lock);
|
||||
pinos_main_loop_wait (pinossink->loop);
|
||||
}
|
||||
}
|
||||
g_mutex_unlock (&pinossink->lock);
|
||||
pinos_main_loop_unlock (pinossink->loop);
|
||||
|
||||
pinos_main_loop_stop (pinossink->loop);
|
||||
g_clear_object (&pinossink->loop);
|
||||
g_clear_object (&pinossink->stream);
|
||||
g_clear_object (&pinossink->ctx);
|
||||
g_main_context_unref (pinossink->context);
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
|
@ -485,14 +488,8 @@ gst_pinos_sink_change_state (GstElement * element, GstStateChange transition)
|
|||
|
||||
switch (transition) {
|
||||
case GST_STATE_CHANGE_NULL_TO_READY:
|
||||
this->context = g_main_context_new ();
|
||||
g_print ("context %p\n", this->context);
|
||||
this->loop = g_main_loop_new (this->context, FALSE);
|
||||
this->thread = g_thread_new ("pinos", (GThreadFunc) handle_mainloop, this);
|
||||
if (!gst_pinos_sink_open (this)) {
|
||||
ret = GST_STATE_CHANGE_FAILURE;
|
||||
goto exit;
|
||||
}
|
||||
if (!gst_pinos_sink_open (this))
|
||||
goto open_failed;
|
||||
break;
|
||||
case GST_STATE_CHANGE_READY_TO_PAUSED:
|
||||
break;
|
||||
|
|
@ -515,17 +512,15 @@ gst_pinos_sink_change_state (GstElement * element, GstStateChange transition)
|
|||
break;
|
||||
case GST_STATE_CHANGE_READY_TO_NULL:
|
||||
gst_pinos_sink_close (this);
|
||||
g_main_loop_quit (this->loop);
|
||||
g_thread_join (this->thread);
|
||||
g_main_loop_unref (this->loop);
|
||||
g_clear_object (&this->stream);
|
||||
g_clear_object (&this->ctx);
|
||||
g_main_context_unref (this->context);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
exit:
|
||||
return ret;
|
||||
|
||||
/* ERRORS */
|
||||
open_failed:
|
||||
{
|
||||
return GST_STATE_CHANGE_FAILURE;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue