mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-24 01:00:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtmp2/connection: Pass triggering GError to _emit_error

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1403>
This commit is contained in:
Jan Alexander Steffens (heftig) 2021-12-01 16:02:53 +01:00 committed by GStreamer Marge Bot
parent 39bab56a08
commit 9952be2ab3
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
subprojects/gst-plugins-bad/gst/rtmp2/rtmp/rtmpconnection.c
View file

@ -106,7 +106,8 @@ static void gst_rtmp_connection_dispose (GObject * object);
static void gst_rtmp_connection_finalize (GObject * object); static void gst_rtmp_connection_finalize (GObject * object);
static void gst_rtmp_connection_set_cancellable (GstRtmpConnection * self, static void gst_rtmp_connection_set_cancellable (GstRtmpConnection * self,
GCancellable * cancellable); GCancellable * cancellable);
static void gst_rtmp_connection_emit_error (GstRtmpConnection * self); static void gst_rtmp_connection_emit_error (GstRtmpConnection * self,
GError * error);
static gboolean gst_rtmp_connection_input_ready (GInputStream * is, static gboolean gst_rtmp_connection_input_ready (GInputStream * is,
gpointer user_data); gpointer user_data);
static void gst_rtmp_connection_start_write (GstRtmpConnection * self); static void gst_rtmp_connection_start_write (GstRtmpConnection * self);
@ -495,8 +496,7 @@ gst_rtmp_connection_input_ready (GInputStream * is, gpointer user_data)
GST_ERROR_OBJECT (sc, "read error: %s %d %s", GST_ERROR_OBJECT (sc, "read error: %s %d %s",
g_quark_to_string (error->domain), code, error->message); g_quark_to_string (error->domain), code, error->message);
gst_rtmp_connection_emit_error (sc); gst_rtmp_connection_emit_error (sc, error);
g_error_free (error);
return G_SOURCE_REMOVE; return G_SOURCE_REMOVE;
} }
@ -577,13 +577,15 @@ out:
} }
static void static void
gst_rtmp_connection_emit_error (GstRtmpConnection * self) gst_rtmp_connection_emit_error (GstRtmpConnection * self, GError * error)
{ {
if (!self->error) { if (!self->error) {
self->error = TRUE; self->error = TRUE;
cancel_all_commands (self, "connection error"); cancel_all_commands (self, error->message);
g_signal_emit (self, signals[SIGNAL_ERROR], 0); g_signal_emit (self, signals[SIGNAL_ERROR], 0);
} }
g_error_free (error);
} }
static void static void
@ -614,8 +616,7 @@ gst_rtmp_connection_write_buffer_done (GObject * obj,
"write error: %s (wrote %" G_GSIZE_FORMAT " bytes)", "write error: %s (wrote %" G_GSIZE_FORMAT " bytes)",
error->message, bytes_written); error->message, bytes_written);
} }
gst_rtmp_connection_emit_error (self); gst_rtmp_connection_emit_error (self, error);
g_error_free (error);
g_object_unref (self); g_object_unref (self);
return; return;
} }