Aligned to changes in Streaming plugin configuration

Author: lminiero

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

@@ -77,7 +77,7 @@
 # To test the 'gstreamer-sample' example, check the test_gstreamer.sh
 # script in the plugins/streams folder. The live and on-demand  audio
 # file streams, use a couple of files (radio.alaw, music.mulaw) that are
-# provided in the plugins/streams folder. 
+# provided in the plugins/streams folder.
 #}
 
 general: {
@@ -123,10 +123,13 @@ file-ondemand-sample: {
 }
 
 #
-# Firefox Nightly supports H.264 through Cisco's OpenH264 plugin. The only
-# supported profile is the baseline one. This is an example of how to create
-# a H.264 mountpoint: one way to feed it is via an x264enc+rtph264pay
-# pipeline in gstreamer.
+# All browsers also support H.264, often through Cisco's OpenH264 plugin.
+# The only profile that is definitely supported is the baseline one, which
+# means that if you try a higher one it might or might not work. No matter
+# which profile you encode, though, you can put a custom one in the SDP if
+# you override the fmtp SDP attribute via 'videofmtp'. The following is an
+# example of how to create a simple H.264 mountpoint: you can feed it via
+# an x264enc+rtph264pay pipeline in gstreamer, an ffmpeg script or other.
 #
 #h264-sample: {
 	#type = "rtp"
@@ -140,6 +143,25 @@ file-ondemand-sample: {
 	#videofmtp = "profile-level-id=42e01f;packetization-mode=1"
 #}
 
+#
+# The Streaming plugin also supports the broadcasting of datachannel
+# messages, either by themselves or along other audio/video streams (e.g.,
+# to add a subtitle to a stream you're sending). The following is an
+# example of how you can create a datachannel-only mountpoint: you can
+# feed it with any tool that can send UDP datagrams, e.g., netcat.
+# Notice that the 'rtp' type just indicates this is a live mountpoint:
+# datachannel messages will be sent as usual, and not use RTP at all.
+#
+#data-example: {
+	#type = rtp
+	#id = 15
+	#description = Datachannel stream from an UDP source
+	#audio = false
+	#video = false
+	#data = true
+	#dataport = 5008
+#}
+
 #
 # This is a sample configuration for Opus/VP8 multicast streams. You
 # need an external script to feed data on those ports, of course.

html/streamingtest.js

@@ -151,7 +151,8 @@ $(document).ready(function() {
 										streaming.createAnswer(
 											{
 												jsep: jsep,
-												media: { audioSend: false, videoSend: false },	// We want recvonly audio/video
+												// We want recvonly audio/video and, if negotiated, datachannels
+												media: { audioSend: false, videoSend: false, data: true },
 												success: function(jsep) {
 													Janus.debug("Got SDP!");
 													Janus.debug(jsep);
@@ -233,10 +234,25 @@ $(document).ready(function() {
 										}, 1000);
 									}
 								},
+								ondataopen: function(data) {
+									Janus.log("The DataChannel is available!");
+									$('#waitingvideo').remove();
+									$('#stream').append(
+										'<input class="form-control" type="text" id="datarecv" disabled></input>'
+									);
+									if(spinner !== null && spinner !== undefined)
+										spinner.stop();
+									spinner = null;
+								},
+								ondata: function(data) {
+									Janus.debug("We got data from the DataChannel! " + data);
+									$('#datarecv').val(data);
+								},
 								oncleanup: function() {
 									Janus.log(" ::: Got a cleanup notification :::");
 									$('#waitingvideo').remove();
 									$('#remotevideo').remove();
+									$('#datarecv').remove();
 									$('.no-video-container').remove();
 									$('#bitrate').attr('disabled', true);
 									$('#bitrateset').html('Bandwidth<span class="caret"></span>');