diff --git a/Makefile.am b/Makefile.am index 7a6ca01dce..2a35c84812 100644 --- a/Makefile.am +++ b/Makefile.am @@ -25,7 +25,7 @@ demosdir = $(datadir)/janus/demos demos_DATA = $(NULL) jsmodulesdir = $(datadir)/janus/javascript -jsmodules_DATA = html/janus.js +jsmodules_DATA = html/demos/janus.js %.sample: %.sample.in $(MKDIR_P) $(@D) diff --git a/docs/header.html b/docs/header.html index 71dca3ff1c..e94203321e 100644 --- a/docs/header.html +++ b/docs/header.html @@ -33,7 +33,7 @@ -
+
+
+
+ Want to learn more about the AudioBridge plugin? + Check the Documentation. +
+

Demo details

diff --git a/html/audiobridgetest.js b/html/demos/audiobridge.js similarity index 100% rename from html/audiobridgetest.js rename to html/demos/audiobridge.js diff --git a/html/canvas.html b/html/demos/canvas.html similarity index 94% rename from html/canvas.html rename to html/demos/canvas.html index b82b5253ed..c8215cc599 100644 --- a/html/canvas.html +++ b/html/demos/canvas.html @@ -21,17 +21,17 @@ $(".fixed-top li.dropdown").addClass("active"); $(".fixed-top a[href='canvas.html']").addClass("active"); }); - $(".footer").load("footer.html"); + $(".footer").load("../footer.html"); }); - + -Fork me on GitHub +Fork me on GitHub
@@ -44,10 +44,16 @@

Plugin Demo: Canvas Capture

-
+
+
+
+ Want to learn more about the EchoTest plugin? + Check the Documentation. +
+
-

Demo details

+

Demo details

This is a variant of the Echo Test demo meant to showcase how you can use an HTML5 canvas element as a WebRTC media source: everything is exactly the same in term of available controls, diff --git a/html/canvas.js b/html/demos/canvas.js similarity index 100% rename from html/canvas.js rename to html/demos/canvas.js diff --git a/html/devicetest.html b/html/demos/devices.html similarity index 91% rename from html/devicetest.html rename to html/demos/devices.html index b32653d828..05ae58ffc6 100644 --- a/html/devicetest.html +++ b/html/demos/devices.html @@ -14,24 +14,24 @@ - + - + -Fork me on GitHub +Fork me on GitHub

@@ -44,10 +44,16 @@

Device Selection

-
+
+
+
+ Want to learn more about the EchoTest plugin? + Check the Documentation. +
+
-

Demo details

+

Demo details

This is a variant of the Echo Test demo: everything is exactly the same in term of available controls, features, and the like, with the substantial difference that you can select which of the available diff --git a/html/devicetest.js b/html/demos/devices.js similarity index 100% rename from html/devicetest.js rename to html/demos/devices.js diff --git a/html/e2etest.html b/html/demos/e2e.html similarity index 91% rename from html/e2etest.html rename to html/demos/e2e.html index 9814f8f048..6c5053752c 100644 --- a/html/e2etest.html +++ b/html/demos/e2e.html @@ -14,24 +14,24 @@ - + - + -Fork me on GitHub +Fork me on GitHub

@@ -44,7 +44,13 @@

Plugin Demo: End-to-end Encryption

-
+
+
+
+ Want to learn more about the EchoTest plugin? + Check the Documentation. +
+

Demo details

diff --git a/html/e2etest.js b/html/demos/e2e.js similarity index 100% rename from html/e2etest.js rename to html/demos/e2e.js diff --git a/html/echotest.html b/html/demos/echotest.html similarity index 94% rename from html/echotest.html rename to html/demos/echotest.html index e5808d7df7..92828b048d 100644 --- a/html/echotest.html +++ b/html/demos/echotest.html @@ -21,17 +21,17 @@ $(".fixed-top li.dropdown").addClass("active"); $(".fixed-top a[href='echotest.html']").addClass("active"); }); - $(".footer").load("footer.html"); + $(".footer").load("../footer.html"); }); - + -Fork me on GitHub +Fork me on GitHub
@@ -44,7 +44,13 @@

Plugin Demo: Echo Test

-
+
+
+
+ Want to learn more about the EchoTest plugin? + Check the Documentation. +
+

