mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 04:01:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

player/transcoder: Use bus signal watch

Browse source 
Instead of implementing exactly the same thing ourself but making
`GstBus` not know that it is the case.

Since we are *sure* that the bus can't have been access at the point
where we add the watch we are guaranteed that the current thread
maincontext is going to be used.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1870>
This commit is contained in:
Thibault Saunier 2020-12-10 16:29:31 -03:00 committed by GStreamer Merge Bot
parent 3ce1086b14
commit 76bc578bae
2 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gst-libs/gst/player/gstplayer.c
View file

@ -2877,7 +2877,6 @@ gst_player_main (gpointer data)
GstPlayer *self = GST_PLAYER (data);
GstBus *bus;
GSource *source;
GSource *bus_source;
GstElement *scaletempo;
const gchar *env;
@ -2927,10 +2926,7 @@ gst_player_main (gpointer data)
}
self->bus = bus = gst_element_get_bus (self->playbin);
bus_source = gst_bus_create_watch (bus);
g_source_set_callback (bus_source, (GSourceFunc) gst_bus_async_signal_func,
NULL, NULL);
g_source_attach (bus_source, self->context);
gst_bus_add_signal_watch (bus);
g_signal_connect (G_OBJECT (bus), "message::error", G_CALLBACK (error_cb),
self);
@ -2993,8 +2989,7 @@ gst_player_main (gpointer data)
g_main_loop_run (self->loop);
GST_TRACE_OBJECT (self, "Stopped main loop");
g_source_destroy (bus_source);
g_source_unref (bus_source);
gst_bus_remove_signal_watch (bus);
gst_object_unref (bus);
remove_tick_source (self);

9
gst-libs/gst/transcoder/gsttranscoder.c
View file

@ -920,7 +920,6 @@ gst_transcoder_main (gpointer data)
GstTranscoder *self = GST_TRANSCODER (data);
GstBus *bus;
GSource *source;
GSource *bus_source;
GST_TRACE_OBJECT (self, "Starting main thread");
@ -933,10 +932,7 @@ gst_transcoder_main (gpointer data)
g_source_unref (source);
self->bus = bus = gst_element_get_bus (self->transcodebin);
bus_source = gst_bus_create_watch (bus);
g_source_set_callback (bus_source, (GSourceFunc) gst_bus_async_signal_func,
NULL, NULL);
g_source_attach (bus_source, self->context);
gst_bus_add_signal_watch (bus);
g_signal_connect (G_OBJECT (bus), "message::error", G_CALLBACK (error_cb),
self);
@ -965,8 +961,7 @@ gst_transcoder_main (gpointer data)
g_main_loop_run (self->loop);
GST_TRACE_OBJECT (self, "Stopped main loop");
g_source_destroy (bus_source);
g_source_unref (bus_source);
gst_bus_remove_signal_watch (bus);
gst_object_unref (bus);
remove_tick_source (self);