FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

srt: Avoid removing invalid sockets from the polls

Browse Source 
This would provoke error messages from SRT.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1659>
This commit is contained in:
Jan Alexander Steffens (heftig) 2020-09-25 19:17:35 +02:00
parent fda4cfd15e
commit 936f422764
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ext/srt/gstsrtobject.c
View File

@ -1159,13 +1159,14 @@ void
gst_srt_object_close (GstSRTObject * srtobject) gst_srt_object_close (GstSRTObject * srtobject)
{ {
g_mutex_lock (&srtobject->sock_lock); g_mutex_lock (&srtobject->sock_lock);
if (srtobject->poll_id != SRT_ERROR) {
srt_epoll_remove_usock (srtobject->poll_id, srtobject->sock);
}
if (srtobject->sock != SRT_INVALID_SOCK) { if (srtobject->sock != SRT_INVALID_SOCK) {
GstStructure *stats; GstStructure *stats;
if (srtobject->poll_id != SRT_ERROR) {
srt_epoll_remove_usock (srtobject->poll_id, srtobject->sock);
}
stats = gst_srt_object_accumulate_stats (srtobject, srtobject->sock); stats = gst_srt_object_accumulate_stats (srtobject, srtobject->sock);
/* FIXME: These are the final statistics for the socket before we close it. /* FIXME: These are the final statistics for the socket before we close it.
@ -1180,11 +1181,14 @@ gst_srt_object_close (GstSRTObject * srtobject)
} }
if (srtobject->listener_poll_id != SRT_ERROR) { if (srtobject->listener_poll_id != SRT_ERROR) {
if (srtobject->listener_sock != SRT_INVALID_SOCK) {
srt_epoll_remove_usock (srtobject->listener_poll_id, srt_epoll_remove_usock (srtobject->listener_poll_id,
srtobject->listener_sock); srtobject->listener_sock);
}
srt_epoll_release (srtobject->listener_poll_id); srt_epoll_release (srtobject->listener_poll_id);
srtobject->listener_poll_id = SRT_ERROR; srtobject->listener_poll_id = SRT_ERROR;
} }
if (srtobject->thread) { if (srtobject->thread) {
GThread *thread = g_steal_pointer (&srtobject->thread); GThread *thread = g_steal_pointer (&srtobject->thread);
g_mutex_unlock (&srtobject->sock_lock); g_mutex_unlock (&srtobject->sock_lock);
@ -1362,7 +1366,9 @@ gst_srt_object_wakeup (GstSRTObject * srtobject, GCancellable * cancellable)
/* Removing all socket descriptors from the monitoring list /* Removing all socket descriptors from the monitoring list
* wakes up SRT's threads. We only have one to remove. */ * wakes up SRT's threads. We only have one to remove. */
if (srtobject->sock != SRT_INVALID_SOCK && srtobject->poll_id != SRT_ERROR) {
srt_epoll_remove_usock (srtobject->poll_id, srtobject->sock); srt_epoll_remove_usock (srtobject->poll_id, srtobject->sock);
}
/* connection is only waited for in listener mode, /* connection is only waited for in listener mode,
* but there is no harm in raising signal in any case */ * but there is no harm in raising signal in any case */