From 92b74622e07e1a1e9860eed675ae64db90f5a12c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Calvi=C3=B1o=20S=C3=A1nchez?= Date: Fri, 15 Sep 2023 14:22:06 +0200 Subject: Allow configuring ffmpeg executable and global options also in benchmark MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel Calviño Sánchez --- recording/src/nextcloud/talk/recording/Benchmark.py | 2 ++ recording/src/nextcloud/talk/recording/RecorderArgumentsBuilder.py | 3 +++ 2 files changed, 5 insertions(+) diff --git a/recording/src/nextcloud/talk/recording/Benchmark.py b/recording/src/nextcloud/talk/recording/Benchmark.py index af9c43f6e..cafac515f 100644 --- a/recording/src/nextcloud/talk/recording/Benchmark.py +++ b/recording/src/nextcloud/talk/recording/Benchmark.py @@ -164,6 +164,7 @@ class BenchmarkService: status = RECORDING_STATUS_AUDIO_ONLY if args.audio_only else RECORDING_STATUS_AUDIO_AND_VIDEO recorderArgumentsBuilder = RecorderArgumentsBuilder() + recorderArgumentsBuilder.setFfmpegCommon(args.ffmpeg_common.split()) recorderArgumentsBuilder.setFfmpegOutputAudio(args.ffmpeg_output_audio.split()) recorderArgumentsBuilder.setFfmpegOutputVideo(args.ffmpeg_output_video.split()) recorderArgumentsBuilder.setExtension(f".{extension}") @@ -277,6 +278,7 @@ def main(): parser.add_argument("-l", "--length", help="benchmark duration (in seconds)", default=180, type=int) parser.add_argument("--width", help="output width", default=defaultConfig.getBackendVideoWidth(""), type=int) parser.add_argument("--height", help="output height", default=defaultConfig.getBackendVideoHeight(""), type=int) + parser.add_argument("--ffmpeg-common", help="ffmpeg executable and global options", default=" ".join(defaultConfig.getFfmpegCommon()), type=str) parser.add_argument("--ffmpeg-output-audio", help="output audio options for ffmpeg", default=" ".join(defaultConfig.getFfmpegOutputAudio()), type=str) parser.add_argument("--ffmpeg-output-video", help="output video options for ffmpeg", default=" ".join(defaultConfig.getFfmpegOutputVideo()), type=str) parser.add_argument("--audio-only", help="audio only recording", action="store_true") diff --git a/recording/src/nextcloud/talk/recording/RecorderArgumentsBuilder.py b/recording/src/nextcloud/talk/recording/RecorderArgumentsBuilder.py index 38e6535ee..f228fb686 100644 --- a/recording/src/nextcloud/talk/recording/RecorderArgumentsBuilder.py +++ b/recording/src/nextcloud/talk/recording/RecorderArgumentsBuilder.py @@ -102,6 +102,9 @@ class RecorderArgumentsBuilder: return config.getFfmpegExtensionAudio() + def setFfmpegCommon(self, ffmpegCommon): + self._ffmpegCommon = ffmpegCommon + def setFfmpegOutputAudio(self, ffmpegOutputAudio): self._ffmpegOutputAudio = ffmpegOutputAudio -- cgit v1.2.3