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

audiobridge: cleanup participant's queue and jitter buffer when muted… #3368

Merged
merged 4 commits into from
Sep 4, 2024
Merged

audiobridge: cleanup participant's queue and jitter buffer when muted… #3368

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6d94cc9
audiobridge: cleanup participant's queue and jitter buffer when muted…
atoppi May 6, 2024
0c9cb96
Cleanup also when changing room
atoppi May 6, 2024
6fba7b4
Protect participant->muted with qmutex
atoppi May 14, 2024
45b229b
Fix formatting
atoppi Sep 4, 2024
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
22 changes: 17 additions & 5 deletions src/plugins/janus_audiobridge.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4277,6 +4277,7 @@ static json_t *janus_audiobridge_process_synchronous_request(janus_audiobridge_s
goto prepare_response;
}

janus_mutex_lock(&participant->qmutex);
if(participant->muted == muted) {
/* If someone trying to mute an already muted user, or trying to unmute a user that is not mute),
then we should do nothing */
Expand All @@ -4286,12 +4287,12 @@ static json_t *janus_audiobridge_process_synchronous_request(janus_audiobridge_s
json_object_set_new(response, "audiobridge", json_string("success"));

/* Done */
janus_mutex_unlock(&participant->qmutex);
janus_mutex_unlock(&audiobridge->mutex);
janus_refcount_decrease(&audiobridge->ref);
goto prepare_response;
}

janus_mutex_lock(&participant->qmutex);
participant->muted = muted;
JANUS_LOG(LOG_VERB, "Setting muted property: %s (room %s, user %s)\n",
participant->muted ? "true" : "false", participant->room->room_id_str, participant->user_id_str);
Expand Down Expand Up @@ -4429,6 +4430,13 @@ static json_t *janus_audiobridge_process_synchronous_request(janus_audiobridge_s
g_hash_table_iter_init(&iter, audiobridge->participants);
while(g_hash_table_iter_next(&iter, NULL, &value)) {
janus_audiobridge_participant *p = value;
janus_mutex_lock(&p->qmutex);
if(p->muted != audiobridge->muted) {
/* Clear the queued packets waiting to be handled */
janus_audiobridge_participant_clear_jitter_buffer(p);
janus_audiobridge_participant_clear_inbuf(p);
}
janus_mutex_unlock(&p->qmutex);
if(g_atomic_int_get(&p->paused_events))
continue;
JANUS_LOG(LOG_VERB, "Notifying participant %s (%s)\n", p->user_id_str, p->display ? p->display : "??");
Expand Down Expand Up @@ -7139,10 +7147,10 @@ static void *janus_audiobridge_handler(void *data) {
if(muted || display || (participant->stereo && spatial) || denoise) {
if(muted) {
janus_mutex_lock(&participant->qmutex);
participant->muted = json_is_true(muted);
JANUS_LOG(LOG_VERB, "Setting muted property: %s (room %s, user %s)\n",
participant->muted ? "true" : "false", participant->room->room_id_str, participant->user_id_str);
if(participant->muted) {
if(participant->muted != json_is_true(muted)) {
participant->muted = json_is_true(muted);
JANUS_LOG(LOG_VERB, "Setting muted property: %s (room %s, user %s)\n",
participant->muted ? "true" : "false", participant->room->room_id_str, participant->user_id_str);
/* Clear the queued packets waiting to be handled */
janus_audiobridge_participant_clear_jitter_buffer(participant);
janus_audiobridge_participant_clear_inbuf(participant);
Expand Down Expand Up @@ -7625,7 +7633,11 @@ static void *janus_audiobridge_handler(void *data) {
g_free(participant->display);
participant->display = display_text ? g_strdup(display_text) : NULL;
participant->room = audiobridge;
janus_mutex_lock(&participant->qmutex);
participant->muted = muted ? json_is_true(muted) : FALSE; /* When switching to a new room, you're unmuted by default */
janus_audiobridge_participant_clear_jitter_buffer(participant);
janus_audiobridge_participant_clear_inbuf(participant);
janus_mutex_unlock(&participant->qmutex);
if(suspended && json_is_true(suspended)) {
janus_mutex_lock(&participant->suspend_cond_mutex);
g_atomic_int_set(&participant->suspended, 1);
Expand Down
Loading