waveform component is working, preview is glitchy

3 files changed, 37 insertions, 26 deletions

diff --git a/src/toolkit/common.py b/src/toolkit/common.py
index 128ed08..5d424e0 100644
--- a/src/toolkit/common.py
+++ b/src/toolkit/common.py
@@ -6,22 +6,9 @@ import string
 import os
 import sys
 import subprocess
-import signal
-import math
 from collections import OrderedDict
 
 
-def scale(scale, width, height, returntype=None):
-    width = (float(width) / 100.0) * float(scale)
-    height = (float(height) / 100.0) * float(scale)
-    if returntype == str:
-        return (str(math.ceil(width)), str(math.ceil(height)))
-    elif returntype == int:
-        return (math.ceil(width), math.ceil(height))
-    else:
-        return (width, height)
-
-
 def badName(name):
     '''Returns whether a name contains non-alphanumeric chars'''
     return any([letter in string.punctuation for letter in name])
@@ -69,14 +56,6 @@ def checkOutput(commandList, **kwargs):
     return subprocess.check_output(commandList, **kwargs)
 
 
-@pipeWrapper
-def openPipe(commandList, **kwargs):
-    return subprocess.Popen(commandList, **kwargs)
-
-def closePipe(pipe):
-    pipe.stdout.close()
-    pipe.send_signal(signal.SIGINT)
-
 def disableWhenEncoding(func):
     def decorator(self, *args, **kwargs):
         if self.encoding:
diff --git a/src/toolkit/ffmpeg.py b/src/toolkit/ffmpeg.py
index fea9d4e..e37282f 100644
--- a/src/toolkit/ffmpeg.py
+++ b/src/toolkit/ffmpeg.py
@@ -6,10 +6,12 @@ import sys
 import os
 import subprocess
 import threading
+import signal
 from queue import PriorityQueue
 
 import core
-from toolkit.common import checkOutput, openPipe
+from toolkit.common import checkOutput, pipeWrapper
+from component import ComponentError
 
 
 class FfmpegVideo:
@@ -60,7 +62,8 @@ class FfmpegVideo:
                 kwargs['filter_']
             )
         self.command.extend([
-            '-vcodec', 'rawvideo', '-',
+            '-s:v', '%sx%s' % (self.width, self.height),
+            '-codec:v', 'rawvideo', '-',
         ])
 
         self.frameBuffer = PriorityQueue()
@@ -85,9 +88,11 @@ class FfmpegVideo:
             self.frameBuffer.task_done()
 
     def fillBuffer(self):
+        import sys
+        print(self.command)
         self.pipe = openPipe(
             self.command, stdin=subprocess.DEVNULL, stdout=subprocess.PIPE,
-            stderr=subprocess.DEVNULL, bufsize=10**8
+            stderr=sys.__stdout__, bufsize=10**8
         )
         while True:
             if self.parent.canceled:
@@ -100,7 +105,7 @@ class FfmpegVideo:
                     self.frameBuffer.put((self.frameNo-1, self.lastFrame))
                     continue
             except AttributeError:
-                Video.threadError = ComponentError(self.component, 'video')
+                FfmpegVideo.threadError = ComponentError(self.component, 'video')
                 break
 
             self.currentFrame = self.pipe.stdout.read(self.chunkSize)
@@ -109,6 +114,16 @@ class FfmpegVideo:
                 self.lastFrame = self.currentFrame
 
 
+@pipeWrapper
+def openPipe(commandList, **kwargs):
+    return subprocess.Popen(commandList, **kwargs)
+
+
+def closePipe(pipe):
+    pipe.stdout.close()
+    pipe.send_signal(signal.SIGINT)
+
+
 def findFfmpeg():
     if getattr(sys, 'frozen', False):
         # The application is frozen
@@ -347,7 +362,12 @@ def getAudioDuration(filename):
     except subprocess.CalledProcessError as ex:
         fileInfo = ex.output
 
-    info = fileInfo.decode("utf-8").split('\n')
+    try:
+        info = fileInfo.decode("utf-8").split('\n')
+    except UnicodeDecodeError as e:
+        print('Unicode error:', str(e))
+        return False
+
     for line in info:
         if 'Duration' in line:
             d = line.split(',')[0]
diff --git a/src/toolkit/frame.py b/src/toolkit/frame.py
index b66e037..f42d4c9 100644
--- a/src/toolkit/frame.py
+++ b/src/toolkit/frame.py
@@ -6,6 +6,7 @@ from PIL import Image
 from PIL.ImageQt import ImageQt
 import sys
 import os
+import math
 
 import core
 
@@ -41,6 +42,17 @@ class PaintColor(QtGui.QColor):
             super().__init__(b, g, r, a)
 
 
+def scale(scale, width, height, returntype=None):
+    width = (float(width) / 100.0) * float(scale)
+    height = (float(height) / 100.0) * float(scale)
+    if returntype == str:
+        return (str(math.ceil(width)), str(math.ceil(height)))
+    elif returntype == int:
+        return (math.ceil(width), math.ceil(height))
+    else:
+        return (width, height)
+
+
 def defaultSize(framefunc):
     '''Makes width/height arguments optional'''
     def decorator(*args):