You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2018/09/30 11:51:29 UTC
[openmeetings] branch master updated: [OPENMEETINGS-1649]
hardcodings reduced
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 7ebec93 [OPENMEETINGS-1649] hardcodings reduced
7ebec93 is described below
commit 7ebec93c5f703c585572af8fe1fe5b1687e38f00
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Sun Sep 30 18:51:17 2018 +0700
[OPENMEETINGS-1649] hardcodings reduced
---
.../db/dao/basic/ConfigurationDao.java | 22 ++++++++++++++----
.../apache/openmeetings/backup/BackupImport.java | 20 +++++++----------
.../installation/ImportInitvalues.java | 26 ++++++++--------------
.../openmeetings/util/OpenmeetingsVariables.java | 12 ++++------
openmeetings-web/pom.xml | 2 +-
.../openmeetings/web/room/VideoSettings.java | 2 ++
.../apache/openmeetings/web/room/raw-settings.js | 9 ++++----
7 files changed, 46 insertions(+), 47 deletions(-)
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
index 7871871..e78c28f 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
@@ -21,6 +21,7 @@ package org.apache.openmeetings.db.dao.basic;
import static org.apache.commons.lang3.math.NumberUtils.toInt;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_APPLICATION_BASE_URL;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_APPLICATION_NAME;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_CAM_FPS;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_CHAT_SEND_ON_ENTER;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_CRYPT;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_GROUP_ID;
@@ -37,6 +38,9 @@ import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_KEYCODE_
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_LNAME_MIN_LENGTH;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_LOGIN_MIN_LENGTH;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_MAX_UPLOAD_SIZE;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_MIC_ECHO;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_MIC_NOISE;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_MIC_RATE;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_MP4_AUDIO_BITRATE;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_MP4_AUDIO_RATE;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_MP4_VIDEO_PRESET;
@@ -284,6 +288,10 @@ public class ConfigurationDao implements IDataProviderDao<Configuration> {
entity = em.merge(entity);
}
switch (key) {
+ case CONFIG_CAM_FPS:
+ case CONFIG_MIC_ECHO:
+ case CONFIG_MIC_NOISE:
+ case CONFIG_MIC_RATE:
case CONFIG_KEYCODE_ARRANGE:
case CONFIG_KEYCODE_EXCLUSIVE:
case CONFIG_KEYCODE_MUTE:
@@ -494,10 +502,16 @@ public class ConfigurationDao implements IDataProviderDao<Configuration> {
private JSONObject reloadRoomSettings() {
try {
setRoomSettings(new JSONObject()
- .put("keycode", new JSONObject()
- .put("arrange", getLong(CONFIG_KEYCODE_ARRANGE, 119L))
- .put("exclusive", getLong(CONFIG_KEYCODE_EXCLUSIVE, 123L))
- .put("mute", getLong(CONFIG_KEYCODE_MUTE, 118L))
+ .put("keycode", new JSONObject()
+ .put("arrange", getLong(CONFIG_KEYCODE_ARRANGE, 119L))
+ .put("exclusive", getLong(CONFIG_KEYCODE_EXCLUSIVE, 123L))
+ .put("mute", getLong(CONFIG_KEYCODE_MUTE, 118L))
+ )
+ .put("camera", new JSONObject().put("fps", getLong(CONFIG_CAM_FPS, 30L)))
+ .put("microphone", new JSONObject()
+ .put("rate", getLong(CONFIG_MIC_RATE, 30L))
+ .put("echo", getBool(CONFIG_MIC_ECHO, true))
+ .put("noise", getBool(CONFIG_MIC_NOISE, true))
)
);
} catch (Exception e) {
diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
index b0b12c5..827b7a1 100644
--- a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
+++ b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
@@ -44,6 +44,7 @@ import static org.apache.openmeetings.util.OmFileHelper.getUploadProfilesUserDir
import static org.apache.openmeetings.util.OmFileHelper.getUploadRoomDir;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_APPOINTMENT_REMINDER_MINUTES;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_CALENDAR_ROOM_CAPACITY;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_CAM_FPS;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_CRYPT;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DASHBOARD_RSS_FEED1;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DASHBOARD_RSS_FEED2;
@@ -58,18 +59,15 @@ import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DOCUMENT
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_EMAIL_AT_REGISTER;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_EMAIL_VERIFICATION;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_EXT_PROCESS_TTL;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_FLASH_CAM_QUALITY;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_FLASH_ECHO_PATH;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_FLASH_MIC_RATE;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_FLASH_SECURE;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_FLASH_VIDEO_BANDWIDTH;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_FLASH_VIDEO_FPS;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_IGNORE_BAD_SSL;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_KEYCODE_ARRANGE;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_KEYCODE_EXCLUSIVE;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_KEYCODE_MUTE;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_LOGIN_MIN_LENGTH;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_MAX_UPLOAD_SIZE;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_MIC_ECHO;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_MIC_NOISE;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_MIC_RATE;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_MYROOMS_ENABLED;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_PASS_MIN_LENGTH;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_PATH_FFMPEG;
@@ -239,7 +237,6 @@ public class BackupImport {
configTypes.put(CONFIG_DASHBOARD_SHOW_RSS, Configuration.Type.bool);
configTypes.put(CONFIG_REPLY_TO_ORGANIZER, Configuration.Type.bool);
configTypes.put(CONFIG_IGNORE_BAD_SSL, Configuration.Type.bool);
- configTypes.put(CONFIG_FLASH_SECURE, Configuration.Type.bool);
configTypes.put(CONFIG_MYROOMS_ENABLED, Configuration.Type.bool);
configTypes.put(CONFIG_DEFAULT_GROUP_ID, Configuration.Type.number);
configTypes.put(CONFIG_SMTP_PORT, Configuration.Type.number);
@@ -259,11 +256,10 @@ public class BackupImport {
configTypes.put(CONFIG_KEYCODE_EXCLUSIVE, Configuration.Type.number);
configTypes.put(CONFIG_KEYCODE_MUTE, Configuration.Type.number);
configTypes.put(CONFIG_DEFAULT_LDAP_ID, Configuration.Type.number);
- configTypes.put(CONFIG_FLASH_VIDEO_FPS, Configuration.Type.number);
- configTypes.put(CONFIG_FLASH_VIDEO_BANDWIDTH, Configuration.Type.number);
- configTypes.put(CONFIG_FLASH_CAM_QUALITY, Configuration.Type.number);
- configTypes.put(CONFIG_FLASH_MIC_RATE, Configuration.Type.number);
- configTypes.put(CONFIG_FLASH_ECHO_PATH, Configuration.Type.number);
+ configTypes.put(CONFIG_CAM_FPS, Configuration.Type.number);
+ configTypes.put(CONFIG_MIC_RATE, Configuration.Type.number);
+ configTypes.put(CONFIG_MIC_ECHO, Configuration.Type.bool);
+ configTypes.put(CONFIG_MIC_NOISE, Configuration.Type.bool);
configTypes.put(CONFIG_EXT_PROCESS_TTL, Configuration.Type.number);
}
diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java b/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
index df7f688..7860301 100644
--- a/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
+++ b/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
@@ -23,6 +23,7 @@ import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_APPLICAT
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_APPLICATION_NAME;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_APPOINTMENT_REMINDER_MINUTES;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_CALENDAR_ROOM_CAPACITY;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_CAM_FPS;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_CHAT_SEND_ON_ENTER;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_CRYPT;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DASHBOARD_RSS_FEED1;
@@ -40,14 +41,6 @@ import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DOCUMENT
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_EMAIL_AT_REGISTER;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_EMAIL_VERIFICATION;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_EXT_PROCESS_TTL;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_FLASH_CAM_QUALITY;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_FLASH_ECHO_PATH;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_FLASH_MIC_RATE;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_FLASH_SECURE;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_FLASH_SECURE_PROXY;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_FLASH_VIDEO_BANDWIDTH;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_FLASH_VIDEO_CODEC;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_FLASH_VIDEO_FPS;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_FNAME_MIN_LENGTH;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_GOOGLE_ANALYTICS_CODE;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_HEADER_CSP;
@@ -59,6 +52,9 @@ import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_KEYCODE_
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_LNAME_MIN_LENGTH;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_LOGIN_MIN_LENGTH;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_MAX_UPLOAD_SIZE;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_MIC_ECHO;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_MIC_NOISE;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_MIC_RATE;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_MP4_AUDIO_BITRATE;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_MP4_AUDIO_RATE;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_MP4_VIDEO_PRESET;
@@ -138,7 +134,7 @@ public class ImportInitvalues {
private static final String VER_3_0 = "3.0.x";
private static final String VER_3_0_3 = "3.0.3";
private static final String VER_3_3_0 = "3.3.0";
- private static final String VER_4_0_0 = "4.0.0";
+ private static final String VER_5_0_0 = "5.0.0";
private static final String CLIENT_PLACEHOLDER = "<put your client_id>";
private static final String SECRET_PLACEHOLDER = "<put your client_secret>";
private static final String EMAIL_PARAM = "email";
@@ -327,14 +323,6 @@ public class ImportInitvalues {
addCfg(list, CONFIG_REDIRECT_URL_FOR_EXTERNAL, "", Configuration.Type.string,
"Users entered the room via invitationHash or secureHash will be redirected to this URL on connection lost", VER_3_0);
addCfg(list, CONFIG_GOOGLE_ANALYTICS_CODE, null, Configuration.Type.string, "Code for Google Analytics", "3.1.0");
- addCfg(list, CONFIG_FLASH_SECURE, String.valueOf(false), Configuration.Type.bool, "Wether it should try to connect to rtmps first or not", VER_4_0_0);
- addCfg(list, CONFIG_FLASH_SECURE_PROXY, "none", Configuration.Type.string, "The setting for the NetConnection default settings is 'none'\n set to value 'best' if you are trying to use rtmp over native SSL", VER_4_0_0);
- addCfg(list, CONFIG_FLASH_VIDEO_CODEC, "h263", Configuration.Type.string, "Camera codecType, possible values: 'h263', 'h264'", VER_4_0_0);
- addCfg(list, CONFIG_FLASH_VIDEO_FPS, "30", Configuration.Type.number, "Camera FPS, should be positive number in range (0, 60]", VER_4_0_0);
- addCfg(list, CONFIG_FLASH_VIDEO_BANDWIDTH, "0", Configuration.Type.number, "An integer that specifies the maximum amount of bandwidth that the current outgoing video feed can use, in bytes per second. To specify that Flash video can use as much bandwidth as needed to maintain the value of frameQuality, pass 0 for bandwidth.", VER_4_0_0);
- addCfg(list, CONFIG_FLASH_CAM_QUALITY, "90", Configuration.Type.number, "An integer that specifies the required level of picture quality, as determined by the amount of compression being applied to each video frame. Acceptable values range from 1 (lowest quality, maximum compression) to 100 (highest quality, no compression). To specify that picture quality can vary as needed to avoid exceeding bandwidth, pass 0 for quality.", VER_4_0_0);
- addCfg(list, CONFIG_FLASH_MIC_RATE, "22", Configuration.Type.number, "The rate at which the microphone should capture sound, in kHz. Acceptable values are 5, 8, 11, 22, and 44. The default value is 22 kHz if your sound capture device supports this value.", VER_4_0_0);
- addCfg(list, CONFIG_FLASH_ECHO_PATH, "128", Configuration.Type.number, "Specifies the echo path length (in milliseconds). A longer echo path means better echo cancellation but also introduces longer delays and requires more processing power. The default value is 128; the only other possible value is 256. To disable AEC please specify 0.", VER_4_0_0);
addCfg(list, CONFIG_HEADER_XFRAME, HEADER_XFRAME_SAMEORIGIN, Configuration.Type.string, "Value for 'X-Frame-Options' header (default: DENY), more info: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Frame-Options", VER_3_3_0);
addCfg(list, CONFIG_HEADER_CSP, HEADER_CSP_SELF, Configuration.Type.string, String.format("Value for 'Content-Security-Policy' header (default: %s), have to be modified to enable Google analytics site: https://content-security-policy.com/", HEADER_CSP_SELF), VER_3_3_0);
addCfg(list, CONFIG_EXT_PROCESS_TTL, String.valueOf(getExtProcessTtl()), Configuration.Type.number, String.format("Time to live in minutes for external processes such as conversion via ffmpeg (default %s minutes)", getExtProcessTtl()), VER_3_3_0);
@@ -352,6 +340,10 @@ public class ImportInitvalues {
addCfg(list, CONFIG_MP4_VIDEO_PRESET, "medium", Configuration.Type.bool,
"Preset (encoder optimization settings) to be used while performing mp4 conversion."
+ "Valid values are: ultrafast, superfast, veryfast, faster, fast, medium, slow, slower, veryslow", "4.0.5");
+ addCfg(list, CONFIG_CAM_FPS, "30", Configuration.Type.number, "Camera FPS, should be positive number in range (0, 60]", VER_5_0_0);
+ addCfg(list, CONFIG_MIC_RATE, "22", Configuration.Type.number, "The rate at which the microphone should capture sound, in kHz. The default value is 22 kHz.", VER_5_0_0);
+ addCfg(list, CONFIG_MIC_ECHO, String.valueOf(true), Configuration.Type.bool, "Whether or not echo cancellation is preferred and/or required.", VER_5_0_0);
+ addCfg(list, CONFIG_MIC_NOISE, String.valueOf(true), Configuration.Type.bool, "Whether noise suppression is preferred and/or required.", VER_5_0_0);
return list;
}
public void loadConfiguration(InstallationConfig cfg) {
diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java
index 791d6bd..846ff51 100644
--- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java
+++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java
@@ -71,14 +71,10 @@ public class OpenmeetingsVariables {
public static final String CONFIG_PATH_OFFICE = "path.office";
public static final String CONFIG_DOCUMENT_DPI = "document.dpi";
public static final String CONFIG_DOCUMENT_QUALITY = "document.quality";
- public static final String CONFIG_FLASH_SECURE = "flash.secure";
- public static final String CONFIG_FLASH_SECURE_PROXY = "flash.secure.proxy";
- public static final String CONFIG_FLASH_VIDEO_CODEC = "flash.video.codec";
- public static final String CONFIG_FLASH_VIDEO_FPS = "flash.video.fps";
- public static final String CONFIG_FLASH_VIDEO_BANDWIDTH = "flash.video.bandwidth";
- public static final String CONFIG_FLASH_CAM_QUALITY = "flash.cam.quality";
- public static final String CONFIG_FLASH_MIC_RATE = "flash.mic.rate";
- public static final String CONFIG_FLASH_ECHO_PATH = "flash.echoPath";
+ public static final String CONFIG_CAM_FPS = "cam.fps";
+ public static final String CONFIG_MIC_RATE = "mic.rate";
+ public static final String CONFIG_MIC_ECHO = "mic.echo.cancellation";
+ public static final String CONFIG_MIC_NOISE = "mic.noise.suppression";
public static final String CONFIG_HEADER_XFRAME = "header.x.frame.options";
public static final String CONFIG_EXT_PROCESS_TTL = "external.process.ttl";
public static final String CONFIG_HEADER_CSP = "header.content.security.policy";
diff --git a/openmeetings-web/pom.xml b/openmeetings-web/pom.xml
index 1033e00..db90eeb 100644
--- a/openmeetings-web/pom.xml
+++ b/openmeetings-web/pom.xml
@@ -210,6 +210,7 @@
<jsSourceDir>../java/org/apache/openmeetings/web/room</jsSourceDir>
<jsSourceFiles>
<jsSourceFile>jquery.dialogextend.js</jsSourceFile>
+ <jsSourceFile>raw-video-util.js</jsSourceFile>
<jsSourceFile>raw-video.js</jsSourceFile>
<jsSourceFile>raw-video-manager.js</jsSourceFile>
<jsSourceFile>raw-room.js</jsSourceFile>
@@ -228,7 +229,6 @@
<charset>UTF-8</charset>
<jsSourceDir>../java/org/apache/openmeetings/web/room</jsSourceDir>
<jsSourceFiles>
- <jsSourceFile>raw-video-util.js</jsSourceFile>
<jsSourceFile>raw-settings.js</jsSourceFile>
<jsSourceFile>kurento-utils.js</jsSourceFile>
</jsSourceFiles>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.java
index b6e0c38..7a648d2 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.java
@@ -49,6 +49,8 @@ public class VideoSettings extends Panel {
public static JSONObject getInitJson(String sid) {
return new JSONObject(getRoomSettings().toString())
+ .put("interview", false)
+ .put("audioOnly", false)
.put("sid", sid);
}
}
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-settings.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-settings.js
index 14cb45a..525a950 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-settings.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-settings.js
@@ -253,13 +253,11 @@ var VideoSettings = (function() {
function _constraints(c) {
const cnts = {};
//TODO add check if constraint is supported
- //TODO remove hardcodings
- const o = typeof(Room) === 'object' ? Room.getOptions() : {audioOnly: false};
if (false === o.audioOnly && VideoUtil.hasVideo(c) && s.video.cam > -1) {
cnts.video = {
width: s.video.width
, height: s.video.height
- , frameRate: { max: 30 }
+ , frameRate: o.camera.fps
};
if (!!s.video.camDevice) {
cnts.video.deviceId = {
@@ -271,8 +269,9 @@ var VideoSettings = (function() {
}
if (VideoUtil.hasAudio(c) && s.video.mic > -1) {
cnts.audio = {
- sampleSize: 22
- , echoCancellation: true
+ sampleRate: o.microphone.rate
+ , echoCancellation: o.microphone.echo
+ , noiseSuppression: o.microphone.noise
};
if (!!s.video.micDevice) {
cnts.audio.deviceId = {