mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-19 20:46:22 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtmp2/connection: Discern reasons for cancelling all commands

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:01:10 +01:00 committed by GStreamer Marge Bot
parent 297cdaa381
commit 39bab56a08
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -372,7 +372,7 @@ gst_rtmp_connection_new (GSocketConnection * connection,
} }
static void static void
cancel_all_commands (GstRtmpConnection * self) cancel_all_commands (GstRtmpConnection * self, const gchar * reason)
{ {
GList *l; GList *l;
@ -380,7 +380,7 @@ cancel_all_commands (GstRtmpConnection * self)
Transaction *cc = l->data; Transaction *cc = l->data;
GST_LOG_OBJECT (self, "calling transaction callback %s", GST_LOG_OBJECT (self, "calling transaction callback %s",
GST_DEBUG_FUNCPTR_NAME (cc->func)); GST_DEBUG_FUNCPTR_NAME (cc->func));
cc->func ("<cancelled>", NULL, cc->user_data); cc->func (reason, NULL, cc->user_data);
} }
g_list_free_full (self->transactions, transaction_free); g_list_free_full (self->transactions, transaction_free);
self->transactions = NULL; self->transactions = NULL;
@ -389,7 +389,7 @@ cancel_all_commands (GstRtmpConnection * self)
ExpectedCommand *cc = l->data; ExpectedCommand *cc = l->data;
GST_LOG_OBJECT (self, "calling expected command callback %s", GST_LOG_OBJECT (self, "calling expected command callback %s",
GST_DEBUG_FUNCPTR_NAME (cc->func)); GST_DEBUG_FUNCPTR_NAME (cc->func));
cc->func ("<cancelled>", NULL, cc->user_data); cc->func (reason, NULL, cc->user_data);
} }
g_list_free_full (self->expected_commands, expected_command_free); g_list_free_full (self->expected_commands, expected_command_free);
self->expected_commands = NULL; self->expected_commands = NULL;
@ -403,7 +403,7 @@ gst_rtmp_connection_close (GstRtmpConnection * self)
} }
g_cancellable_cancel (self->cancellable); g_cancellable_cancel (self->cancellable);
cancel_all_commands (self); cancel_all_commands (self, "connection closed locally");
if (self->input_source) { if (self->input_source) {
g_source_destroy (self->input_source); g_source_destroy (self->input_source);
@ -581,7 +581,7 @@ gst_rtmp_connection_emit_error (GstRtmpConnection * self)
{ {
if (!self->error) { if (!self->error) {
self->error = TRUE; self->error = TRUE;
cancel_all_commands (self); cancel_all_commands (self, "connection error");
g_signal_emit (self, signals[SIGNAL_ERROR], 0); g_signal_emit (self, signals[SIGNAL_ERROR], 0);
} }
} }