forked/ustreamer
1
0
Fork 0
mirror of https://github.com/pikvm/ustreamer.git synced 2026-03-23 16:03:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactoring

Browse Source
This commit is contained in:
Maxim Devaev
2022-07-12 08:58:55 +03:00
parent 69dc9b8b49
commit 5e364fb88b
3 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
janus/src/client.c
View File

@@ -55,10 +55,10 @@ void client_destroy(client_s *client) {
} }
A_THREAD_JOIN(client->video_tid); A_THREAD_JOIN(client->video_tid);
QUEUE_FREE_ITEMS_AND_DESTROY(client->video_queue, free); QUEUE_FREE_ITEMS_AND_DESTROY(client->video_queue, rtp_destroy);
if (client->audio_queue != NULL) { if (client->audio_queue != NULL) {
A_THREAD_JOIN(client->audio_tid); A_THREAD_JOIN(client->audio_tid);
QUEUE_FREE_ITEMS_AND_DESTROY(client->audio_queue, free); QUEUE_FREE_ITEMS_AND_DESTROY(client->audio_queue, rtp_destroy);
} }
free(client); free(client);
} }
@@ -70,13 +70,11 @@ void client_send(client_s *client, const rtp_s *rtp) {
) { ) {
return; return;
} }
rtp_s *new; rtp_s *new = rtp_dup(rtp);
A_CALLOC(new, 1);
memcpy(new, rtp, sizeof(rtp_s));
if (queue_put((new->video ? client->video_queue : client->audio_queue), new, 0) != 0) { if (queue_put((new->video ? client->video_queue : client->audio_queue), new, 0) != 0) {
JLOG_ERROR("client", "Session %p %s queue is full", JLOG_ERROR("client", "Session %p %s queue is full",
client->session, (new->video ? "video" : "audio")); client->session, (new->video ? "video" : "audio"));
free(new); rtp_destroy(new);
} }
} }
@@ -107,7 +105,7 @@ static void *_common_thread(void *v_client, bool video) {
janus_plugin_rtp_extensions_reset(&packet.extensions); janus_plugin_rtp_extensions_reset(&packet.extensions);
client->gw->relay_rtp(client->session, &packet); client->gw->relay_rtp(client->session, &packet);
} }
free(rtp); rtp_destroy(rtp);
} }
} }
return NULL; return NULL;

7
janus/src/rtp.c
View File

@@ -35,6 +35,13 @@ rtp_s *rtp_init(unsigned payload, bool video) {
return rtp; return rtp;
} }
rtp_s *rtp_dup(const rtp_s *rtp) {
rtp_s *new;
A_CALLOC(new, 1);
memcpy(new, rtp, sizeof(rtp_s));
return new;
}
void rtp_destroy(rtp_s *rtp) { void rtp_destroy(rtp_s *rtp) {
free(rtp); free(rtp);
} }

1
janus/src/rtp.h
View File

@@ -50,6 +50,7 @@ typedef void (*rtp_callback_f)(const rtp_s *rtp);
rtp_s *rtp_init(unsigned payload, bool video); rtp_s *rtp_init(unsigned payload, bool video);
rtp_s *rtp_dup(const rtp_s *rtp);
void rtp_destroy(rtp_s *rtp); void rtp_destroy(rtp_s *rtp);
void rtp_write_header(rtp_s *rtp, uint32_t pts, bool marked); void rtp_write_header(rtp_s *rtp, uint32_t pts, bool marked);