Demo details

diff --git a/html/echotest.js b/html/demos/echotest.js similarity index 100% rename from html/echotest.js rename to html/demos/echotest.js diff --git a/html/demos.html b/html/demos/index.html similarity index 81% rename from html/demos.html rename to html/demos/index.html index b5817d8d3a..05d4801c07 100644 --- a/html/demos.html +++ b/html/demos/index.html @@ -12,17 +12,17 @@ $(function() { $(".fixed-top").load("navbar.html", function() { $(".fixed-top li.dropdown").addClass("active"); - $(".fixed-top a[href='demos.html']").addClass("active"); + $(".fixed-top a[href='index.html']").addClass("active"); }); - $(".footer").load("footer.html"); + $(".footer").load("../footer.html"); }); - + -Fork me on GitHub +Fork me on GitHub
@@ -42,39 +42,39 @@

Janus WebRTC Server: Demo Tests

A simple Echo Test demo, with knobs to control the bitrate. - Streaming + Streaming A media Streaming demo, with sample live and on-demand streams. - Video Call + Video Call A Video Call demo, a bit like AppRTC but with media passing through Janus. - SIP Gateway + SIP Gateway A SIP Gateway demo, allowing you to register at a SIP server and start/receive calls. - Video Room + Video Room A videoconferencing demo, allowing you to join a video room with up to six users. - Video Room (multistream) + Video Room (multistream) The same videoconferencing demo, but using one PeerConnection to receive multiple streams. - Audio Room + Audio Room An audio mixing/bridge demo, allowing you join an Audio Room. - Text Room + Text Room A text room demo, using DataChannels only. - Recorder/Playout + Recorder/Playout A demo to record audio/video messages, and subsequently replay them through WebRTC. - Screen Sharing + Screen Sharing A webinar-like screen sharing session, based on the Video Room plugin. @@ -83,7 +83,7 @@

Janus WebRTC Server: Demo Tests

Other legacy demos

- NoSIP (SDP/RTP) + NoSIP (SDP/RTP) A legacy interop demo (e.g., with a SIP peer) where signalling is up to the application. @@ -92,11 +92,11 @@

Janus WebRTC Server: Demo Tests

Advanced demos

- Device Selection + Device Selection A variant of the Echo Test demo, that allows you to choose a specific capture device. - End-to-end Encryption + End-to-end Encryption A variant of the Echo Test demo, that allows you to encrypt the video in a way that Janus can't access it, but can still route it. diff --git a/html/janus.js b/html/demos/janus.js similarity index 100% rename from html/janus.js rename to html/demos/janus.js diff --git a/html/multiopus.html b/html/demos/multiopus.html similarity index 93% rename from html/multiopus.html rename to html/demos/multiopus.html index c973484f07..3a535b2664 100644 --- a/html/multiopus.html +++ b/html/demos/multiopus.html @@ -21,17 +21,17 @@ $(".fixed-top li.dropdown").addClass("active"); $(".fixed-top a[href='multiopus.html']").addClass("active"); }); - $(".footer").load("footer.html"); + $(".footer").load("../footer.html"); }); - + -Fork me on GitHub +Fork me on GitHub
@@ -44,7 +44,13 @@

Plugin Demo: Multichannel Opus (surround)

-
+
+
+
+ Want to learn more about the EchoTest plugin? + Check the Documentation. +
+

Demo details

diff --git a/html/multiopus.js b/html/demos/multiopus.js similarity index 100% rename from html/multiopus.js rename to html/demos/multiopus.js diff --git a/html/mvideoroomtest.html b/html/demos/mvideoroom.html similarity index 91% rename from html/mvideoroomtest.html rename to html/demos/mvideoroom.html index 828c9161df..306f8c822f 100644 --- a/html/mvideoroomtest.html +++ b/html/demos/mvideoroom.html @@ -14,24 +14,24 @@ - + - + -Fork me on GitHub +Fork me on GitHub
@@ -44,7 +44,13 @@

Plugin Demo: Video Room (multistream)

-
+
+
+
+ Want to learn more about the VideoRoom plugin? + Check the Documentation. +
+

Demo details

