Multistream support via Unified Plan

Makefile.am

@@ -446,7 +446,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)

conf/janus.plugin.streaming.jcfg.sample.in

@@ -143,6 +143,7 @@ file-ondemand-sample: {
 	#videopt = 126
 	#videortpmap = "H264/90000"
 	#videofmtp = "profile-level-id=42e01f;packetization-mode=1"
+	#secret = "adminpwd"
 #}
 
 #
@@ -162,6 +163,7 @@ file-ondemand-sample: {
 	#video = false
 	#data = true
 	#dataport = 5008
+	#secret = "adminpwd"
 #}
 
 #
@@ -182,6 +184,7 @@ file-ondemand-sample: {
 	#videomcast = "232.3.4.5"
 	#videopt = 100
 	#videortpmap = "VP8/90000"
+	#secret = "adminpwd"
 #}
 
 #
@@ -202,4 +205,54 @@ file-ondemand-sample: {
 	#url = "rtsp://127.0.0.1:8554/unicast"
 	#rtsp_user = "username"
 	#rtsp_pwd = "password"
+	#secret = "adminpwd"
 #}
+
+#
+# Finally, this is an example of how you can configure a live Streaming
+# 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)"
+	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"
+}

dtls-bio.c

@@ -3,7 +3,7 @@
  * \copyright GNU General Public License v3
  * \brief    OpenSSL BIO agent writer
  * \details  OpenSSL BIO that writes packets to a libnice agent.
- * 
+ *
  * \ingroup protocols
  * \ref protocols
  */
@@ -110,7 +110,7 @@ static int janus_dtls_bio_agent_free(BIO *bio) {
 #endif
 	return 1;
 }
-	
+
 static int janus_dtls_bio_agent_write(BIO *bio, const char *in, int inl) {
 	JANUS_LOG(LOG_HUGE, "janus_dtls_bio_agent_write: %p, %d\n", in, inl);
 	/* Forward data to the write BIO */
@@ -129,17 +129,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");
-		return -1;
-	}
-	janus_ice_stream *stream = component->stream;
-	if(!stream) {
-		JANUS_LOG(LOG_ERR, "No stream, no DTLS bridge...\n");
+	janus_handle_webrtc *pc = (janus_handle_webrtc *)dtls->pc;
+	if(pc == NULL) {
+		JANUS_LOG(LOG_ERR, "No WebRTC PeerConnection, no DTLS bridge...\n");
 		return -1;
 	}
-	janus_ice_handle *handle = stream->handle;
+	janus_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;
@@ -149,17 +144,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;
 }