From 4cd0291e8e57d57ae5ff68f2a3d8ad52345572a1 Mon Sep 17 00:00:00 2001 From: TNTwise Date: Sat, 7 Sep 2024 05:05:41 +0000 Subject: [PATCH] revert bad changes --- backend/src/FFmpeg.py | 2 +- backend/src/RenderVideo.py | 8 ++++---- backend/src/Util.py | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/src/FFmpeg.py b/backend/src/FFmpeg.py index 3b69f4cd..c7b28821 100644 --- a/backend/src/FFmpeg.py +++ b/backend/src/FFmpeg.py @@ -243,7 +243,7 @@ def getFFmpegWriteCommand(self): "-", "-i", f"{self.inputFile}", - ["-i" + subtitle for subtitle in self.subtitleFiles], + #"""["-i" + subtitle for subtitle in self.subtitleFiles],""" "-r", f"{self.fps * self.interpolateFactor}", f"-crf", diff --git a/backend/src/RenderVideo.py b/backend/src/RenderVideo.py index 74e9beb1..3e054417 100644 --- a/backend/src/RenderVideo.py +++ b/backend/src/RenderVideo.py @@ -138,11 +138,11 @@ def renderUpscale(self): log("Starting Upscale") for i in range(self.totalInputFrames - 1): frame = self.readQueue.get() - if self.skipUpscaleIfSameFrame(frame=frame): - self.writeQueue.put(self.f0) - else: - self.f0 = self.upscale(self.frameSetupFunction(self.frame)) + '''if self.skipUpscaleIfSameFrame(frame=frame): self.writeQueue.put(self.f0) + else:''' + self.f0 = self.upscale(self.frameSetupFunction(frame)) + self.writeQueue.put(self.f0) self.writeQueue.put(None) log("Finished Upscale") diff --git a/backend/src/Util.py b/backend/src/Util.py index 517eb8d6..140b76db 100644 --- a/backend/src/Util.py +++ b/backend/src/Util.py @@ -61,7 +61,7 @@ def currentDirectory(): return cwd def ffmpegPath() -> str: - return os.path.join(currentDirectory(),'bin','ffmpeg') + return str(os.path.join(currentDirectory(),'bin','ffmpeg')) def modelsDirectory(): return os.path.join(cwd, "models")