eessppeelllloo/vimix
1
0
Fork 0
mirror of https://github.com/brunoherbelin/vimix.git synced 2025-12-16 12:49:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

BugFix Fail source on gstreamer error detection

Browse Source
This commit is contained in:
Bruno Herbelin
2024-03-28 12:09:23 +01:00
parent 7ca6299fba
commit 3afaaed1fb
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/MediaPlayer.cpp
View File

@@ -349,20 +349,20 @@ typedef enum {
} GstPlayFlags; } GstPlayFlags;
GstBusSyncReply mediaplayer_signal_handler(GstBus *, GstMessage *msg, gpointer ptr) GstBusSyncReply MediaPlayer::signal_handler(GstBus *, GstMessage *msg, gpointer ptr)
{ {
// only handle error messages // only handle error messages
if (GST_MESSAGE_TYPE(msg) == GST_MESSAGE_ERROR && ptr != nullptr) { if (GST_MESSAGE_TYPE(msg) == GST_MESSAGE_ERROR && ptr != nullptr) {
GError *error; // register failure in source
gchar *debugs; reinterpret_cast<MediaPlayer *>(ptr)->failed_ = true;
gst_message_parse_error(msg, &error, &debugs);
Log::Warning("MediaPlayer %s Error %s", // inform user
GError *error;
gst_message_parse_error(msg, &error, NULL);
Log::Warning("MediaPlayer %s : %s - %s",
std::to_string(reinterpret_cast<MediaPlayer*>(ptr)->id()).c_str(), std::to_string(reinterpret_cast<MediaPlayer*>(ptr)->id()).c_str(),
error->message); error->message);
g_error_free(error); g_error_free(error);
free(debugs);
} }
// drop all messages to avoid filling up the stack // drop all messages to avoid filling up the stack
@@ -504,7 +504,7 @@ void MediaPlayer::execute_open()
#else #else
// set message handler for the pipeline's bus // set message handler for the pipeline's bus
gst_bus_set_sync_handler(gst_element_get_bus(pipeline_), gst_bus_set_sync_handler(gst_element_get_bus(pipeline_),
mediaplayer_signal_handler, this, NULL); MediaPlayer::signal_handler, this, NULL);
#endif #endif
// all good // all good

1
src/MediaPlayer.h
View File

@@ -420,6 +420,7 @@ private:
static void callback_end_of_stream (GstAppSink *, gpointer); static void callback_end_of_stream (GstAppSink *, gpointer);
static GstFlowReturn callback_new_preroll (GstAppSink *, gpointer ); static GstFlowReturn callback_new_preroll (GstAppSink *, gpointer );
static GstFlowReturn callback_new_sample (GstAppSink *, gpointer); static GstFlowReturn callback_new_sample (GstAppSink *, gpointer);
static GstBusSyncReply signal_handler(GstBus *, GstMessage *, gpointer);
// global list of registered media player // global list of registered media player
static void pipeline_terminate(GstElement *p); static void pipeline_terminate(GstElement *p);