Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix moutpoint_mutex deadlock when rtsp reconnect fail #2542

Merged
merged 10 commits into from
Apr 8, 2021
Merged

fix moutpoint_mutex deadlock when rtsp reconnect fail #2542

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c690ea9
test
lucylu-star Feb 2, 2021
6517f20
fix deadlock when rtsp reconnect fail
lucylu-star Feb 2, 2021
9064c25
fix deadlock when destroying the mountpoint and rtsp reconnect always…
lucylu-star Feb 2, 2021
1045081
replace space with tab
lucylu-star Feb 2, 2021
d9303cb
adjust since typo
lucylu-star Feb 2, 2021
65200da
del newline and brackets
lucylu-star Feb 7, 2021
8df2253
remove the first check,only keep the second
lucylu-star Feb 24, 2021
ef8075b
merge
lucylu-star Apr 7, 2021
b2296a9
just fix code
lucylu-star Apr 8, 2021
b30a52d
revert some removed by mistake
lucylu-star Apr 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion plugins/janus_streaming.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6473,7 +6473,10 @@ static int janus_streaming_rtsp_connect_to_server(janus_streaming_mountpoint *mp
abase[0] = '\0';
int asport = 0, asport_rtcp = 0;
multiple_fds audio_fds = {-1, -1};


if(g_atomic_int_get(&mp->destroyed)){
return -8;
}
lucylu-star marked this conversation as resolved.
Show resolved Hide resolved
janus_mutex_lock(&mountpoints_mutex);
/* Parse both video and audio first before proceed to setup as curldata will be reused */
int vresult = -1;
Expand Down Expand Up @@ -7629,6 +7632,8 @@ static void *janus_streaming_relay_thread(void *data) {
close(source->video_rtcp_fd);
}
source->video_rtcp_fd = -1;
if(g_atomic_int_get(&mountpoint->destroyed))
break;
/* Now let's try to reconnect */
if(janus_streaming_rtsp_connect_to_server(mountpoint) < 0) {
/* Reconnection failed? Let's try again later */
Expand Down