ambiser
/
openvidu
mirror of https://github.com/OpenVidu/openvidu.git
8
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

openvidu-server: add frameRate in final places

pull/621/head
pabloFuente 2021-04-05 20:51:49 +02:00
parent 4cc1bacc20
commit 859ecfbcdd
4 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openvidu-server/docker/openvidu-recording/create_image.sh
View File

@ -4,6 +4,6 @@
OPENVIDU_RECORDING_UBUNTU_VERSION=$1 OPENVIDU_RECORDING_UBUNTU_VERSION=$1
OPENVIDU_RECORDING_CHROME_VERSION=$2 # https://www.ubuntuupdates.org/package_logs?noppa=&page=1&type=ppas&vals=8# OPENVIDU_RECORDING_CHROME_VERSION=$2 # https://www.ubuntuupdates.org/package_logs?noppa=&page=1&type=ppas&vals=8#
OPENVIDU_RECORDING_DOCKER_TAG=$3 OPENVIDU_RECORDING_DOCKER_TAG=$3
docker build --rm --build-arg CHROME_VERSION="$OPENVIDU_RECORDING_CHROME_VERSION" \ docker build --rm --pull --no-cache --build-arg CHROME_VERSION="$OPENVIDU_RECORDING_CHROME_VERSION" \
-f $OPENVIDU_RECORDING_UBUNTU_VERSION.Dockerfile \ -f $OPENVIDU_RECORDING_UBUNTU_VERSION.Dockerfile \
-t openvidu/openvidu-recording:$OPENVIDU_RECORDING_DOCKER_TAG . -t openvidu/openvidu-recording:$OPENVIDU_RECORDING_DOCKER_TAG .

1
openvidu-server/src/main/java/io/openvidu/server/recording/Recording.java
View File

@ -189,6 +189,7 @@ public class Recording {
json.addProperty("outputMode", this.getOutputMode().name()); json.addProperty("outputMode", this.getOutputMode().name());
if (RecordingUtils.IS_COMPOSED(this.recordingProperties.outputMode()) && this.recordingProperties.hasVideo()) { if (RecordingUtils.IS_COMPOSED(this.recordingProperties.outputMode()) && this.recordingProperties.hasVideo()) {
json.addProperty("resolution", this.recordingProperties.resolution()); json.addProperty("resolution", this.recordingProperties.resolution());
json.addProperty("frameRate", this.recordingProperties.frameRate());
json.addProperty("recordingLayout", this.recordingProperties.recordingLayout().name()); json.addProperty("recordingLayout", this.recordingProperties.recordingLayout().name());
if (RecordingLayout.CUSTOM.equals(this.recordingProperties.recordingLayout())) { if (RecordingLayout.CUSTOM.equals(this.recordingProperties.recordingLayout())) {
json.addProperty("customLayout", this.recordingProperties.customLayout()); json.addProperty("customLayout", this.recordingProperties.customLayout());

1
openvidu-server/src/main/java/io/openvidu/server/recording/service/ComposedQuickStartRecordingService.java
View File

@ -210,6 +210,7 @@ public class ComposedQuickStartRecordingService extends ComposedRecordingService
envs.add("DEBUG_MODE=" + openviduConfig.isOpenViduRecordingDebug()); envs.add("DEBUG_MODE=" + openviduConfig.isOpenViduRecordingDebug());
envs.add("RECORDING_TYPE=COMPOSED_QUICK_START"); envs.add("RECORDING_TYPE=COMPOSED_QUICK_START");
envs.add("RESOLUTION=" + properties.resolution()); envs.add("RESOLUTION=" + properties.resolution());
envs.add("FRAMERATE=" + properties.frameRate());
envs.add("URL=" + layoutUrl); envs.add("URL=" + layoutUrl);
log.info("Recorder connecting to url {}", layoutUrl); log.info("Recorder connecting to url {}", layoutUrl);

1
openvidu-server/src/main/java/io/openvidu/server/recording/service/RecordingService.java
View File

@ -161,6 +161,7 @@ public abstract class RecordingService {
.mediaNode(properties.mediaNode()); .mediaNode(properties.mediaNode());
if (RecordingUtils.IS_COMPOSED(properties.outputMode()) && properties.hasVideo()) { if (RecordingUtils.IS_COMPOSED(properties.outputMode()) && properties.hasVideo()) {
builder.resolution(properties.resolution()); builder.resolution(properties.resolution());
builder.frameRate(properties.frameRate());
builder.recordingLayout(properties.recordingLayout()); builder.recordingLayout(properties.recordingLayout());
if (RecordingLayout.CUSTOM.equals(properties.recordingLayout())) { if (RecordingLayout.CUSTOM.equals(properties.recordingLayout())) {
builder.customLayout(properties.customLayout()); builder.customLayout(properties.customLayout());