From 859ecfbcdd7f11633a039684a538235deaf0faa8 Mon Sep 17 00:00:00 2001 From: pabloFuente Date: Mon, 5 Apr 2021 20:51:49 +0200 Subject: [PATCH] openvidu-server: add frameRate in final places --- openvidu-server/docker/openvidu-recording/create_image.sh | 2 +- .../src/main/java/io/openvidu/server/recording/Recording.java | 1 + .../recording/service/ComposedQuickStartRecordingService.java | 1 + .../io/openvidu/server/recording/service/RecordingService.java | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/openvidu-server/docker/openvidu-recording/create_image.sh b/openvidu-server/docker/openvidu-recording/create_image.sh index 46f1c62a..c627cc61 100755 --- a/openvidu-server/docker/openvidu-recording/create_image.sh +++ b/openvidu-server/docker/openvidu-recording/create_image.sh @@ -4,6 +4,6 @@ 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_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 \ -t openvidu/openvidu-recording:$OPENVIDU_RECORDING_DOCKER_TAG . \ No newline at end of file diff --git a/openvidu-server/src/main/java/io/openvidu/server/recording/Recording.java b/openvidu-server/src/main/java/io/openvidu/server/recording/Recording.java index 2a6bd8ce..871c909a 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/recording/Recording.java +++ b/openvidu-server/src/main/java/io/openvidu/server/recording/Recording.java @@ -189,6 +189,7 @@ public class Recording { json.addProperty("outputMode", this.getOutputMode().name()); if (RecordingUtils.IS_COMPOSED(this.recordingProperties.outputMode()) && this.recordingProperties.hasVideo()) { json.addProperty("resolution", this.recordingProperties.resolution()); + json.addProperty("frameRate", this.recordingProperties.frameRate()); json.addProperty("recordingLayout", this.recordingProperties.recordingLayout().name()); if (RecordingLayout.CUSTOM.equals(this.recordingProperties.recordingLayout())) { json.addProperty("customLayout", this.recordingProperties.customLayout()); diff --git a/openvidu-server/src/main/java/io/openvidu/server/recording/service/ComposedQuickStartRecordingService.java b/openvidu-server/src/main/java/io/openvidu/server/recording/service/ComposedQuickStartRecordingService.java index a12fedee..452f9b8a 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/recording/service/ComposedQuickStartRecordingService.java +++ b/openvidu-server/src/main/java/io/openvidu/server/recording/service/ComposedQuickStartRecordingService.java @@ -210,6 +210,7 @@ public class ComposedQuickStartRecordingService extends ComposedRecordingService envs.add("DEBUG_MODE=" + openviduConfig.isOpenViduRecordingDebug()); envs.add("RECORDING_TYPE=COMPOSED_QUICK_START"); envs.add("RESOLUTION=" + properties.resolution()); + envs.add("FRAMERATE=" + properties.frameRate()); envs.add("URL=" + layoutUrl); log.info("Recorder connecting to url {}", layoutUrl); diff --git a/openvidu-server/src/main/java/io/openvidu/server/recording/service/RecordingService.java b/openvidu-server/src/main/java/io/openvidu/server/recording/service/RecordingService.java index aa04cef2..8a4114c9 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/recording/service/RecordingService.java +++ b/openvidu-server/src/main/java/io/openvidu/server/recording/service/RecordingService.java @@ -161,6 +161,7 @@ public abstract class RecordingService { .mediaNode(properties.mediaNode()); if (RecordingUtils.IS_COMPOSED(properties.outputMode()) && properties.hasVideo()) { builder.resolution(properties.resolution()); + builder.frameRate(properties.frameRate()); builder.recordingLayout(properties.recordingLayout()); if (RecordingLayout.CUSTOM.equals(properties.recordingLayout())) { builder.customLayout(properties.customLayout());