diff --git a/html/mvideoroomtest.js b/html/demos/mvideoroom.js similarity index 100% rename from html/mvideoroomtest.js rename to html/demos/mvideoroom.js diff --git a/html/demos/navbar.html b/html/demos/navbar.html new file mode 100644 index 0000000000..37ca4a05db --- /dev/null +++ b/html/demos/navbar.html @@ -0,0 +1,51 @@ +
+ Janus (multistream) + + +
diff --git a/html/nosiptest.html b/html/demos/nosip.html similarity index 89% rename from html/nosiptest.html rename to html/demos/nosip.html index 39ffc81cc1..16274bd9ae 100644 --- a/html/nosiptest.html +++ b/html/demos/nosip.html @@ -13,23 +13,23 @@ - + - + -Fork me on GitHub +Fork me on GitHub
@@ -42,7 +42,13 @@

Plugin Demo: NoSIP (SDP/RTP)

-
+
+
+
+ Want to learn more about the NoSIP plugin? + Check the Documentation. +
+

Demo details

diff --git a/html/nosiptest.js b/html/demos/nosip.js similarity index 100% rename from html/nosiptest.js rename to html/demos/nosip.js diff --git a/html/recordplaytest.html b/html/demos/recordplay.html similarity index 89% rename from html/recordplaytest.html rename to html/demos/recordplay.html index 3540379f0b..106438a659 100644 --- a/html/recordplaytest.html +++ b/html/demos/recordplay.html @@ -13,23 +13,23 @@ - + - + -Fork me on GitHub +Fork me on GitHub
@@ -42,7 +42,13 @@

Plugin Demo: Recorder/Playout

-
+
+
+
+ Want to learn more about the Record&Play plugin? + Check the Documentation. +
+

Demo details

diff --git a/html/recordplaytest.js b/html/demos/recordplay.js similarity index 100% rename from html/recordplaytest.js rename to html/demos/recordplay.js diff --git a/html/screensharingtest.html b/html/demos/screensharing.html similarity index 89% rename from html/screensharingtest.html rename to html/demos/screensharing.html index 700ab33dca..13f334b43e 100644 --- a/html/screensharingtest.html +++ b/html/demos/screensharing.html @@ -13,23 +13,23 @@ - + - + -Fork me on GitHub +Fork me on GitHub
@@ -42,7 +42,13 @@

Plugin Demo: Screen Sharing

-
+
+
+
+ Want to learn more about the VideoRoom plugin? + Check the Documentation. +
+

Demo details

diff --git a/html/screensharingtest.js b/html/demos/screensharing.js similarity index 100% rename from html/screensharingtest.js rename to html/demos/screensharing.js diff --git a/html/settings.js b/html/demos/settings.js similarity index 100% rename from html/settings.js rename to html/demos/settings.js diff --git a/html/siptest.html b/html/demos/sip.html similarity index 92% rename from html/siptest.html rename to html/demos/sip.html index 634514d28a..f69749e78b 100644 --- a/html/siptest.html +++ b/html/demos/sip.html @@ -15,24 +15,24 @@ - + - + -Fork me on GitHub +Fork me on GitHub
@@ -45,7 +45,13 @@

Plugin Demo: SIP Gateway

-
+
+
+
+ Want to learn more about the SIP plugin? + Check the Documentation. +
+

Demo details

diff --git a/html/siptest.js b/html/demos/sip.js similarity index 100% rename from html/siptest.js rename to html/demos/sip.js diff --git a/html/streamingtest.html b/html/demos/streaming.html similarity index 88% rename from html/streamingtest.html rename to html/demos/streaming.html index c842babbe9..26b09e9fa2 100644 --- a/html/streamingtest.html +++ b/html/demos/streaming.html @@ -13,24 +13,24 @@ - + - + -Fork me on GitHub +Fork me on GitHub
@@ -43,7 +43,13 @@

Plugin Demo: Streaming

-
+
+
+
+ Want to learn more about the Streaming plugin? + Check the Documentation. +
+

Demo details

