projects
/
platform
/
upstream
/
gstreamer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8b8428a
)
dtls: Let sender know when we are flushing
author
Doug Nazar
<nazard@nazar.ca>
Tue, 18 May 2021 20:38:04 +0000
(16:38 -0400)
committer
GStreamer Marge Bot
<gitlab-merge-bot@gstreamer-foundation.org>
Wed, 19 May 2021 03:21:58 +0000
(
03:21
+0000)
Prevents endless loop during shutdown where we end up sending 0 bytes.
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/2229>
ext/dtls/gstdtlsenc.c
patch
|
blob
|
history
diff --git
a/ext/dtls/gstdtlsenc.c
b/ext/dtls/gstdtlsenc.c
index
09015f1
..
860671c
100644
(file)
--- a/
ext/dtls/gstdtlsenc.c
+++ b/
ext/dtls/gstdtlsenc.c
@@
-565,6
+565,9
@@
sink_chain (GstPad * pad, GstObject * parent, GstBuffer * buffer)
GST_ELEMENT_ERROR (self, RESOURCE, WRITE, (NULL), ("%s", err->message));
g_clear_error (&err);
break;
+ case GST_FLOW_FLUSHING:
+ GST_INFO_OBJECT (self, "Flushing");
+ break;
default:
g_assert_not_reached ();
break;
@@
-680,6
+683,8
@@
on_send_data (GstDtlsConnection * connection, gconstpointer data, gsize length,
GST_TRACE_OBJECT (self, "send data: releasing lock");
ret = self->src_ret == GST_FLOW_OK;
+ if (self->src_ret == GST_FLOW_FLUSHING)
+ gst_dtls_connection_set_flow_return (connection, self->src_ret);
g_mutex_unlock (&self->queue_lock);
return ret;