[Pkg-voip-commits] [janus] 132/163: Fix issue #1030 by introducing a new flag to videoroom for joining events
Jonas Smedegaard
dr at jones.dk
Sat Oct 28 01:22:23 UTC 2017
This is an automated email from the git hooks/post-receive script.
js pushed a commit to annotated tag debian/0.2.5-1
in repository janus.
commit 8e0e3b32acf7dc2cadb509739912a490e293bcda
Author: Steven Tang <sttang at blackberry.com>
Date: Thu Oct 12 15:54:48 2017 -0400
Fix issue #1030 by introducing a new flag to videoroom for joining events
With private_id and require_pvtid, one can actually create a videoroom
with proper identity attached to every listener. However, there is no
event delivered when a listening only participant joins the room. This
requires the admin to have to poll the participants list to see if any
participants have joined and may have already been listening.
Added a new flag notify_joining to create API of the videoroom to allow
enabling an extra event sent when a participant joins the room. This
allows proper management of listening only participants by the admin.
Verified that with notify_joining enabled, a joining event is delivered
to all current participants with the new participants id and display.
Change-Id: I8217d112e65b1344d52f1c837ebd8b1f9657cd89
---
plugins/janus_videoroom.c | 36 +++++++++++++++++++++++++++++++++++-
1 file changed, 35 insertions(+), 1 deletion(-)
diff --git a/plugins/janus_videoroom.c b/plugins/janus_videoroom.c
index 1bc6953..7f72a5c 100644
--- a/plugins/janus_videoroom.c
+++ b/plugins/janus_videoroom.c
@@ -78,6 +78,7 @@ playoutdelay_ext = yes|no (whether the playout-delay RTP extension must be
negotiated/used or not for new publishers, default=yes)
record = true|false (whether this room should be recorded, default=false)
rec_dir = <folder where recordings should be stored, when enabled>
+notify_joining = yes|no (whether to notify all participants when a new participant joins the room)
\endverbatim
*
* Note that recording will work with all codecs except iSAC.
@@ -240,7 +241,8 @@ static struct janus_json_parameter create_parameters[] = {
{"playoutdelay_ext", JANUS_JSON_BOOL, 0},
{"record", JANUS_JSON_BOOL, 0},
{"rec_dir", JSON_STRING, 0},
- {"permanent", JANUS_JSON_BOOL, 0}
+ {"permanent", JANUS_JSON_BOOL, 0},
+ {"notify_joining", JANUS_JSON_BOOL, 0},
};
static struct janus_json_parameter edit_parameters[] = {
{"room", JSON_INTEGER, JANUS_JSON_PARAM_REQUIRED | JANUS_JSON_PARAM_POSITIVE},
@@ -507,6 +509,7 @@ typedef struct janus_videoroom {
gboolean check_tokens; /* Whether to check tokens when participants join (see below) */
GHashTable *allowed; /* Map of participants (as tokens) allowed to join */
janus_mutex participants_mutex;/* Mutex to protect room properties */
+ gboolean notify_joining; /* Whether an event is sent to notify all participants if a new participant joins the room */
} janus_videoroom;
static GHashTable *rooms;
static janus_mutex rooms_mutex = JANUS_MUTEX_INITIALIZER;
@@ -844,6 +847,7 @@ int janus_videoroom_init(janus_callbacks *callback, const char *config_path) {
janus_config_item *audio_level_average = janus_config_get_item(cat, "audio_level_average");
janus_config_item *videoorient_ext = janus_config_get_item(cat, "videoorient_ext");
janus_config_item *playoutdelay_ext = janus_config_get_item(cat, "playoutdelay_ext");
+ janus_config_item *notify_joining = janus_config_get_item(cat, "notify_joining");
janus_config_item *record = janus_config_get_item(cat, "record");
janus_config_item *rec_dir = janus_config_get_item(cat, "rec_dir");
/* Create the video room */
@@ -952,6 +956,10 @@ int janus_videoroom_init(janus_callbacks *callback, const char *config_path) {
if(rec_dir && rec_dir->value) {
videoroom->rec_dir = g_strdup(rec_dir->value);
}
+ /* Default not notifying the joining event */
+ videoroom->notify_joining = FALSE;
+ if(notify_joining != NULL && notify_joining->value != NULL)
+ videoroom->notify_joining = janus_is_true(notify_joining->value);
videoroom->destroyed = 0;
janus_mutex_init(&videoroom->participants_mutex);
videoroom->participants = g_hash_table_new_full(g_int64_hash, g_int64_equal, (GDestroyNotify)g_free, NULL);
@@ -1115,6 +1123,26 @@ static void janus_videoroom_notify_participants(janus_videoroom_participant *par
}
}
+static void janus_videoroom_participant_joining(janus_videoroom_participant * p) {
+ /* we need to check if the room still exists, may have been destroyed already */
+ if(p->room && !p->room->destroyed && p->room->notify_joining) {
+ json_t *event = json_object();
+ json_t *user = json_object();
+ json_object_set_new(user, "id", json_integer(p->user_id));
+ if (p->display) {
+ json_object_set_new(user, "display", json_string(p->display));
+ }
+ json_object_set_new(event, "videoroom", json_string("event"));
+ json_object_set_new(event, "room", json_integer(p->room->room_id));
+ json_object_set_new(event, "joining", user);
+ janus_mutex_lock(&p->room->participants_mutex);
+ janus_videoroom_notify_participants(p, event);
+ janus_mutex_unlock(&p->room->participants_mutex);
+ json_decref(event);
+ json_decref(user);
+ }
+}
+
static void janus_videoroom_leave_or_unpublish(janus_videoroom_participant *participant, gboolean is_leaving, gboolean kicked) {
/* we need to check if the room still exists, may have been destroyed already */
if(participant->room && !participant->room->destroyed) {
@@ -1419,6 +1447,7 @@ struct janus_plugin_result *janus_videoroom_handle_message(janus_plugin_session
json_t *audio_level_average = json_object_get(root, "audio_level_average");
json_t *videoorient_ext = json_object_get(root, "videoorient_ext");
json_t *playoutdelay_ext = json_object_get(root, "playoutdelay_ext");
+ json_t *notify_joining = json_object_get(root, "notify_joining");
json_t *record = json_object_get(root, "record");
json_t *rec_dir = json_object_get(root, "rec_dir");
json_t *permanent = json_object_get(root, "permanent");
@@ -1570,6 +1599,8 @@ struct janus_plugin_result *janus_videoroom_handle_message(janus_plugin_session
}
videoroom->videoorient_ext = videoorient_ext ? json_is_true(videoorient_ext) : TRUE;
videoroom->playoutdelay_ext = playoutdelay_ext ? json_is_true(playoutdelay_ext) : TRUE;
+ /* Default not notifying the joining event */
+ videoroom->notify_joining = notify_joining ? json_is_true(notify_joining) : FALSE;
if(record) {
videoroom->record = json_is_true(record);
}
@@ -3343,6 +3374,9 @@ static void *janus_videoroom_handler(void *data) {
json_object_set_new(event, "id", json_integer(user_id));
json_object_set_new(event, "private_id", json_integer(publisher->pvt_id));
json_object_set_new(event, "publishers", list);
+ /* Notify all participants the publisher has joined the room */
+ janus_videoroom_participant_joining(publisher);
+
/* Also notify event handlers */
if(notify_events && gateway->events_is_enabled()) {
json_t *info = json_object();
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/janus.git
More information about the Pkg-voip-commits
mailing list