Compare commits

...

2 Commits

Author SHA1 Message Date
pabloFuente b2f385042b openvidu-server: fix Recording construction with frameRate property 2021-06-02 12:49:43 +02:00
pabloFuente 9cb45c747f Updated deployment scripts to 2.18.0 2021-06-01 18:31:23 +02:00
5 changed files with 20 additions and 14 deletions

View File

@ -2,8 +2,8 @@
# Global variables
OPENVIDU_FOLDER=openvidu
OPENVIDU_VERSION=master
OPENVIDU_UPGRADABLE_VERSION="2.16"
OPENVIDU_VERSION=v2.18.0
OPENVIDU_UPGRADABLE_VERSION="2.17"
DOWNLOAD_URL=https://raw.githubusercontent.com/OpenVidu/openvidu/${OPENVIDU_VERSION}
fatal_error() {

View File

@ -2,8 +2,8 @@
# Global variables
OPENVIDU_FOLDER=openvidu
OPENVIDU_VERSION=master
OPENVIDU_UPGRADABLE_VERSION="master"
OPENVIDU_VERSION=v2.18.0
OPENVIDU_UPGRADABLE_VERSION="2.17"
AWS_SCRIPTS_FOLDER=${OPENVIDU_FOLDER}/cluster/aws
ELASTICSEARCH_FOLDER=${OPENVIDU_FOLDER}/elasticsearch
BEATS_FOLDER=${OPENVIDU_FOLDER}/beats

View File

@ -1,8 +1,8 @@
#!/usr/bin/env bash
MEDIA_NODE_FOLDER=kms
MEDIA_NODE_VERSION=master
OPENVIDU_UPGRADABLE_VERSION="2.16"
MEDIA_NODE_VERSION=v2.18.0
OPENVIDU_UPGRADABLE_VERSION="2.17"
BEATS_FOLDER=${MEDIA_NODE_FOLDER}/beats
DOWNLOAD_URL=https://raw.githubusercontent.com/OpenVidu/openvidu/${MEDIA_NODE_VERSION}
IMAGES=(

View File

@ -2,8 +2,8 @@
# Global variables
OPENVIDU_FOLDER=openvidu
OPENVIDU_VERSION=master
OPENVIDU_UPGRADABLE_VERSION="2.16"
OPENVIDU_VERSION=v2.18.0
OPENVIDU_UPGRADABLE_VERSION="2.17"
AWS_SCRIPTS_FOLDER=${OPENVIDU_FOLDER}/cluster/aws
ELASTICSEARCH_FOLDER=${OPENVIDU_FOLDER}/elasticsearch
BEATS_FOLDER=${OPENVIDU_FOLDER}/beats

View File

@ -78,14 +78,20 @@ public class Recording {
RecordingProperties.Builder builder = new RecordingProperties.Builder().name(json.get("name").getAsString())
.outputMode(outputMode).hasAudio(hasAudio).hasVideo(hasVideo);
if (RecordingUtils.IS_COMPOSED(outputMode) && hasVideo) {
if (json.has("resolution")) {
builder.resolution(json.get("resolution").getAsString());
}
if (json.has("frameRate")) {
builder.frameRate(json.get("frameRate").getAsInt());
}
if (json.has("recordingLayout")) {
RecordingLayout recordingLayout = RecordingLayout.valueOf(json.get("recordingLayout").getAsString());
builder.recordingLayout(recordingLayout);
if (RecordingLayout.CUSTOM.equals(recordingLayout)) {
if (RecordingLayout.CUSTOM.equals(recordingLayout) && json.has("customLayout")) {
builder.customLayout(json.get("customLayout").getAsString());
}
}
}
this.recordingProperties = builder.build();
}