aboutsummaryrefslogtreecommitdiff
path: root/src/video_thread.py
diff options
context:
space:
mode:
authortassaron2017-07-15 13:13:53 -0400
committertassaron2017-07-15 13:13:53 -0400
commitbcb8f27c2e4434d2296dcd66bf279b76ee0d0a4f (patch)
tree2a7f9df3eebbae8da4317516f84dfe7490b5d36a /src/video_thread.py
parent62ab09e3f36dcaf6c1a4680dc6c4d048fb2e165c (diff)
use -t on inputs so ffmpeg knows when to stop filters
+ better feedback in cmd mode
Diffstat (limited to 'src/video_thread.py')
-rw-r--r--src/video_thread.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/video_thread.py b/src/video_thread.py
index 5295a3b..674765a 100644
--- a/src/video_thread.py
+++ b/src/video_thread.py
@@ -31,7 +31,6 @@ class Worker(QtCore.QObject):
progressBarSetText = pyqtSignal(str)
encoding = pyqtSignal(bool)
-
def __init__(self, parent, inputFile, outputFile, components):
QtCore.QObject.__init__(self)
self.core = parent.core
@@ -135,7 +134,9 @@ class Worker(QtCore.QObject):
# =~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~==~=~=~=~=~=~=~=~=~=~=~=~=~=~
self.progressBarSetText.emit("Loading audio file...")
- self.completeAudioArray = self.core.readAudioFile(self.inputFile, self)
+ self.completeAudioArray, duration = self.core.readAudioFile(
+ self.inputFile, self
+ )
self.progressBarUpdate.emit(0)
self.progressBarSetText.emit("Starting components...")
@@ -144,7 +145,6 @@ class Worker(QtCore.QObject):
for num, component in enumerate(reversed(self.components))
]))
self.staticComponents = {}
- numComps = len(self.components)
for compNo, comp in enumerate(reversed(self.components)):
comp.preFrameRender(
worker=self,
@@ -194,7 +194,7 @@ class Worker(QtCore.QObject):
self.staticComponents[compNo] = None
ffmpegCommand = self.core.createFfmpegCommand(
- self.inputFile, self.outputFile
+ self.inputFile, self.outputFile, duration
)
print('###### FFMPEG COMMAND ######\n%s' % " ".join(ffmpegCommand))
print('############################')