forked/ustreamer
1
0
Fork 0
mirror of https://github.com/pikvm/ustreamer.git synced 2026-04-11 00:56:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

reverted client lock

Browse Source
This commit is contained in:
Maxim Devaev
2022-07-11 00:22:16 +03:00
parent 17bd25d497
commit 42237d9728
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
janus/src/plugin.c
View File

@@ -129,7 +129,9 @@ static void *_clients_video_thread(UNUSED void *arg) {
if (memsink_fd_get_frame(fd, mem, frame, &frame_id) != 0) { if (memsink_fd_get_frame(fd, mem, frame, &frame_id) != 0) {
goto close_memsink; goto close_memsink;
} }
LOCK;
rtpv_wrap(_g_rtpv, frame); rtpv_wrap(_g_rtpv, frame);
UNLOCK;
} else if (result == -1) { } else if (result == -1) {
goto close_memsink; goto close_memsink;
} }
@@ -197,7 +199,9 @@ static void *_clients_audio_thread(UNUSED void *arg) {
uint64_t pts; uint64_t pts;
int result = audio_get_encoded(audio, data, &size, &pts); int result = audio_get_encoded(audio, data, &size, &pts);
if (result == 0) { if (result == 0) {
LOCK;
rtpa_wrap(_g_rtpa, data, size, pts); rtpa_wrap(_g_rtpa, data, size, pts);
UNLOCK;
} else if (result == -1) { } else if (result == -1) {
goto close_audio; goto close_audio;
} }
@@ -215,11 +219,9 @@ static void *_clients_audio_thread(UNUSED void *arg) {
#undef IF_NOT_REPORTED #undef IF_NOT_REPORTED
static void _relay_rtp_clients(const rtp_s *rtp) { static void _relay_rtp_clients(const rtp_s *rtp) {
LOCK;
LIST_ITERATE(_g_clients, client, { LIST_ITERATE(_g_clients, client, {
client_send(client, rtp); client_send(client, rtp);
}); });
UNLOCK;
} }
static int _plugin_init(janus_callbacks *gw, const char *config_dir_path) { static int _plugin_init(janus_callbacks *gw, const char *config_dir_path) {