From 4110eea4568926dc18642a544718c87118629253 Mon Sep 17 00:00:00 2001 From: Lorenzo Miniero Date: Fri, 11 Feb 2022 10:01:53 +0100 Subject: [PATCH] Support for multistream PeerConnections (replaces #1459) (#2211) --- Makefile.am | 4 +- README.md | 2 + bower.json | 2 +- conf/janus.plugin.streaming.jcfg.sample.in | 50 + configure.ac | 6 +- docs/header.html | 1 + docs/janus-doxygen.cfg | 6 +- dtls-bio.c | 21 +- dtls.c | 138 +- dtls.h | 8 +- html/admin.html | 2 +- html/audiobridgetest.html | 2 +- html/audiobridgetest.js | 39 +- html/canvas.html | 2 +- html/canvas.js | 141 +- html/citeus.html | 2 +- html/demos.html | 6 +- html/devicetest.html | 2 +- html/devicetest.js | 255 +- html/e2etest.html | 2 +- html/e2etest.js | 234 +- html/echotest.html | 2 +- html/echotest.js | 234 +- html/index.html | 8 +- html/janus.js | 358 +- html/multiopus.html | 2 +- html/multiopus.js | 167 +- html/mvideoroomtest.html | 159 + html/mvideoroomtest.js | 1046 +++ html/navbar.html | 4 +- html/nosiptest.html | 2 +- html/nosiptest.js | 252 +- html/recordplaytest.html | 2 +- html/recordplaytest.js | 206 +- html/screensharingtest.html | 2 +- html/screensharingtest.js | 191 +- html/siptest.html | 2 +- html/siptest.js | 420 +- html/streamingtest.html | 14 +- html/streamingtest.js | 625 +- html/support.html | 2 +- html/textroomtest.html | 2 +- html/videocalltest.html | 2 +- html/videocalltest.js | 246 +- html/videoroomtest.html | 8 +- html/videoroomtest.js | 357 +- html/voicemailtest.html | 2 +- html/voicemailtest.js | 4 +- html/vp9svctest.html | 2 +- html/vp9svctest.js | 348 +- ice.c | 2234 +++--- ice.h | 304 +- janus.c | 964 +-- janus.ggo | 2 +- mainpage.dox | 44 +- plugins/janus_audiobridge.c | 47 +- plugins/janus_duktape.c | 34 +- plugins/janus_duktape_data.h | 1 + plugins/janus_echotest.c | 75 +- plugins/janus_lua.c | 34 +- plugins/janus_lua_data.h | 2 +- plugins/janus_nosip.c | 41 +- plugins/janus_recordplay.c | 158 +- plugins/janus_sip.c | 60 +- plugins/janus_streaming.c | 4670 +++++++----- plugins/janus_textroom.c | 4 +- plugins/janus_videocall.c | 28 +- plugins/janus_videoroom.c | 6549 +++++++++++------ plugins/plugin.c | 5 +- plugins/plugin.h | 34 +- ...test_gstreamer_1.sh => test_gstreamer1.sh} | 0 .../streams/test_gstreamer1_multistream.sh | 16 + plugins/streams/test_gstreamer_multistream.sh | 28 + postprocessing/janus-pp-rec.ggo | 2 +- postprocessing/pcap2mjr.ggo | 2 +- record.c | 12 +- rtp.c | 373 +- rtp.h | 19 +- sdp-utils.c | 1109 +-- sdp-utils.h | 220 +- sdp.c | 1021 ++- sdp.h | 28 +- utils.h | 1 + 83 files changed, 14626 insertions(+), 9089 deletions(-) create mode 100644 html/mvideoroomtest.html create mode 100644 html/mvideoroomtest.js rename plugins/streams/{test_gstreamer_1.sh => test_gstreamer1.sh} (100%) create mode 100755 plugins/streams/test_gstreamer1_multistream.sh create mode 100755 plugins/streams/test_gstreamer_multistream.sh diff --git a/Makefile.am b/Makefile.am index 9cef085d51..98d4cbb1a9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -482,7 +482,9 @@ stream_DATA += \ plugins/streams/music.mulaw \ plugins/streams/radio.alaw \ plugins/streams/test_gstreamer.sh \ - plugins/streams/test_gstreamer_1.sh + plugins/streams/test_gstreamer1.sh \ + plugins/streams/test_gstreamer_multistream.sh \ + plugins/streams/test_gstreamer1_multistream.sh EXTRA_DIST += \ conf/janus.plugin.streaming.jcfg.sample.in \ $(stream_DATA) diff --git a/README.md b/README.md index 54dd37b615..083a31028c 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,8 @@ Janus is an open source, general purpose, WebRTC server designed and developed b For some online demos and documentations, make sure you pay the [project website](https://janus.conf.meetecho.com/) a visit! +> **Note well:** this is the main branch for the `multistream` version of Janus, which is the new version. If you want to check the legacy version of Janus instead (i.e., `0.x`, a.k.a. "master") click [here](https://github.com/meetecho/janus-gateway/tree/0.x) instead. + If you have questions on Janus, or wish to discuss Janus with us and other users, please join our [meetecho-janus](https://groups.google.com/forum/#!forum/meetecho-janus) Google Group. If you encounter bugs, please submit an issue on [GitHub](https://github.com/meetecho/janus-gateway/issues): make sure you read the [guidelines](.github/ISSUE_TEMPLATE.md) before opening an issue, though. diff --git a/bower.json b/bower.json index d1fbabd47b..6f26f82a60 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "janus-gateway", - "version": "0.11.8", + "version": "1.0.0", "homepage": "https://github.com/meetecho/janus-gateway", "authors": [ "Lorenzo Miniero ", diff --git a/conf/janus.plugin.streaming.jcfg.sample.in b/conf/janus.plugin.streaming.jcfg.sample.in index 1a3fff8bb1..62818a1624 100644 --- a/conf/janus.plugin.streaming.jcfg.sample.in +++ b/conf/janus.plugin.streaming.jcfg.sample.in @@ -138,6 +138,56 @@ rtp-sample: { secret = "adminpwd" } +# +# This is a better example that uses the new settings to configure a live +# mountpoint to send multiple streams of the same type at the same time: +# that is, not simulcasting, but different streams (e.g., two audio +# streams and two video streams). To do so, you don't set the audio, +# video and data properties inline, but use an array of properties instead, +# each identifying a single stream to add, that will then translate to +# a dedicated m-line in the SDP. For each stream, you specify the type, +# a unique ID (mid), and can provide a short description (label) so that +# the client side can know what's what when rendering the streams. Notice +# how the port/pt/rtpmap/fmtp/etc. stuff is called just like that, without +# any audio/video/data prefix: in fact, each media stream can be configured +# the same way, and it's the type that allows us to differentiate them. +# As such, you can use the same approach for creating regular mountpoints +# as well (e.g., 1 audio and 1 video) in a much clearer, and cleaner, way. +# +multistream-test: { + type = "rtp" + id = 123 + description = "Multistream test (1 audio, 2 video)" + metadata = "This is an example of a multistream mountpoint: you'll get an audio stream and two video feeds" + media = ( + { + type = "audio" + mid = "a" + label = "Audio stream" + port = 5102 + pt = 111 + rtpmap = "opus/48000/2" + }, + { + type = "video" + mid = "v1" + label = "Video stream #1" + port = 5104 + pt = 100 + rtpmap = "VP8/90000" + }, + { + type = "video" + mid = "v2" + label = "Video stream #2" + port = 5106 + pt = 100 + rtpmap = "VP8/90000" + } + ) + secret = "adminpwd" +} + # # This is a sample of the file-based streaming support. Specifically, # this simulates a radio broadcast by streaming (in a loop) raw a-Law diff --git a/configure.ac b/configure.ac index d0c0a593bd..4f7bdaf6f0 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([Janus WebRTC Server],[0.11.8],[https://github.com/meetecho/janus-gateway],[janus-gateway],[https://janus.conf.meetecho.com]) +AC_INIT([Janus WebRTC Server],[1.0.0],[https://github.com/meetecho/janus-gateway],[janus-gateway],[https://janus.conf.meetecho.com]) AC_LANG(C) AC_CONFIG_AUX_DIR([.]) AC_CONFIG_MACRO_DIR([m4]) @@ -75,9 +75,9 @@ cc*) -Wunused-but-set-variable" esac -JANUS_VERSION=118 +JANUS_VERSION=1000 AC_SUBST(JANUS_VERSION) -JANUS_VERSION_STRING="0.11.8" +JANUS_VERSION_STRING="1.0.0" AC_SUBST(JANUS_VERSION_STRING) case "$host_os" in diff --git a/docs/header.html b/docs/header.html index 3c4c91d6b8..cef89e29c3 100644 --- a/docs/header.html +++ b/docs/header.html @@ -40,6 +40,7 @@
  • Documentation
  • Papers
  • Need help?
    • +
  • Janus (0.x)
  • JanusCon!
    • diff --git a/docs/janus-doxygen.cfg b/docs/janus-doxygen.cfg index d86ec58e59..8df7243624 100644 --- a/docs/janus-doxygen.cfg +++ b/docs/janus-doxygen.cfg @@ -32,19 +32,19 @@ DOXYFILE_ENCODING = UTF-8 # title of most generated pages and in a few other places. # The default value is: My Project. -PROJECT_NAME = "Janus" +PROJECT_NAME = "Janus (multistream)" # The PROJECT_NUMBER tag can be used to enter a project or revision number. This # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 0.11.8 +PROJECT_NUMBER = 1.0.0 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a # quick idea about the purpose of the project. Keep the description short. -PROJECT_BRIEF = "Janus WebRTC Server" +PROJECT_BRIEF = "Janus WebRTC Server (multistream)" # With the PROJECT_LOGO tag one can specify a logo or an icon that is included # in the documentation. The maximum height of the logo should not exceed 55 diff --git a/dtls-bio.c b/dtls-bio.c index f566b29ffb..b681661ce7 100644 --- a/dtls-bio.c +++ b/dtls-bio.c @@ -132,17 +132,12 @@ static int janus_dtls_bio_agent_write(BIO *bio, const char *in, int inl) { JANUS_LOG(LOG_ERR, "No DTLS-SRTP stack, no DTLS bridge...\n"); return -1; } - janus_ice_component *component = (janus_ice_component *)dtls->component; - if(component == NULL) { - JANUS_LOG(LOG_ERR, "No component, no DTLS bridge...\n"); + janus_ice_peerconnection *pc = (janus_ice_peerconnection *)dtls->pc; + if(pc == NULL) { + JANUS_LOG(LOG_ERR, "No WebRTC PeerConnection, no DTLS bridge...\n"); return -1; } - janus_ice_stream *stream = component->stream; - if(!stream) { - JANUS_LOG(LOG_ERR, "No stream, no DTLS bridge...\n"); - return -1; - } - janus_ice_handle *handle = stream->handle; + janus_ice_handle *handle = pc->handle; if(!handle || !handle->agent || !dtls->write_bio) { JANUS_LOG(LOG_ERR, "No handle/agent/bio, no DTLS bridge...\n"); return -1; @@ -152,17 +147,17 @@ static int janus_dtls_bio_agent_write(BIO *bio, const char *in, int inl) { /* FIXME Just a warning for now, this will need to be solved with proper fragmentation */ JANUS_LOG(LOG_WARN, "[%"SCNu64"] The DTLS stack is trying to send a packet of %d bytes, this may be larger than the MTU and get dropped!\n", handle->handle_id, inl); } - int bytes = nice_agent_send(handle->agent, component->stream_id, component->component_id, inl, in); + int bytes = nice_agent_send(handle->agent, pc->stream_id, pc->component_id, inl, in); if(bytes < inl) { - JANUS_LOG(LOG_ERR, "[%"SCNu64"] Error sending DTLS message on component %d of stream %d (%d)\n", handle->handle_id, component->component_id, stream->stream_id, bytes); + JANUS_LOG(LOG_ERR, "[%"SCNu64"] Error sending DTLS message on component %d of stream %d (%d)\n", handle->handle_id, pc->component_id, pc->stream_id, bytes); } else { JANUS_LOG(LOG_HUGE, "[%"SCNu64"] >> >> ... and sent %d of those bytes on the socket\n", handle->handle_id, bytes); } /* Update stats (TODO Do the same for the last second window as well) * FIXME: the Data stats includes the bytes used for the handshake */ if(bytes > 0) { - component->out_stats.data.packets++; - component->out_stats.data.bytes += bytes; + pc->dtls_out_stats.info[0].packets++; + pc->dtls_out_stats.info[0].bytes += bytes; } return bytes; } diff --git a/dtls.c b/dtls.c index d0cdbd60d3..586dffeefe 100644 --- a/dtls.c +++ b/dtls.c @@ -79,13 +79,10 @@ static void janus_dtls_notify_state_change(janus_dtls_srtp *dtls) { return; if(dtls == NULL) return; - janus_ice_component *component = (janus_ice_component *)dtls->component; - if(component == NULL) + janus_ice_peerconnection *pc = (janus_ice_peerconnection *)dtls->pc; + if(pc == NULL) return; - janus_ice_stream *stream = component->stream; - if(stream == NULL) - return; - janus_ice_handle *handle = stream->handle; + janus_ice_handle *handle = pc->handle; if(handle == NULL) return; janus_session *session = (janus_session *)handle->session; @@ -93,8 +90,8 @@ static void janus_dtls_notify_state_change(janus_dtls_srtp *dtls) { return; json_t *info = json_object(); json_object_set_new(info, "dtls", json_string(janus_get_dtls_srtp_state(dtls->dtls_state))); - json_object_set_new(info, "stream_id", json_integer(stream->stream_id)); - json_object_set_new(info, "component_id", json_integer(component->component_id)); + json_object_set_new(info, "stream_id", json_integer(pc->stream_id)); + json_object_set_new(info, "component_id", json_integer(pc->component_id)); json_object_set_new(info, "retransmissions", json_integer(dtls->retransmissions)); janus_events_notify_handlers(JANUS_EVENT_TYPE_WEBRTC, JANUS_EVENT_SUBTYPE_WEBRTC_DTLS, session->session_id, handle->handle_id, handle->opaque_id, info); @@ -498,7 +495,7 @@ gint janus_dtls_srtp_init(const char *server_pem, const char *server_key, const static void janus_dtls_srtp_free(const janus_refcount *dtls_ref) { janus_dtls_srtp *dtls = janus_refcount_containerof(dtls_ref, janus_dtls_srtp, ref); /* This stack can be destroyed, free all the resources */ - dtls->component = NULL; + dtls->pc = NULL; if(dtls->ssl != NULL) { SSL_free(dtls->ssl); dtls->ssl = NULL; @@ -540,18 +537,13 @@ void janus_dtls_srtp_cleanup(void) { } -janus_dtls_srtp *janus_dtls_srtp_create(void *ice_component, janus_dtls_role role) { - janus_ice_component *component = (janus_ice_component *)ice_component; - if(component == NULL) { - JANUS_LOG(LOG_ERR, "No component, no DTLS...\n"); - return NULL; - } - janus_ice_stream *stream = component->stream; - if(!stream) { - JANUS_LOG(LOG_ERR, "No stream, no DTLS...\n"); +janus_dtls_srtp *janus_dtls_srtp_create(void *ice_pc, janus_dtls_role role) { + janus_ice_peerconnection *pc = (janus_ice_peerconnection *)ice_pc; + if(pc == NULL) { + JANUS_LOG(LOG_ERR, "No WebRTC PeerConnection, no DTLS...\n"); return NULL; } - janus_ice_handle *handle = stream->handle; + janus_ice_handle *handle = pc->handle; if(!handle || !handle->agent) { JANUS_LOG(LOG_ERR, "No handle/agent, no DTLS...\n"); return NULL; @@ -615,7 +607,7 @@ janus_dtls_srtp *janus_dtls_srtp_create(void *ice_component, janus_dtls_role rol #endif /* Done */ dtls->dtls_connected = 0; - dtls->component = component; + dtls->pc = pc; return dtls; } @@ -642,13 +634,10 @@ int janus_dtls_srtp_create_sctp(janus_dtls_srtp *dtls) { #ifdef HAVE_SCTP if(dtls == NULL) return -1; - janus_ice_component *component = (janus_ice_component *)dtls->component; - if(component == NULL) + janus_ice_peerconnection *pc = (janus_ice_peerconnection *)dtls->pc; + if(pc == NULL) return -2; - janus_ice_stream *stream = component->stream; - if(!stream) - return -3; - janus_ice_handle *handle = stream->handle; + janus_ice_handle *handle = pc->handle; if(!handle || !handle->agent) return -4; if(janus_flags_is_set(&handle->webrtc_flags, JANUS_ICE_HANDLE_WEBRTC_ALERT)) @@ -670,17 +659,12 @@ void janus_dtls_srtp_incoming_msg(janus_dtls_srtp *dtls, char *buf, uint16_t len JANUS_LOG(LOG_ERR, "No DTLS-SRTP stack, no incoming message...\n"); return; } - janus_ice_component *component = (janus_ice_component *)dtls->component; - if(component == NULL) { - JANUS_LOG(LOG_ERR, "No component, no DTLS...\n"); + janus_ice_peerconnection *pc = (janus_ice_peerconnection *)dtls->pc; + if(pc == NULL) { + JANUS_LOG(LOG_ERR, "No WebRTC PeerConnection, no DTLS...\n"); return; } - janus_ice_stream *stream = component->stream; - if(!stream) { - JANUS_LOG(LOG_ERR, "No stream, no DTLS...\n"); - return; - } - janus_ice_handle *handle = stream->handle; + janus_ice_handle *handle = pc->handle; if(!handle || !handle->agent) { JANUS_LOG(LOG_ERR, "No handle/agent, no DTLS...\n"); return; @@ -690,7 +674,7 @@ void janus_dtls_srtp_incoming_msg(janus_dtls_srtp *dtls, char *buf, uint16_t len return; } if(!dtls->ssl || !dtls->read_bio) { - JANUS_LOG(LOG_ERR, "[%"SCNu64"] No DTLS stuff for component %d in stream %d??\n", handle->handle_id, component->component_id, stream->stream_id); + JANUS_LOG(LOG_ERR, "[%"SCNu64"] No DTLS stuff for component %d in stream %d??\n", handle->handle_id, pc->component_id, pc->stream_id); return; } if(dtls->dtls_started == 0) { @@ -753,7 +737,7 @@ void janus_dtls_srtp_incoming_msg(janus_dtls_srtp *dtls, char *buf, uint16_t len unsigned char rfingerprint[EVP_MAX_MD_SIZE]; char remote_fingerprint[160]; char *rfp = (char *)&remote_fingerprint; - if(stream->remote_hashing && !strcasecmp(stream->remote_hashing, "sha-1")) { + if(pc->remote_hashing && !strcasecmp(pc->remote_hashing, "sha-1")) { JANUS_LOG(LOG_VERB, "[%"SCNu64"] Computing sha-1 fingerprint of remote certificate...\n", handle->handle_id); X509_digest(rcert, EVP_sha1(), (unsigned char *)rfingerprint, &rsize); } else { @@ -769,8 +753,8 @@ void janus_dtls_srtp_incoming_msg(janus_dtls_srtp *dtls, char *buf, uint16_t len } *(rfp-1) = 0; JANUS_LOG(LOG_VERB, "[%"SCNu64"] Remote fingerprint (%s) of the client is %s\n", - handle->handle_id, stream->remote_hashing ? stream->remote_hashing : "sha-256", remote_fingerprint); - if(!strcasecmp(remote_fingerprint, stream->remote_fingerprint ? stream->remote_fingerprint : "(none)")) { + handle->handle_id, pc->remote_hashing ? pc->remote_hashing : "sha-256", remote_fingerprint); + if(!strcasecmp(remote_fingerprint, pc->remote_fingerprint ? pc->remote_fingerprint : "(none)")) { JANUS_LOG(LOG_VERB, "[%"SCNu64"] Fingerprint is a match!\n", handle->handle_id); dtls->dtls_state = JANUS_DTLS_STATE_CONNECTED; dtls->dtls_connected = janus_get_monotonic_time(); @@ -778,7 +762,7 @@ void janus_dtls_srtp_incoming_msg(janus_dtls_srtp *dtls, char *buf, uint16_t len janus_dtls_notify_state_change(dtls); } else { /* FIXME NOT a match! MITM? */ - JANUS_LOG(LOG_ERR, "[%"SCNu64"] Fingerprint is NOT a match! got %s, expected %s\n", handle->handle_id, remote_fingerprint, stream->remote_fingerprint); + JANUS_LOG(LOG_ERR, "[%"SCNu64"] Fingerprint is NOT a match! got %s, expected %s\n", handle->handle_id, remote_fingerprint, pc->remote_fingerprint); dtls->dtls_state = JANUS_DTLS_STATE_FAILED; /* Notify event handlers */ janus_dtls_notify_state_change(dtls); @@ -830,7 +814,7 @@ void janus_dtls_srtp_incoming_msg(janus_dtls_srtp *dtls, char *buf, uint16_t len if(!SSL_export_keying_material(dtls->ssl, material, master_length*2, "EXTRACTOR-dtls_srtp", 19, NULL, 0, 0)) { /* Oops... */ JANUS_LOG(LOG_ERR, "[%"SCNu64"] Oops, couldn't extract SRTP keying material for component %d in stream %d?? (%s)\n", - handle->handle_id, component->component_id, stream->stream_id, ERR_reason_error_string(ERR_get_error())); + handle->handle_id, pc->component_id, pc->stream_id, ERR_reason_error_string(ERR_get_error())); goto done; } /* Key derivation (http://tools.ietf.org/html/rfc5764#section-4.2) */ @@ -920,21 +904,21 @@ void janus_dtls_srtp_incoming_msg(janus_dtls_srtp *dtls, char *buf, uint16_t len srtp_err_status_t res = srtp_create(&(dtls->srtp_in), &(dtls->remote_policy)); if(res != srtp_err_status_ok) { /* Something went wrong... */ - JANUS_LOG(LOG_ERR, "[%"SCNu64"] Oops, error creating inbound SRTP session for component %d in stream %d??\n", handle->handle_id, component->component_id, stream->stream_id); + JANUS_LOG(LOG_ERR, "[%"SCNu64"] Oops, error creating inbound SRTP session for component %d in stream %d??\n", handle->handle_id, pc->component_id, pc->stream_id); JANUS_LOG(LOG_ERR, "[%"SCNu64"] -- %d (%s)\n", handle->handle_id, res, janus_srtp_error_str(res)); goto done; } - JANUS_LOG(LOG_VERB, "[%"SCNu64"] Created inbound SRTP session for component %d in stream %d\n", handle->handle_id, component->component_id, stream->stream_id); + JANUS_LOG(LOG_VERB, "[%"SCNu64"] Created inbound SRTP session for component %d in stream %d\n", handle->handle_id, pc->component_id, pc->stream_id); res = srtp_create(&(dtls->srtp_out), &(dtls->local_policy)); if(res != srtp_err_status_ok) { /* Something went wrong... */ - JANUS_LOG(LOG_ERR, "[%"SCNu64"] Oops, error creating outbound SRTP session for component %d in stream %d??\n", handle->handle_id, component->component_id, stream->stream_id); + JANUS_LOG(LOG_ERR, "[%"SCNu64"] Oops, error creating outbound SRTP session for component %d in stream %d??\n", handle->handle_id, pc->component_id, pc->stream_id); JANUS_LOG(LOG_ERR, "[%"SCNu64"] -- %d (%s)\n", handle->handle_id, res, janus_srtp_error_str(res)); goto done; } dtls->srtp_profile = srtp_profile->id; dtls->srtp_valid = 1; - JANUS_LOG(LOG_VERB, "[%"SCNu64"] Created outbound SRTP session for component %d in stream %d\n", handle->handle_id, component->component_id, stream->stream_id); + JANUS_LOG(LOG_VERB, "[%"SCNu64"] Created outbound SRTP session for component %d in stream %d\n", handle->handle_id, pc->component_id, pc->stream_id); #ifdef HAVE_SCTP if(janus_flags_is_set(&handle->webrtc_flags, JANUS_ICE_HANDLE_WEBRTC_DATA_CHANNELS)) { /* Create SCTP association as well */ @@ -946,7 +930,7 @@ void janus_dtls_srtp_incoming_msg(janus_dtls_srtp *dtls, char *buf, uint16_t len done: if(!janus_flags_is_set(&handle->webrtc_flags, JANUS_ICE_HANDLE_WEBRTC_ALERT) && dtls->srtp_valid) { /* Handshake successfully completed */ - janus_ice_dtls_handshake_done(handle, component); + janus_ice_dtls_handshake_done(handle); } else { /* Something went wrong in either DTLS or SRTP... tell the plugin about it */ janus_dtls_callback(dtls->ssl, SSL_CB_ALERT, 0); @@ -993,22 +977,17 @@ void janus_dtls_callback(const SSL *ssl, int where, int ret) { JANUS_LOG(LOG_ERR, "No DTLS session related to this alert...\n"); return; } - janus_ice_component *component = dtls->component; - if(component == NULL) { - JANUS_LOG(LOG_ERR, "No ICE component related to this alert...\n"); + janus_ice_peerconnection *pc = dtls->pc; + if(pc == NULL) { + JANUS_LOG(LOG_ERR, "No WebRTC PeerConnection related to this alert...\n"); return; } - janus_ice_stream *stream = component->stream; - if(!stream) { - JANUS_LOG(LOG_ERR, "No ICE stream related to this alert...\n"); - return; - } - janus_ice_handle *handle = stream->handle; + janus_ice_handle *handle = pc->handle; if(!handle) { JANUS_LOG(LOG_ERR, "No ICE handle related to this alert...\n"); return; } - JANUS_LOG(LOG_VERB, "[%"SCNu64"] DTLS alert triggered on stream %u (component %u), closing...\n", handle->handle_id, stream->stream_id, component->component_id); + JANUS_LOG(LOG_VERB, "[%"SCNu64"] DTLS alert triggered on stream %u (component %u), closing...\n", handle->handle_id, pc->stream_id, pc->component_id); janus_ice_webrtc_hangup(handle, "DTLS alert"); } @@ -1034,17 +1013,12 @@ int janus_dtls_verify_callback(int preverify_ok, X509_STORE_CTX *ctx) { void janus_dtls_sctp_data_ready(janus_dtls_srtp *dtls) { if(dtls == NULL) return; - janus_ice_component *component = (janus_ice_component *)dtls->component; - if(component == NULL) { - JANUS_LOG(LOG_ERR, "No component...\n"); - return; - } - janus_ice_stream *stream = component->stream; - if(!stream) { - JANUS_LOG(LOG_ERR, "No stream...\n"); + janus_ice_peerconnection *pc = (janus_ice_peerconnection *)dtls->pc; + if(pc == NULL) { + JANUS_LOG(LOG_ERR, "No WebRTC PeerConnection...\n"); return; } - janus_ice_handle *handle = stream->handle; + janus_ice_handle *handle = pc->handle; if(!handle || !handle->agent || !dtls->write_bio) { JANUS_LOG(LOG_ERR, "No handle...\n"); return; @@ -1074,17 +1048,12 @@ int janus_dtls_send_sctp_data(janus_dtls_srtp *dtls, char *buf, int len) { void janus_dtls_notify_sctp_data(janus_dtls_srtp *dtls, char *label, char *protocol, gboolean textdata, char *buf, int len) { if(dtls == NULL || buf == NULL || len < 1) return; - janus_ice_component *component = (janus_ice_component *)dtls->component; - if(component == NULL) { - JANUS_LOG(LOG_ERR, "No component...\n"); + janus_ice_peerconnection *pc = (janus_ice_peerconnection *)dtls->pc; + if(pc == NULL) { + JANUS_LOG(LOG_ERR, "No WebRTC PeerConnection...\n"); return; } - janus_ice_stream *stream = component->stream; - if(!stream) { - JANUS_LOG(LOG_ERR, "No stream...\n"); - return; - } - janus_ice_handle *handle = stream->handle; + janus_ice_handle *handle = pc->handle; if(!handle || !handle->agent || !dtls->write_bio) { JANUS_LOG(LOG_ERR, "No handle...\n"); return; @@ -1097,13 +1066,10 @@ gboolean janus_dtls_retry(gpointer stack) { janus_dtls_srtp *dtls = (janus_dtls_srtp *)stack; if(dtls == NULL) return FALSE; - janus_ice_component *component = (janus_ice_component *)dtls->component; - if(component == NULL) + janus_ice_peerconnection *pc = (janus_ice_peerconnection *)dtls->pc; + if(pc == NULL) return FALSE; - janus_ice_stream *stream = component->stream; - if(!stream) - goto stoptimer; - janus_ice_handle *handle = stream->handle; + janus_ice_handle *handle = pc->handle; if(!handle) goto stoptimer; if(janus_flags_is_set(&handle->webrtc_flags, JANUS_ICE_HANDLE_WEBRTC_STOP)) @@ -1115,7 +1081,7 @@ gboolean janus_dtls_retry(gpointer stack) { if(janus_get_monotonic_time() - dtls->dtls_started >= 20*G_USEC_PER_SEC) { /* FIXME Should we really give up after 20 seconds waiting for DTLS? */ JANUS_LOG(LOG_ERR, "[%"SCNu64"] DTLS taking too much time for component %d in stream %d...\n", - handle->handle_id, component->component_id, stream->stream_id); + handle->handle_id, pc->component_id, pc->stream_id); janus_ice_webrtc_hangup(handle, "DTLS timeout"); goto stoptimer; } @@ -1128,7 +1094,7 @@ gboolean janus_dtls_retry(gpointer stack) { JANUS_LOG(LOG_HUGE, "[%"SCNu64"] DTLSv1_get_timeout: %"SCNu64"\n", handle->handle_id, timeout_value); if(timeout_value == 0) { dtls->retransmissions++; - JANUS_LOG(LOG_VERB, "[%"SCNu64"] DTLS timeout on component %d of stream %d, retransmitting\n", handle->handle_id, component->component_id, stream->stream_id); + JANUS_LOG(LOG_VERB, "[%"SCNu64"] DTLS timeout on component %d of stream %d, retransmitting\n", handle->handle_id, pc->component_id, pc->stream_id); /* Notify event handlers */ janus_dtls_notify_state_change(dtls); /* Retransmit the packet */ @@ -1137,10 +1103,10 @@ gboolean janus_dtls_retry(gpointer stack) { return TRUE; stoptimer: - if(component->dtlsrt_source != NULL) { - g_source_destroy(component->dtlsrt_source); - g_source_unref(component->dtlsrt_source); - component->dtlsrt_source = NULL; + if(pc->dtlsrt_source != NULL) { + g_source_destroy(pc->dtlsrt_source); + g_source_unref(pc->dtlsrt_source); + pc->dtlsrt_source = NULL; } return FALSE; } diff --git a/dtls.h b/dtls.h index 152c0e2024..79b12e779e 100644 --- a/dtls.h +++ b/dtls.h @@ -64,8 +64,8 @@ typedef enum janus_dtls_state { /*! \brief Janus DTLS-SRTP handle */ typedef struct janus_dtls_srtp { - /*! \brief Opaque pointer to the component this DTLS-SRTP context belongs to */ - void *component; + /*! \brief Opaque pointer to the WebRTC PeerConnection this DTLS-SRTP context belongs to */ + void *pc; /*! \brief DTLS role of the server for this stream: 1=client, 0=server */ janus_dtls_role dtls_role; /*! \brief DTLS state of this component: -1=failed, 0=nothing, 1=trying, 2=connected */ @@ -108,10 +108,10 @@ typedef struct janus_dtls_srtp { /*! \brief Create a janus_dtls_srtp instance - * @param[in] component Opaque pointer to the component owning that will use the stack + * @param[in] pc Opaque pointer to the WebRTC PeerConnection owning the stack * @param[in] role The role of the DTLS stack (client/server) * @returns A new janus_dtls_srtp instance if successful, NULL otherwise */ -janus_dtls_srtp *janus_dtls_srtp_create(void *component, janus_dtls_role role); +janus_dtls_srtp *janus_dtls_srtp_create(void *pc, janus_dtls_role role); /*! \brief Start a DTLS handshake * @param[in] dtls The janus_dtls_srtp instance to start the handshake on */ void janus_dtls_srtp_handshake(janus_dtls_srtp *dtls); diff --git a/html/admin.html b/html/admin.html index 22f501f864..592a4d87f0 100644 --- a/html/admin.html +++ b/html/admin.html @@ -4,7 +4,7 @@ -Janus WebRTC Server: Admin/Monitor +Janus WebRTC Server (multistream): Admin/Monitor diff --git a/html/audiobridgetest.html b/html/audiobridgetest.html index 785a77d049..51aabf539c 100644 --- a/html/audiobridgetest.html +++ b/html/audiobridgetest.html @@ -4,7 +4,7 @@ -Janus WebRTC Server: Audio Bridge Demo +Janus WebRTC Server (multistream): Audio Bridge Demo diff --git a/html/audiobridgetest.js b/html/audiobridgetest.js index f757789708..8a8647ce8c 100644 --- a/html/audiobridgetest.js +++ b/html/audiobridgetest.js @@ -52,6 +52,7 @@ var janus = null; var mixertest = null; var opaqueId = "audiobridgetest-"+Janus.randomString(12); +var remoteStream = null; var spinner = null; var myroom = 1234; // Demo room @@ -132,8 +133,8 @@ $(document).ready(function() { iceState: function(state) { Janus.log("ICE state changed to " + state); }, - mediaState: function(medium, on) { - Janus.log("Janus " + (on ? "started" : "stopped") + " receiving our " + medium); + mediaState: function(medium, on, mid) { + Janus.log("Janus " + (on ? "started" : "stopped") + " receiving our " + medium + " (mid=" + mid + ")"); }, webrtcState: function(on) { Janus.log("Janus says our WebRTC PeerConnection is " + (on ? "up" : "down") + " now"); @@ -327,23 +328,40 @@ $(document).ready(function() { mixertest.handleRemoteJsep({ jsep: jsep }); } }, - onlocalstream: function(stream) { - Janus.debug(" ::: Got a local stream :::", stream); + onlocaltrack: function(track, on) { + Janus.debug("Local track " + (on ? "added" : "removed") + ":", track); // We're not going to attach the local audio stream $('#audiojoin').hide(); $('#room').removeClass('hide').show(); $('#participant').removeClass('hide').html(myusername).show(); }, - onremotestream: function(stream) { + onremotetrack: function(track, mid, on) { + Janus.debug("Remote track (mid=" + mid + ") " + (on ? "added" : "removed") + ":", track); + if(remoteStream || track.kind !== "audio") + return; + if(!on) { + // Track removed, get rid of the stream and the rendering + if(remoteStream) { + try { + var tracks = remoteStream.getTracks(); + for(var i in tracks) { + var mst = tracks[i]; + if(mst) + mst.stop(); + } + } catch(e) {} + } + remoteStream = null; + $('#roomaudio').remove(); + return; + } + remoteStream = new MediaStream(); + remoteStream.addTrack(track.clone()); $('#room').removeClass('hide').show(); - var addButtons = false; if($('#roomaudio').length === 0) { - addButtons = true; $('#mixedaudio').append('
    diff --git a/html/streamingtest.js b/html/streamingtest.js index 3f9937f11c..2c87bc80d0 100644 --- a/html/streamingtest.js +++ b/html/streamingtest.js @@ -52,11 +52,13 @@ var janus = null; var streaming = null; var opaqueId = "streamingtest-"+Janus.randomString(12); -var bitrateTimer = null; -var spinner = null; +var remoteTracks = {}, remoteVideos = 0, dataMid = null; +var bitrateTimer = {}; +var spinner = {}; -var simulcastStarted = false, svcStarted = false; +var simulcastStarted = {}, svcStarted = {}; +var streamsList = {}; var selectedStream = null; @@ -91,7 +93,9 @@ $(document).ready(function() { $('#start').removeAttr('disabled').html("Stop") .click(function() { $(this).attr('disabled', true); - clearInterval(bitrateTimer); + for(var i in bitrateTimer) + clearInterval(bitrateTimer[i]); + bitrateTimer = {}; janus.destroy(); $('#streamslist').attr('disabled', true); $('#watch').attr('disabled', true).unbind('click'); @@ -108,6 +112,10 @@ $(document).ready(function() { webrtcState: function(on) { Janus.log("Janus says our WebRTC PeerConnection is " + (on ? "up" : "down") + " now"); }, + slowLink: function(uplink, lost, mid) { + Janus.warn("Janus reports problems " + (uplink ? "sending" : "receiving") + + " packets on mid " + mid + " (" + lost + " lost packets)"); + }, onmessage: function(msg, jsep) { Janus.debug(" ::: Got a message :::", msg); var result = msg["result"]; @@ -121,27 +129,29 @@ $(document).ready(function() { else if(status === 'stopped') stopStream(); } else if(msg["streaming"] === "event") { + // Does this event refer to a mid in particular? + var mid = result["mid"] ? result["mid"] : "0"; // Is simulcast in place? var substream = result["substream"]; var temporal = result["temporal"]; if((substream !== null && substream !== undefined) || (temporal !== null && temporal !== undefined)) { - if(!simulcastStarted) { - simulcastStarted = true; - addSimulcastButtons(); + if(!simulcastStarted[mid]) { + simulcastStarted[mid] = true; + addSimulcastButtons(mid); } // We just received notice that there's been a switch, update the buttons - updateSimulcastButtons(substream, temporal); + updateSimulcastButtons(mid, substream, temporal); } // Is VP9/SVC in place? var spatial = result["spatial_layer"]; temporal = result["temporal_layer"]; if((spatial !== null && spatial !== undefined) || (temporal !== null && temporal !== undefined)) { - if(!svcStarted) { - svcStarted = true; - addSvcButtons(); + if(!svcStarted[mid]) { + svcStarted[mid] = true; + addSvcButtons(mid); } // We just received notice that there's been a switch, update the buttons - updateSvcButtons(spatial, temporal); + updateSvcButtons(mid, spatial, temporal); } } } else if(msg["error"]) { @@ -168,7 +178,7 @@ $(document).ready(function() { Janus.debug("Got SDP!", jsep); var body = { request: "start" }; streaming.send({ message: body, jsep: jsep }); - $('#watch').html("Stop").removeAttr('disabled').click(stopStream); + $('#watch').html("Stop").removeAttr('disabled').unbind('click').click(stopStream); }, error: function(error) { Janus.error("WebRTC error:", error); @@ -177,83 +187,124 @@ $(document).ready(function() { }); } }, - onremotestream: function(stream) { - Janus.debug(" ::: Got a remote stream :::", stream); - var addButtons = false; - if($('#remotevideo').length === 0) { - addButtons = true; - $('#stream').append('