diff --git a/html/streamingtest.js b/html/demos/streaming.js similarity index 100% rename from html/streamingtest.js rename to html/demos/streaming.js diff --git a/html/surround/ChID-BLITS-EBU.mp4 b/html/demos/surround/ChID-BLITS-EBU.mp4 similarity index 100% rename from html/surround/ChID-BLITS-EBU.mp4 rename to html/demos/surround/ChID-BLITS-EBU.mp4 diff --git a/html/surround/ChID-BLITS-EBU.txt b/html/demos/surround/ChID-BLITS-EBU.txt similarity index 100% rename from html/surround/ChID-BLITS-EBU.txt rename to html/demos/surround/ChID-BLITS-EBU.txt diff --git a/html/textroomtest.html b/html/demos/textroom.html similarity index 89% rename from html/textroomtest.html rename to html/demos/textroom.html index b930bf2f8c..b1d56c2821 100644 --- a/html/textroomtest.html +++ b/html/demos/textroom.html @@ -13,23 +13,23 @@ - + - + -Fork me on GitHub +Fork me on GitHub
@@ -42,7 +42,13 @@

Plugin Demo: Text Room

-
+
+
+
+ Want to learn more about the TextRoom plugin? + Check the Documentation. +
+

Demo details

diff --git a/html/textroomtest.js b/html/demos/textroom.js similarity index 100% rename from html/textroomtest.js rename to html/demos/textroom.js diff --git a/html/up_arrow.png b/html/demos/up_arrow.png similarity index 100% rename from html/up_arrow.png rename to html/demos/up_arrow.png diff --git a/html/videocalltest.html b/html/demos/videocall.html similarity index 92% rename from html/videocalltest.html rename to html/demos/videocall.html index 23f4611345..2bfbc3ec27 100644 --- a/html/videocalltest.html +++ b/html/demos/videocall.html @@ -14,24 +14,24 @@ - + - + -Fork me on GitHub +Fork me on GitHub
@@ -44,7 +44,13 @@

Plugin Demo: Video Call

-
+
+
+
+ Want to learn more about the VideoCall plugin? + Check the Documentation. +
+

Demo details

diff --git a/html/videocalltest.js b/html/demos/videocall.js similarity index 100% rename from html/videocalltest.js rename to html/demos/videocall.js diff --git a/html/videoroomtest.html b/html/demos/videoroom.html similarity index 93% rename from html/videoroomtest.html rename to html/demos/videoroom.html index b740238841..d7fb1c09df 100644 --- a/html/videoroomtest.html +++ b/html/demos/videoroom.html @@ -14,24 +14,24 @@ - + - + -Fork me on GitHub +Fork me on GitHub
@@ -44,7 +44,13 @@

Plugin Demo: Video Room

-
+
+
+
+ Want to learn more about the VideoRoom plugin? + Check the Documentation. +
+

Demo details

diff --git a/html/videoroomtest.js b/html/demos/videoroom.js similarity index 100% rename from html/videoroomtest.js rename to html/demos/videoroom.js diff --git a/html/virtualbg.html b/html/demos/virtualbg.html similarity index 91% rename from html/virtualbg.html rename to html/demos/virtualbg.html index 4080625e8f..3d1e70ab9b 100644 --- a/html/virtualbg.html +++ b/html/demos/virtualbg.html @@ -22,17 +22,17 @@ $(".fixed-top li.dropdown").addClass("active"); $(".fixed-top a[href='virtualbg.html']").addClass("active"); }); - $(".footer").load("footer.html"); + $(".footer").load("../footer.html"); }); - + -Fork me on GitHub +Fork me on GitHub
@@ -45,10 +45,16 @@

Plugin Demo: Virtual Background

-
+
+
+
+ Want to learn more about the EchoTest plugin? + Check the Documentation. +
+
-

Demo details

+

Demo details

This is a variant of the Echo Test and Canvas demos meant to showcase how you can use libraries like MediaPipe diff --git a/html/virtualbg.js b/html/demos/virtualbg.js similarity index 100% rename from html/virtualbg.js rename to html/demos/virtualbg.js diff --git a/html/webaudio.html b/html/demos/webaudio.html similarity index 91% rename from html/webaudio.html rename to html/demos/webaudio.html index 92e7ca7472..1fdc701c19 100644 --- a/html/webaudio.html +++ b/html/demos/webaudio.html @@ -21,17 +21,17 @@ $(".fixed-top li.dropdown").addClass("active"); $(".fixed-top a[href='webaudio.html']").addClass("active"); }); - $(".footer").load("footer.html"); + $(".footer").load("../footer.html"); }); - + -Fork me on GitHub +Fork me on GitHub

