Skip to content
Open
Changes from all commits
Commits
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
12 changes: 11 additions & 1 deletion src/plugins/janus_videoroom.c
Original file line number Diff line number Diff line change
Expand Up @@ -1022,7 +1022,8 @@ room-<unique room ID>: {
"videoroom" : "event",
"room" : <room ID>,
"leaving : <unique ID of the participant who left>,
"display" : "<display name of the leaving participant, if any>"
"display" : "<display name of the leaving participant, if any>",
"metadata" : <valid json object of metadata, if any>
}
\endverbatim
*
Expand Down Expand Up @@ -1120,6 +1121,7 @@ room-<unique room ID>: {
"feed_id" : <unique ID of the publisher originating this stream>,
"feed_mid" : "<unique mid of this publisher's stream>",
"feed_display" : "<display name of this publisher, if any>",
"feed_metadata" : <valid json object of metadata of this publisher, if any>,
"send" : <true|false; whether we configured the stream to relay media>,
"codec" : "<codec used by this stream>",
"h264-profile" : "<in case H.264 is used by the stream, the negotiated profile>",
Expand Down Expand Up @@ -1227,6 +1229,7 @@ room-<unique room ID>: {
"feed_id" : <unique ID of the publisher originating this stream>,
"feed_mid" : "<unique mid of this publisher's stream>",
"feed_display" : "<display name of this publisher, if any>",
"feed_metadata" : <valid json object of metadata of this publisher, if any>,
"send" : <true|false; whether we configured the stream to relay media>,
"ready" : <true|false; whether this stream is ready to start sending media (will be false at the beginning)>
},
Expand Down Expand Up @@ -1605,6 +1608,7 @@ room-<unique room ID>: {
"id" : <unique ID to register for the remote publisher; optional, will be chosen by the plugin if missing; doesn't need to be the same as the source one>,
"secret" : "<password required to edit the room, mandatory if configured in the room>",
"display" : "<display name for the remote publisher; optional>",
"metadata" : <valid json object of metadata; optional>,
"mcast" : "<multicast group port for receiving RTP packets, if any>",
"iface" : "<network interface or IP address to bind to, if any (binds to all otherwise)>",
"port" : <local port for receiving all RTP packets; 0 will bind to a random one (default)>,
Expand Down Expand Up @@ -3566,11 +3570,15 @@ static json_t *janus_videoroom_subscriber_streams_summary(janus_videoroom_subscr
json_object_set_new(m, "feed_id", string_ids ? json_string(ps->publisher->user_id_str) : json_integer(ps->publisher->user_id));
if(ps->publisher->display)
json_object_set_new(m, "feed_display", json_string(ps->publisher->display));
if(ps->publisher->metadata)
json_object_set_new(m, "feed_metadata", json_deep_copy(ps->publisher->metadata));
/* If this is a legacy subscription, put the info in the generic part too */
if(legacy && event) {
json_object_set_new(event, "id", string_ids ? json_string(ps->publisher->user_id_str) : json_integer(ps->publisher->user_id));
if(ps->publisher->display)
json_object_set_new(event, "display", json_string(ps->publisher->display));
if(ps->publisher->metadata)
json_object_set_new(event, "metadata", json_deep_copy(ps->publisher->metadata));
}
}
if(ps->mid)
Expand Down Expand Up @@ -11084,6 +11092,8 @@ static void *janus_videoroom_handler(void *data) {
json_object_set_new(display_event, "id", string_ids ?
json_string(participant->user_id_str) : json_integer(participant->user_id));
json_object_set_new(display_event, "display", json_string(participant->display));
if(participant->metadata)
json_object_set_new(display_event, "metadata", json_deep_copy(participant->metadata));
if(participant->room && !g_atomic_int_get(&participant->room->destroyed)) {
janus_videoroom_notify_participants(participant, display_event, FALSE);
}
Expand Down