Skip to content

Commit

Permalink
Notify codecs on stream published/forwarded events (#2362)
Browse files Browse the repository at this point in the history
  • Loading branch information
zevarito committed Sep 16, 2020
1 parent 979f8b1 commit 308e6b4
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions plugins/janus_videoroom.c
Original file line number Diff line number Diff line change
Expand Up @@ -3923,6 +3923,7 @@ static json_t *janus_videoroom_process_synchronous_request(janus_videoroom_sessi
json_object_set_new(info, "room", string_ids ? json_string(room_id_str) : json_integer(room_id));
json_object_set_new(info, "publisher_id", string_ids ? json_string(publisher_id_str) : json_integer(publisher_id));
json_object_set_new(info, "media", json_string("audio"));
json_object_set_new(info, "codec", json_string(janus_audiocodec_name(publisher->acodec)));
json_object_set_new(info, "stream_id", json_integer(audio_handle));
json_object_set_new(info, "host", json_string(host));
json_object_set_new(info, "port", json_integer(audio_port));
Expand All @@ -3944,6 +3945,7 @@ static json_t *janus_videoroom_process_synchronous_request(janus_videoroom_sessi
json_object_set_new(info, "room", string_ids ? json_string(room_id_str) : json_integer(room_id));
json_object_set_new(info, "publisher_id", string_ids ? json_string(publisher_id_str) : json_integer(publisher_id));
json_object_set_new(info, "media", json_string("video"));
json_object_set_new(info, "codec", json_string(janus_videocodec_name(publisher->vcodec)));
if(video_handle[1] > 0 || video_handle[2] > 0)
json_object_set_new(info, "video_substream", json_integer(0));
json_object_set_new(info, "stream_id", json_integer(video_handle[0]));
Expand All @@ -3962,6 +3964,7 @@ static json_t *janus_videoroom_process_synchronous_request(janus_videoroom_sessi
json_object_set_new(info, "room", string_ids ? json_string(room_id_str) : json_integer(room_id));
json_object_set_new(info, "publisher_id", string_ids ? json_string(publisher_id_str) : json_integer(publisher_id));
json_object_set_new(info, "media", json_string("video"));
json_object_set_new(info, "codec", json_string(janus_videocodec_name(publisher->vcodec)));
json_object_set_new(info, "video_substream", json_integer(1));
json_object_set_new(info, "stream_id", json_integer(video_handle[1]));
json_object_set_new(info, "host", json_string(host));
Expand All @@ -3979,6 +3982,7 @@ static json_t *janus_videoroom_process_synchronous_request(janus_videoroom_sessi
json_object_set_new(info, "room", string_ids ? json_string(room_id_str) : json_integer(room_id));
json_object_set_new(info, "publisher_id", string_ids ? json_string(publisher_id_str) : json_integer(publisher_id));
json_object_set_new(info, "media", json_string("video"));
json_object_set_new(info, "codec", json_string(janus_videocodec_name(publisher->vcodec)));
json_object_set_new(info, "video_substream", json_integer(2));
json_object_set_new(info, "stream_id", json_integer(video_handle[2]));
json_object_set_new(info, "host", json_string(host));
Expand Down Expand Up @@ -4842,6 +4846,8 @@ void janus_videoroom_setup_media(janus_plugin_session *handle) {
json_object_set_new(info, "event", json_string("published"));
json_object_set_new(info, "room", string_ids ? json_string(participant->room_id_str) : json_integer(participant->room_id));
json_object_set_new(info, "id", string_ids ? json_string(participant->user_id_str) : json_integer(participant->user_id));
json_object_set_new(info, "audio_codec", json_string(janus_audiocodec_name(participant->acodec)));
json_object_set_new(info, "video_codec", json_string(janus_videocodec_name(participant->vcodec)));
gateway->notify_event(&janus_videoroom_plugin, session->handle, info);
}
janus_refcount_decrease(&participant->ref);
Expand Down

0 comments on commit 308e6b4

Please sign in to comment.