fix gstreamer plugins

Author: ardera

CMakePresets.json

@@ -13,6 +13,7 @@
                 "TRY_ENABLE_OPENGL": false,
                 "ENABLE_OPENGL": true,
                 "BUILD_GSTREAMER_VIDEO_PLAYER_PLUGIN": true,
+                "TRY_BUILD_GSTREAMER_VIDEO_PLAYER_PLUGIN": false,
                 "BUILD_GSTREAMER_AUDIO_PLAYER_PLUGIN": true,
                 "TRY_BUILD_GSTREAMER_AUDIO_PLAYER_PLUGIN": false,
                 "BUILD_SENTRY_PLUGIN": true,

src/flutter-pi.c

@@ -599,9 +599,8 @@ int flutterpi_post_delayed_platform_task(struct flutterpi *flutterpi, void_callb
     return evloop_post_delayed_task(flutterpi->platform_loop, callback, userdata, target_time_usec);
 }
 
-/// TODO: Remove
-struct evsrc *flutterpi_add_io_source(struct flutterpi *flutterpi, int fd, uint32_t events, evloop_io_handler_t callback, void *userdata) {
-    return evloop_add_io(flutterpi->platform_loop, fd, events, callback, userdata);
+struct evloop *flutterpi_get_platform_event_loop(struct flutterpi *flutterpi) {
+    return flutterpi->platform_loop;
 }
 
 struct fl_task {

src/flutter-pi.h

@@ -144,9 +144,9 @@ int flutterpi_post_platform_task(struct flutterpi *flutterpi, void_callback_t ca
 
 int flutterpi_post_delayed_platform_task(struct flutterpi *flutterpi, void_callback_t callback, void *userdata, uint64_t target_time_usec);
 
-struct evloop *flutterpi_get_raster_event_loop(struct flutterpi *flutterpi);
+struct evloop *flutterpi_get_platform_event_loop(struct flutterpi *flutterpi);
 
-int flutterpi_sd_event_add_io(sd_event_source **source_out, int fd, uint32_t events, sd_event_io_handler_t callback, void *userdata);
+struct evloop *flutterpi_get_raster_event_loop(struct flutterpi *flutterpi);
 
 int flutterpi_send_platform_message(
     struct flutterpi *flutterpi,

src/plugins/audioplayers.h

@@ -5,8 +5,9 @@
 #include <stdint.h>
 
 struct audio_player;
+struct evloop;
 
-struct audio_player *audio_player_new(char *playerId, char *channel);
+struct audio_player *audio_player_new(struct evloop *platform_loop, char *playerId, char *channel);
 
 // Instance function
 
@@ -38,7 +39,7 @@ void audio_player_set_source_url(struct audio_player *self, char *url);
 
 bool audio_player_is_id(struct audio_player *self, char *id);
 
-const char* audio_player_subscribe_channel_name(const struct audio_player *self);
+const char *audio_player_subscribe_channel_name(const struct audio_player *self);
 
 ///Asks to subscribe to channel events
 ///

src/plugins/audioplayers/player.c

@@ -12,6 +12,7 @@
 #include "platformchannel.h"
 #include "plugins/audioplayers.h"
 #include "util/asserts.h"
+#include "util/event_loop.h"
 #include "util/logging.h"
 
 struct audio_player {
@@ -35,6 +36,8 @@ struct audio_player {
     char *event_channel_name;
 
     _Atomic bool event_subscribed;
+
+    struct evsrc *busfd_event_source;
 };
 
 // Private Class functions
@@ -49,25 +52,22 @@ static void audio_player_on_duration_update(struct audio_player *self);
 static void audio_player_on_seek_completed(struct audio_player *self);
 static void audio_player_on_playback_ended(struct audio_player *self);
 
-static int on_bus_fd_ready(sd_event_source *src, int fd, uint32_t revents, void *userdata) {
-    struct audio_player *player = userdata;
+static enum event_handler_return on_bus_fd_ready(int fd, uint32_t revents, void *userdata) {
+    struct audio_player *player;
     GstMessage *msg;
 
-    (void) src;
     (void) fd;
     (void) revents;
-
-    /* DEBUG_TRACE_BEGIN(player, "on_bus_fd_ready"); */
+    ASSERT_NOT_NULL(userdata);
+    player = userdata;
 
     msg = gst_bus_pop(player->bus);
     if (msg != NULL) {
         audio_player_on_bus_message(player->bus, msg, player);
         gst_message_unref(msg);
     }
 
-    /* DEBUG_TRACE_END(player, "on_bus_fd_ready"); */
-
-    return 0;
+    return EVENT_HANDLER_CONTINUE;
 }
 
 static void audio_player_source_setup(GstElement *playbin, GstElement *source, GstElement **p_src) {
@@ -79,9 +79,8 @@ static void audio_player_source_setup(GstElement *playbin, GstElement *source, G
     }
 }
 
-struct audio_player *audio_player_new(char *player_id, char *channel) {
+struct audio_player *audio_player_new(struct evloop *platform_loop, char *player_id, char *channel) {
     GPollFD fd;
-    sd_event_source *busfd_event_source;
 
     struct audio_player *self = malloc(sizeof(struct audio_player));
     if (self == NULL) {
@@ -132,7 +131,14 @@ struct audio_player *audio_player_new(char *player_id, char *channel) {
 
     gst_bus_get_pollfd(self->bus, &fd);
 
-    flutterpi_sd_event_add_io(&busfd_event_source, fd.fd, EPOLLIN, on_bus_fd_ready, self);
+    uint32_t events = 0;
+    events |= fd.events & G_IO_IN ? EPOLLIN : 0;
+    events |= fd.events & G_IO_OUT ? EPOLLOUT : 0;
+    events |= fd.events & G_IO_PRI ? EPOLLPRI : 0;
+    events |= fd.events & G_IO_ERR ? EPOLLERR : 0;
+    events |= fd.events & G_IO_HUP ? EPOLLHUP : 0;
+
+    self->busfd_event_source = evloop_add_io(platform_loop, fd.fd, events, on_bus_fd_ready, self);
 
     // Refresh continuously to emit recurring events
     g_timeout_add(1000, (GSourceFunc) audio_player_on_refresh, self);
@@ -602,4 +608,6 @@ void audio_player_release(struct audio_player *self) {
     if (playbinState > GST_STATE_NULL) {
         gst_element_set_state(self->playbin, GST_STATE_NULL);
     }
+
+    evsrc_destroy(self->busfd_event_source);
 }

src/plugins/audioplayers/plugin.c

@@ -288,7 +288,7 @@ static struct audio_player *audioplayers_linux_plugin_get_player(char *player_id
     ASSUME(entry != NULL);
 
     LOG_DEBUG("Create player(id=%s)\n", player_id);
-    player = audio_player_new(player_id, AUDIOPLAYERS_LOCAL_CHANNEL);
+    player = audio_player_new(flutterpi_get_platform_event_loop(plugin.flutterpi), player_id, AUDIOPLAYERS_LOCAL_CHANNEL);
 
     if (player == NULL) {
         LOG_ERROR("player(id=%s) cannot be created", player_id);

src/plugins/gstreamer_video_player/player.c

@@ -22,6 +22,7 @@
 #include "plugins/gstreamer_video_player.h"
 #include "texture_registry.h"
 #include "util/collection.h"
+#include "util/event_loop.h"
 #include "util/logging.h"
 
 #ifdef DEBUG
@@ -157,7 +158,7 @@ struct gstplayer {
 
     GstElement *pipeline, *sink;
     GstBus *bus;
-    sd_event_source *busfd_events;
+    struct evsrc *busfd_events;
 
     bool is_live;
 };
@@ -613,11 +614,10 @@ static void on_bus_message(struct gstplayer *player, GstMessage *msg) {
     return;
 }
 
-static int on_bus_fd_ready(sd_event_source *s, int fd, uint32_t revents, void *userdata) {
+static enum event_handler_return on_bus_fd_ready(int fd, uint32_t revents, void *userdata) {
     struct gstplayer *player;
     GstMessage *msg;
 
-    (void) s;
     (void) fd;
     (void) revents;
 
@@ -633,7 +633,7 @@ static int on_bus_fd_ready(sd_event_source *s, int fd, uint32_t revents, void *u
 
     DEBUG_TRACE_END(player, "on_bus_fd_ready");
 
-    return 0;
+    return EVENT_HANDLER_CONTINUE;
 }
 
 static GstPadProbeReturn on_query_appsink(GstPad *pad, GstPadProbeInfo *info, void *userdata) {
@@ -849,7 +849,6 @@ void on_source_setup(GstElement *bin, GstElement *source, gpointer userdata) {
 
 static int init(struct gstplayer *player, bool force_sw_decoders) {
     GstStateChangeReturn state_change_return;
-    sd_event_source *busfd_event_source;
     GstElement *pipeline, *sink, *src;
     GstBus *bus;
     GstPad *pad;
@@ -961,7 +960,15 @@ static int init(struct gstplayer *player, bool force_sw_decoders) {
 
     gst_bus_get_pollfd(bus, &fd);
 
-    flutterpi_sd_event_add_io(&busfd_event_source, fd.fd, EPOLLIN, on_bus_fd_ready, player);
+    uint32_t events = 0;
+    events |= fd.events & G_IO_IN ? EPOLLIN : 0;
+    events |= fd.events & G_IO_OUT ? EPOLLOUT : 0;
+    events |= fd.events & G_IO_PRI ? EPOLLPRI : 0;
+    events |= fd.events & G_IO_ERR ? EPOLLERR : 0;
+    events |= fd.events & G_IO_HUP ? EPOLLHUP : 0;
+
+    struct evsrc *busfd_event_source =
+        evloop_add_io(flutterpi_get_platform_event_loop(player->flutterpi), fd.fd, events, on_bus_fd_ready, player);
 
     LOG_DEBUG("Setting state to paused...\n");
     state_change_return = gst_element_set_state(GST_ELEMENT(pipeline), GST_STATE_PAUSED);
@@ -994,7 +1001,7 @@ static int init(struct gstplayer *player, bool force_sw_decoders) {
 
 static void maybe_deinit(struct gstplayer *player) {
     if (player->busfd_events != NULL) {
-        sd_event_source_unrefp(&player->busfd_events);
+        evsrc_destroy(player->busfd_events);
     }
     if (player->sink != NULL) {
         gst_object_unref(GST_OBJECT(player->sink));