@@ -44,10 +44,16 @@

Plugin Demo: Web Audio Processing

-
+
+
+
+ Want to learn more about the EchoTest plugin? + Check the Documentation. +
+
-

Demo details

+

Demo details

This is a variant of the Echo Test demo meant to showcase how you can use the Web Audio API to manipulate the audio from the microphone, before sending it to Janus, diff --git a/html/webaudio.js b/html/demos/webaudio.js similarity index 100% rename from html/webaudio.js rename to html/demos/webaudio.js diff --git a/html/docs/index.html b/html/docs/index.html index ce7da9ad9c..0e93af4a4d 100644 --- a/html/docs/index.html +++ b/html/docs/index.html @@ -24,7 +24,7 @@

-
+

Janus is a WebRTC Server developed by Meetecho conceived to be a general purpose one. As such, it doesn't provide any functionality per se other than implementing the means to set up a WebRTC media communication with a browser, @@ -50,7 +50,7 @@

Janus: the general purpose WebRTC server

functionality they provide. Example of such plugins can be implementations of applications like echo tests, conference bridges, media recorders, SIP gateways and the like.

-
+
@@ -64,8 +64,8 @@

Janus: the general purpose WebRTC server

-
Check the Documentation - for more details about Janus, or check out the Demos +
Check the Documentation + for more details about Janus, or check out the Demos to see it in action.
diff --git a/html/navbar.html b/html/navbar.html index b943a93bbb..ae4d4d50c3 100644 --- a/html/navbar.html +++ b/html/navbar.html @@ -9,29 +9,29 @@
  • Demos
    - Index + Index
    - Echo Test - Streaming - Video Call - SIP Gateway - Video Room - Video Room (multistream) - Audio Bridge - Text Room - Recorder/Playout + Echo Test + Streaming + Video Call + SIP Gateway + Video Room + Video Room (multistream) + Audio Bridge + Text Room + Recorder/Playout
    - Screen Sharing - NoSIP (SDP/RTP) + Screen Sharing + NoSIP (SDP/RTP)
    - Device Selection - End-to-end Encryption - Multichannel Opus (surround) - Canvas Capture - Web Audio Processing - Virtual Background + Device Selection + End-to-end Encryption + Multichannel Opus (surround) + Canvas Capture + Web Audio Processing + Virtual Background
    - Admin/Monitor + Admin/Monitor
  • Documentation
    • diff --git a/npm/package.json b/npm/package.json index d82a4a75f3..c2c929004e 100644 --- a/npm/package.json +++ b/npm/package.json @@ -38,6 +38,6 @@ "scripts": { "lint": "eslint ../html --ext .js,.html --resolve-plugins-relative-to ./npm", "rollup": "rollup -c rollup.config.mjs", - "prerelease": "npm run rollup -- --o dist/janus.es.js --f es && node -e \"const fs=require('fs'); const data=fs.readFileSync('../html/janus.js'); fs.mkdirSync('./src', {recursive:true}); fs.writeFileSync('./src/janus.js',data);\"" + "prerelease": "npm run rollup -- --o dist/janus.es.js --f es && node -e \"const fs=require('fs'); const data=fs.readFileSync('../html/demos/janus.js'); fs.mkdirSync('./src', {recursive:true}); fs.writeFileSync('./src/janus.js',data);\"" } } diff --git a/npm/rollup.config.mjs b/npm/rollup.config.mjs index 00d2d05175..59cb7bb75d 100644 --- a/npm/rollup.config.mjs +++ b/npm/rollup.config.mjs @@ -9,7 +9,7 @@ export default { }, plugins: [ replace({ - JANUS_CODE: readFileSync('../html/janus.js', 'utf-8'), + JANUS_CODE: readFileSync('../html/demos/janus.js', 'utf-8'), delimiters: ['@','@'], includes: 'module.js', preventAssignment: true diff --git a/src/Makefile.am b/src/Makefile.am index 9b467a7f51..d90adc0732 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -22,7 +22,7 @@ loggersheader_HEADERS = loggers/logger.h confdir = $(sysconfdir)/janus conf_DATA = $(NULL) -demosdir = $(datadir)/janus/demos +demosdir = $(datadir)/janus/html plugindir = $(libdir)/janus/plugins plugin_LTLIBRARIES = $(NULL)