From 14161516b2afea48d43a4cf1fb52f40f8d36ba45 Mon Sep 17 00:00:00 2001 From: pabloFuente Date: Wed, 26 Sep 2018 19:35:59 +0200 Subject: [PATCH 1/3] openvidu-filters: more filters added --- openvidu-filters/web/app.js | 18 +++++++++++++++++- openvidu-filters/web/index.html | 12 ++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/openvidu-filters/web/app.js b/openvidu-filters/web/app.js index d0f716ed..7848adac 100644 --- a/openvidu-filters/web/app.js +++ b/openvidu-filters/web/app.js @@ -192,12 +192,28 @@ function applyFilter() { break; case 'Audioecho': filter.type = 'GStreamerFilter'; - filter.options = { "command": "audioecho delay=50000000 intensity=0.6 feedback=0.4" }; + filter.options = { "command": "audioecho delay=40000000 intensity=0.7 feedback=0.4" }; + break; + case 'Amplify': + filter.type = 'GStreamerFilter'; + filter.options = { "command": "audioamplify amplification=1.7" }; break; case 'Videobox': filter.type = 'GStreamerFilter'; filter.options = { "command": "videobox fill=black top=-30 bottom=-30 left=-30 right=-30" }; break; + case 'Text': + filter.type = 'GStreamerFilter'; + filter.options = { "command": 'textoverlay text="Embedded text!" valignment=top halignment=right font-desc="Cantarell 25" draw-shadow=false' }; + break; + case 'Time': + filter.type = 'GStreamerFilter'; + filter.options = { "command": 'timeoverlay valignment=bottom halignment=right font-desc="Sans, 20"' }; + break; + case 'Clock': + filter.type = 'GStreamerFilter'; + filter.options = { "command": 'clockoverlay valignment=bottom halignment=right shaded-background=true font-desc="Sans, 20"' }; + break; } selectedStreamManager.stream.applyFilter(filter.type, filter.options) .then(f => { diff --git a/openvidu-filters/web/index.html b/openvidu-filters/web/index.html index e6009cdb..f47d5d01 100644 --- a/openvidu-filters/web/index.html +++ b/openvidu-filters/web/index.html @@ -91,6 +91,18 @@ + + + +
From 5bd4dad0727ea5ba35c33e5164cb0fa70cced7bc Mon Sep 17 00:00:00 2001 From: pabloFuente Date: Fri, 28 Sep 2018 11:36:23 +0200 Subject: [PATCH 2/3] openvidu-filters: text, time and clock filters commented (no support from KMS yet) --- openvidu-filters/web/app.js | 4 ++-- openvidu-filters/web/index.html | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/openvidu-filters/web/app.js b/openvidu-filters/web/app.js index 7848adac..410e45db 100644 --- a/openvidu-filters/web/app.js +++ b/openvidu-filters/web/app.js @@ -202,7 +202,7 @@ function applyFilter() { filter.type = 'GStreamerFilter'; filter.options = { "command": "videobox fill=black top=-30 bottom=-30 left=-30 right=-30" }; break; - case 'Text': + /*case 'Text': filter.type = 'GStreamerFilter'; filter.options = { "command": 'textoverlay text="Embedded text!" valignment=top halignment=right font-desc="Cantarell 25" draw-shadow=false' }; break; @@ -213,7 +213,7 @@ function applyFilter() { case 'Clock': filter.type = 'GStreamerFilter'; filter.options = { "command": 'clockoverlay valignment=bottom halignment=right shaded-background=true font-desc="Sans, 20"' }; - break; + break;*/ } selectedStreamManager.stream.applyFilter(filter.type, filter.options) .then(f => { diff --git a/openvidu-filters/web/index.html b/openvidu-filters/web/index.html index f47d5d01..ca8c7395 100644 --- a/openvidu-filters/web/index.html +++ b/openvidu-filters/web/index.html @@ -94,7 +94,7 @@ -
From 1da2f716232c83580a607c7fe997f9831d61b992 Mon Sep 17 00:00:00 2001 From: pabloFuente Date: Fri, 28 Sep 2018 14:29:24 +0200 Subject: [PATCH 3/3] Links added to docs in insecure REST operation --- openvidu-filters/web/app.js | 1 - openvidu-getaroom/docker/create_image.sh | 2 +- openvidu-getaroom/web/app.js | 4 ++-- openvidu-hello-world/web/app.js | 4 ++-- openvidu-insecure-js/docker/Dockerfile | 4 +--- openvidu-insecure-js/docker/create_image.sh | 2 +- openvidu-insecure-js/web/app.js | 4 ++-- openvidu-webcomponent/web/app.js | 4 ++-- 8 files changed, 11 insertions(+), 14 deletions(-) diff --git a/openvidu-filters/web/app.js b/openvidu-filters/web/app.js index 410e45db..a413293b 100644 --- a/openvidu-filters/web/app.js +++ b/openvidu-filters/web/app.js @@ -369,7 +369,6 @@ function initMainVideo(streamManager, userData) { var OPENVIDU_SERVER_URL = "https://" + location.hostname + ":4443"; var OPENVIDU_SERVER_SECRET = "MY_SECRET"; - function getToken(mySessionId, role) { return createSession(mySessionId).then(sessionId => createToken(sessionId, role)); } diff --git a/openvidu-getaroom/docker/create_image.sh b/openvidu-getaroom/docker/create_image.sh index ec2ae1b7..25cf7a99 100755 --- a/openvidu-getaroom/docker/create_image.sh +++ b/openvidu-getaroom/docker/create_image.sh @@ -5,7 +5,7 @@ cp ../../../openvidu/openvidu-server/target/openvidu-server-"$1".jar ./openvidu- cp -a ../web/. ./web/ # Modify OpenVidu Server URL -sed -i 's/url: "https:\/\/" + location\.hostname + ":4443/url: "https:\/\/" + location\.hostname + "/g' ./web/app.js +sed -i 's/var OPENVIDU_SERVER_URL = "https:\/\/" + location\.hostname + ":4443";/var OPENVIDU_SERVER_URL = "https:\/\/" + location\.hostname;/g' ./web/app.js # Build docker image docker build -t openvidu/getaroom-demo . diff --git a/openvidu-getaroom/web/app.js b/openvidu-getaroom/web/app.js index 41e8c77c..07b37e91 100644 --- a/openvidu-getaroom/web/app.js +++ b/openvidu-getaroom/web/app.js @@ -273,7 +273,7 @@ function getToken(mySessionId) { return createSession(mySessionId).then(sId => createToken(sId)); } -function createSession(sId) { +function createSession(sId) { // See https://openvidu.io/docs/reference-docs/REST-API/#post-apisessions return new Promise((resolve, reject) => { $.ajax({ type: "POST", @@ -299,7 +299,7 @@ function createSession(sId) { }); } -function createToken(sId) { +function createToken(sId) { // See https://openvidu.io/docs/reference-docs/REST-API/#post-apitokens return new Promise((resolve, reject) => { $.ajax({ type: "POST", diff --git a/openvidu-hello-world/web/app.js b/openvidu-hello-world/web/app.js index 600a0bcf..16705752 100644 --- a/openvidu-hello-world/web/app.js +++ b/openvidu-hello-world/web/app.js @@ -60,7 +60,7 @@ function getToken(mySessionId) { return createSession(mySessionId).then(sessionId => createToken(sessionId)); } -function createSession(sessionId) { +function createSession(sessionId) { // See https://openvidu.io/docs/reference-docs/REST-API/#post-apisessions return new Promise((resolve, reject) => { $.ajax({ type: "POST", @@ -86,7 +86,7 @@ function createSession(sessionId) { }); } -function createToken(sessionId) { +function createToken(sessionId) { // See https://openvidu.io/docs/reference-docs/REST-API/#post-apitokens return new Promise((resolve, reject) => { $.ajax({ type: "POST", diff --git a/openvidu-insecure-js/docker/Dockerfile b/openvidu-insecure-js/docker/Dockerfile index c40636b7..430f6e10 100644 --- a/openvidu-insecure-js/docker/Dockerfile +++ b/openvidu-insecure-js/docker/Dockerfile @@ -2,12 +2,10 @@ FROM ubuntu:16.04 MAINTAINER openvidu@gmail.com # Install Kurento Media Server (KMS) -RUN echo "deb http://ubuntu.openvidu.io/6.7.0 xenial kms6" | tee /etc/apt/sources.list.d/kurento.list \ +RUN echo "deb http://ubuntu.openvidu.io/6.8.0 xenial kms6" | tee /etc/apt/sources.list.d/kurento.list \ && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 5AFA7A83 \ && apt-get update \ - && apt-get -y dist-upgrade \ && apt-get -y install kurento-media-server \ - && apt-get -y install openh264-gst-plugins-bad-1.5 \ && rm -rf /var/lib/apt/lists/* COPY kms.sh /kms.sh diff --git a/openvidu-insecure-js/docker/create_image.sh b/openvidu-insecure-js/docker/create_image.sh index 5602c105..44858f04 100755 --- a/openvidu-insecure-js/docker/create_image.sh +++ b/openvidu-insecure-js/docker/create_image.sh @@ -5,7 +5,7 @@ cp ../../../openvidu/openvidu-server/target/openvidu-server-"$1".jar ./openvidu- cp -a ../web/. ./web/ # Modify OpenVidu Server URL -sed -i 's/url: "https:\/\/" + location\.hostname + ":4443/url: "https:\/\/" + location\.hostname + "/g' ./web/app.js +sed -i 's/var OPENVIDU_SERVER_URL = "https:\/\/" + location\.hostname + ":4443";/var OPENVIDU_SERVER_URL = "https:\/\/" + location\.hostname;/g' ./web/app.js # Build docker image docker build -t openvidu/basic-videoconference-demo . diff --git a/openvidu-insecure-js/web/app.js b/openvidu-insecure-js/web/app.js index 896f25ad..d514f6a5 100644 --- a/openvidu-insecure-js/web/app.js +++ b/openvidu-insecure-js/web/app.js @@ -193,7 +193,7 @@ function getToken(mySessionId) { return createSession(mySessionId).then(sessionId => createToken(sessionId)); } -function createSession(sessionId) { +function createSession(sessionId) { // See https://openvidu.io/docs/reference-docs/REST-API/#post-apisessions return new Promise((resolve, reject) => { $.ajax({ type: "POST", @@ -219,7 +219,7 @@ function createSession(sessionId) { }); } -function createToken(sessionId) { +function createToken(sessionId) { // See https://openvidu.io/docs/reference-docs/REST-API/#post-apitokens return new Promise((resolve, reject) => { $.ajax({ type: "POST", diff --git a/openvidu-webcomponent/web/app.js b/openvidu-webcomponent/web/app.js index 3d250f40..a9dc0eb0 100644 --- a/openvidu-webcomponent/web/app.js +++ b/openvidu-webcomponent/web/app.js @@ -44,7 +44,7 @@ function getToken(sessionName) { return createSession(sessionName).then((sessionId) => createToken(sessionId)); } -function createSession(sessionName) { +function createSession(sessionName) { // See https://openvidu.io/docs/reference-docs/REST-API/#post-apisessions return new Promise((resolve, reject) => { $.ajax({ type: 'POST', @@ -78,7 +78,7 @@ function createSession(sessionName) { }); } -function createToken(sessionId) { +function createToken(sessionId) { // See https://openvidu.io/docs/reference-docs/REST-API/#post-apitokens return new Promise((resolve, reject) => { $.ajax({ type: 'POST',