mirror of https://github.com/OpenVidu/openvidu.git
Compare commits
2 Commits
Author | SHA1 | Date |
---|---|---|
![]() |
b2f385042b | |
![]() |
9cb45c747f |
|
@ -2,8 +2,8 @@
|
||||||
|
|
||||||
# Global variables
|
# Global variables
|
||||||
OPENVIDU_FOLDER=openvidu
|
OPENVIDU_FOLDER=openvidu
|
||||||
OPENVIDU_VERSION=master
|
OPENVIDU_VERSION=v2.18.0
|
||||||
OPENVIDU_UPGRADABLE_VERSION="2.16"
|
OPENVIDU_UPGRADABLE_VERSION="2.17"
|
||||||
DOWNLOAD_URL=https://raw.githubusercontent.com/OpenVidu/openvidu/${OPENVIDU_VERSION}
|
DOWNLOAD_URL=https://raw.githubusercontent.com/OpenVidu/openvidu/${OPENVIDU_VERSION}
|
||||||
|
|
||||||
fatal_error() {
|
fatal_error() {
|
||||||
|
|
|
@ -2,8 +2,8 @@
|
||||||
|
|
||||||
# Global variables
|
# Global variables
|
||||||
OPENVIDU_FOLDER=openvidu
|
OPENVIDU_FOLDER=openvidu
|
||||||
OPENVIDU_VERSION=master
|
OPENVIDU_VERSION=v2.18.0
|
||||||
OPENVIDU_UPGRADABLE_VERSION="master"
|
OPENVIDU_UPGRADABLE_VERSION="2.17"
|
||||||
AWS_SCRIPTS_FOLDER=${OPENVIDU_FOLDER}/cluster/aws
|
AWS_SCRIPTS_FOLDER=${OPENVIDU_FOLDER}/cluster/aws
|
||||||
ELASTICSEARCH_FOLDER=${OPENVIDU_FOLDER}/elasticsearch
|
ELASTICSEARCH_FOLDER=${OPENVIDU_FOLDER}/elasticsearch
|
||||||
BEATS_FOLDER=${OPENVIDU_FOLDER}/beats
|
BEATS_FOLDER=${OPENVIDU_FOLDER}/beats
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
MEDIA_NODE_FOLDER=kms
|
MEDIA_NODE_FOLDER=kms
|
||||||
MEDIA_NODE_VERSION=master
|
MEDIA_NODE_VERSION=v2.18.0
|
||||||
OPENVIDU_UPGRADABLE_VERSION="2.16"
|
OPENVIDU_UPGRADABLE_VERSION="2.17"
|
||||||
BEATS_FOLDER=${MEDIA_NODE_FOLDER}/beats
|
BEATS_FOLDER=${MEDIA_NODE_FOLDER}/beats
|
||||||
DOWNLOAD_URL=https://raw.githubusercontent.com/OpenVidu/openvidu/${MEDIA_NODE_VERSION}
|
DOWNLOAD_URL=https://raw.githubusercontent.com/OpenVidu/openvidu/${MEDIA_NODE_VERSION}
|
||||||
IMAGES=(
|
IMAGES=(
|
||||||
|
|
|
@ -2,8 +2,8 @@
|
||||||
|
|
||||||
# Global variables
|
# Global variables
|
||||||
OPENVIDU_FOLDER=openvidu
|
OPENVIDU_FOLDER=openvidu
|
||||||
OPENVIDU_VERSION=master
|
OPENVIDU_VERSION=v2.18.0
|
||||||
OPENVIDU_UPGRADABLE_VERSION="2.16"
|
OPENVIDU_UPGRADABLE_VERSION="2.17"
|
||||||
AWS_SCRIPTS_FOLDER=${OPENVIDU_FOLDER}/cluster/aws
|
AWS_SCRIPTS_FOLDER=${OPENVIDU_FOLDER}/cluster/aws
|
||||||
ELASTICSEARCH_FOLDER=${OPENVIDU_FOLDER}/elasticsearch
|
ELASTICSEARCH_FOLDER=${OPENVIDU_FOLDER}/elasticsearch
|
||||||
BEATS_FOLDER=${OPENVIDU_FOLDER}/beats
|
BEATS_FOLDER=${OPENVIDU_FOLDER}/beats
|
||||||
|
|
|
@ -78,14 +78,20 @@ public class Recording {
|
||||||
RecordingProperties.Builder builder = new RecordingProperties.Builder().name(json.get("name").getAsString())
|
RecordingProperties.Builder builder = new RecordingProperties.Builder().name(json.get("name").getAsString())
|
||||||
.outputMode(outputMode).hasAudio(hasAudio).hasVideo(hasVideo);
|
.outputMode(outputMode).hasAudio(hasAudio).hasVideo(hasVideo);
|
||||||
if (RecordingUtils.IS_COMPOSED(outputMode) && hasVideo) {
|
if (RecordingUtils.IS_COMPOSED(outputMode) && hasVideo) {
|
||||||
|
if (json.has("resolution")) {
|
||||||
builder.resolution(json.get("resolution").getAsString());
|
builder.resolution(json.get("resolution").getAsString());
|
||||||
|
}
|
||||||
|
if (json.has("frameRate")) {
|
||||||
builder.frameRate(json.get("frameRate").getAsInt());
|
builder.frameRate(json.get("frameRate").getAsInt());
|
||||||
|
}
|
||||||
|
if (json.has("recordingLayout")) {
|
||||||
RecordingLayout recordingLayout = RecordingLayout.valueOf(json.get("recordingLayout").getAsString());
|
RecordingLayout recordingLayout = RecordingLayout.valueOf(json.get("recordingLayout").getAsString());
|
||||||
builder.recordingLayout(recordingLayout);
|
builder.recordingLayout(recordingLayout);
|
||||||
if (RecordingLayout.CUSTOM.equals(recordingLayout)) {
|
if (RecordingLayout.CUSTOM.equals(recordingLayout) && json.has("customLayout")) {
|
||||||
builder.customLayout(json.get("customLayout").getAsString());
|
builder.customLayout(json.get("customLayout").getAsString());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
this.recordingProperties = builder.build();
|
this.recordingProperties = builder.build();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue