Skip to content

Commit

Permalink
Change session 'started' property in VideoRoom to atomic
Browse files Browse the repository at this point in the history
  • Loading branch information
@lminiero
lminiero committed Jun 15, 2020
1 parent dacb4ed commit dc0b4e0
Showing 1 changed file with 14 additions and 15 deletions.
29 changes: 14 additions & 15 deletions plugins/janus_videoroom.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1448,8 +1448,7 @@ typedef struct janus_videoroom_session {
gint64 sdp_version;
janus_videoroom_p_type participant_type;
gpointer participant;
gboolean started;
gboolean stopping;
volatile gint started;
volatile gint dataready;
volatile gint hangingup;
volatile gint destroyed;
Expand Down Expand Up @@ -4340,7 +4339,7 @@ static json_t *janus_videoroom_process_synchronous_request(janus_videoroom_sessi
goto prepare_response;
}
participant->kicked = TRUE;
participant->session->started = FALSE;
g_atomic_int_set(&participant->session->started, 0);
participant->audio_active = FALSE;
participant->video_active = FALSE;
participant->data_active = FALSE;
Expand Down Expand Up @@ -4427,8 +4426,8 @@ static json_t *janus_videoroom_process_synchronous_request(janus_videoroom_sessi
json_object_set_new(pl, "id", string_ids ? json_string(p->user_id_str) : json_integer(p->user_id));
if(p->display)
json_object_set_new(pl, "display", json_string(p->display));
json_object_set_new(pl, "publisher", (p->sdp && p->session->started) ? json_true() : json_false());
if((p->sdp && p->session->started)) {
json_object_set_new(pl, "publisher", (p->sdp && g_atomic_int_get(&p->session->started)) ? json_true() : json_false());
if(p->sdp && g_atomic_int_get(&p->session->started)) {
if(p->audio_level_extmap_id > 0)
json_object_set_new(pl, "talking", p->talking ? json_true() : json_false());
}
Expand Down Expand Up @@ -4790,7 +4789,7 @@ void janus_videoroom_setup_media(janus_plugin_session *handle) {
janus_mutex_unlock(&sessions_mutex);

/* Media relaying can start now */
session->started = TRUE;
g_atomic_int_set(&session->started, 1);
if(session->participant) {
/* If this is a publisher, notify all subscribers about the fact they can
* now subscribe; if this is a subscriber, instead, ask the publisher a FIR */
Expand Down Expand Up @@ -5457,7 +5456,7 @@ static void janus_videoroom_hangup_media_internal(janus_plugin_session *handle)
janus_mutex_unlock(&sessions_mutex);
return;
}
session->started = FALSE;
g_atomic_int_set(&session->started, 0);
if(g_atomic_int_get(&session->destroyed)) {
janus_mutex_unlock(&sessions_mutex);
return;
Expand Down Expand Up @@ -5861,7 +5860,7 @@ static void *janus_videoroom_handler(void *data) {
g_hash_table_iter_init(&iter, publisher->room->participants);
while (!g_atomic_int_get(&publisher->room->destroyed) && g_hash_table_iter_next(&iter, NULL, &value)) {
janus_videoroom_publisher *p = value;
if(p == publisher || !p->sdp || !p->session->started) {
if(p == publisher || !p->sdp || !g_atomic_int_get(&p->session->started)) {
/* Check if we're also notifying normal joins and not just publishers */
if(p != publisher && publisher->room->notify_joining) {
json_t *al = json_object();
Expand Down Expand Up @@ -6247,7 +6246,7 @@ static void *janus_videoroom_handler(void *data) {
json_t *user_audio_level_average = json_object_get(root, "audio_level_average");
if(audio) {
gboolean audio_active = json_is_true(audio);
if(session->started && audio_active && !participant->audio_active) {
if(g_atomic_int_get(&session->started) && audio_active && !participant->audio_active) {
/* Audio was just resumed, try resetting the RTP headers for viewers */
janus_mutex_lock(&participant->subscribers_mutex);
GSList *ps = participant->subscribers;
Expand Down Expand Up @@ -6283,7 +6282,7 @@ static void *janus_videoroom_handler(void *data) {
}
if(video) {
gboolean video_active = json_is_true(video);
if(session->started && video_active && !participant->video_active) {
if(g_atomic_int_get(&session->started) && video_active && !participant->video_active) {
/* Video was just resumed, try resetting the RTP headers for viewers */
janus_mutex_lock(&participant->subscribers_mutex);
GSList *ps = participant->subscribers;
Expand Down Expand Up @@ -6328,7 +6327,7 @@ static void *janus_videoroom_handler(void *data) {
JANUS_LOG(LOG_VERB, "Setting video bitrate: %"SCNu32" (room %s, user %s)\n",
participant->bitrate, participant->room_id_str, participant->user_id_str);
/* Send a new REMB */
if(session->started)
if(g_atomic_int_get(&session->started))
participant->remb_latest = janus_get_monotonic_time();
gateway->send_remb(msg->handle, participant->bitrate);
}
Expand Down Expand Up @@ -6463,7 +6462,7 @@ static void *janus_videoroom_handler(void *data) {
participant->audio_active = FALSE;
participant->video_active = FALSE;
participant->data_active = FALSE;
session->started = FALSE;
g_atomic_int_set(&session->started, 0);
//~ session->destroy = TRUE;
} else {
janus_refcount_decrease(&participant->ref);
Expand Down Expand Up @@ -6935,7 +6934,7 @@ static void *janus_videoroom_handler(void *data) {
json_object_set_new(event, "videoroom", json_string("event"));
json_object_set_new(event, "room", string_ids ? json_string(room_id_str) : json_integer(room_id));
json_object_set_new(event, "left", json_string("ok"));
session->started = FALSE;
g_atomic_int_set(&session->started, 0);
} else {
JANUS_LOG(LOG_ERR, "Unknown request '%s'\n", request_text);
error_code = JANUS_VIDEOROOM_ERROR_INVALID_REQUEST;
Expand Down Expand Up @@ -7402,7 +7401,7 @@ static void janus_videoroom_relay_rtp_packet(gpointer data, gpointer user_data)
// JANUS_LOG(LOG_ERR, "Invalid session...\n");
return;
}
if(!session->started) {
if(!g_atomic_int_get(&session->started)) {
// JANUS_LOG(LOG_ERR, "Streaming not started yet for this session...\n");
return;
}
Expand Down Expand Up @@ -7667,7 +7666,7 @@ static void janus_videoroom_relay_data_packet(gpointer data, gpointer user_data)
if(!session || !session->handle) {
return;
}
if(!session->started || !g_atomic_int_get(&session->dataready)) {
if(!g_atomic_int_get(&session->started) || !g_atomic_int_get(&session->dataready)) {
return;
}
if(gateway != NULL && packet->data != NULL) {
Expand Down

0 comments on commit dc0b4e0

Please sign in to comment.