From ff818836dd2221c544afe1fcc17369b17f90b0db Mon Sep 17 00:00:00 2001 From: tassaron Date: Thu, 18 May 2017 19:14:27 -0400 Subject: [PATCH 1/5] added ability to use an mp4 as the background might not be the best way to do this (dumping all the video frames to a temp location), but it works for clips of a few minutes or less --- core.py | 62 +++++++++++++++++++++++++++++++++++++++-------- main.py | 20 +++++++-------- preview_thread.py | 11 ++++++++- video_thread.py | 39 +++++++++++++++++++---------- 4 files changed, 98 insertions(+), 34 deletions(-) diff --git a/core.py b/core.py index b362087..ea17edf 100644 --- a/core.py +++ b/core.py @@ -6,6 +6,9 @@ import subprocess as sp import numpy from PIL import Image, ImageDraw, ImageFont from PIL.ImageQt import ImageQt +import tempfile +from shutil import rmtree +import atexit class Core(): @@ -14,6 +17,8 @@ class Core(): self._image = None self.FFMPEG_BIN = self.findFfmpeg() + self.tempDir = None + atexit.register(self.deleteTempDir) def findFfmpeg(self): if sys.platform == "win32": @@ -26,23 +31,34 @@ class Core(): except: return "avconv" - def drawBaseImage(self, backgroundImage, titleText, titleFont, fontSize, alignment, xOffset, yOffset): - - if self._image == None or not self.lastBackgroundImage == backgroundImage: - self.lastBackgroundImage = backgroundImage - + def parseBaseImage(self, backgroundImage, preview=False): + ''' determines if the base image is a single frame or list of frames ''' if backgroundImage == "": - im = Image.new("RGB", (1280, 720), "black") + return [] else: - im = Image.open(backgroundImage) + _, bgExt = os.path.splitext(backgroundImage) + if not bgExt == '.mp4': + return [backgroundImage] + else: + return self.getVideoFrames(backgroundImage, preview) + + def drawBaseImage(self, backgroundFile, titleText, titleFont, fontSize, alignment, xOffset, yOffset): + if backgroundFile == '': + im = Image.new("RGB", (1280, 720), "black") + else: + im = Image.open(backgroundFile) + + if self._image == None or not self.lastBackgroundImage == backgroundFile: + self.lastBackgroundImage = backgroundFile # resize if necessary if not im.size == (1280, 720): im = im.resize((1280, 720), Image.ANTIALIAS) self._image = ImageQt(im) - + self._image1 = QtGui.QImage(self._image) + painter = QPainter(self._image1) font = titleFont font.setPointSizeF(fontSize) @@ -83,7 +99,6 @@ class Core(): imBottom = imTop.transpose(Image.FLIP_TOP_BOTTOM) im = Image.new("RGB", (1280, 720), "black") - im.paste(image, (0, 0)) im.paste(imTop, (0, 0), mask=imTop) im.paste(imBottom, (0, 360), mask=imBottom) @@ -99,7 +114,7 @@ class Core(): '-ac', '1', # mono (set to '2' for stereo) '-'] in_pipe = sp.Popen(command, stdout=sp.PIPE, stderr=sp.DEVNULL, bufsize=10**8) - + completeAudioArray = numpy.empty(0, dtype="int16") while True: @@ -150,3 +165,30 @@ class Core(): x = frequencies[0:int(paddedSampleSize/2) - 1] return lastSpectrum + + def deleteTempDir(self): + if self.tempDir and os.path.exists(self.tempDir): + rmtree(self.tempDir) + + + def getVideoFrames(self, videoPath, firstOnly=False): + self.tempDir = os.path.join(tempfile.gettempdir(), 'audio-visualizer-python-data') + # recreate the temporary directory so it is empty + self.deleteTempDir() + os.mkdir(self.tempDir) + if firstOnly: + filename = 'preview.jpg' + options = '-ss 10 -vframes 1' + else: + filename = '$frame%05d.jpg' + options = '' + sp.call( \ + '%s -i "%s" -y %s "%s"' % ( \ + self.FFMPEG_BIN, + videoPath, + options, + os.path.join(self.tempDir, filename) + ), + shell=True + ) + return sorted([os.path.join(self.tempDir, f) for f in os.listdir(self.tempDir)]) diff --git a/main.py b/main.py index 121efa0..391e4f6 100644 --- a/main.py +++ b/main.py @@ -35,13 +35,13 @@ class Main(QtCore.QObject): self.previewWorker.moveToThread(self.previewThread) self.previewWorker.imageCreated.connect(self.showPreviewImage) - + self.previewThread.start() self.timer = QtCore.QTimer(self) self.timer.timeout.connect(self.processTask.emit) self.timer.start(500) - + window.pushButton_selectInput.clicked.connect(self.openInputFileDialog) window.pushButton_selectOutput.clicked.connect(self.openOutputFileDialog) window.pushButton_createVideo.clicked.connect(self.createAudioVisualisation) @@ -69,7 +69,7 @@ class Main(QtCore.QObject): window.textYSpinBox.setValue(375) titleFont = self.settings.value("titleFont") - if not titleFont == None: + if not titleFont == None: window.fontComboBox.setCurrentFont(QFont(titleFont)) alignment = self.settings.value("alignment") @@ -113,7 +113,7 @@ class Main(QtCore.QObject): fileName = QtGui.QFileDialog.getOpenFileName(self.window, "Open Music File", inputDir, "Music Files (*.mp3 *.wav *.ogg *.flac)"); - if not fileName == "": + if not fileName == "": self.settings.setValue("inputDir", os.path.dirname(fileName)) self.window.label_input.setText(fileName) @@ -123,7 +123,7 @@ class Main(QtCore.QObject): fileName = QtGui.QFileDialog.getSaveFileName(self.window, "Set Output Video File", outputDir, "Video Files (*.mkv)"); - if not fileName == "": + if not fileName == "": self.settings.setValue("outputDir", os.path.dirname(fileName)) self.window.label_output.setText(fileName) @@ -131,9 +131,9 @@ class Main(QtCore.QObject): backgroundDir = self.settings.value("backgroundDir", expanduser("~")) fileName = QtGui.QFileDialog.getOpenFileName(self.window, - "Open Background Image", backgroundDir, "Image Files (*.jpg *.png)"); + "Open Background Image", backgroundDir, "Image Files (*.jpg *.png);; Videos (*.mp4)"); - if not fileName == "": + if not fileName == "": self.settings.setValue("backgroundDir", os.path.dirname(fileName)) self.window.label_background.setText(fileName) self.drawPreview() @@ -147,7 +147,7 @@ class Main(QtCore.QObject): self.videoWorker.moveToThread(self.videoThread) self.videoWorker.videoCreated.connect(self.videoCreated) self.videoWorker.progressBarUpdate.connect(self.progressBarUpdated) - + self.videoThread.start() self.videoTask.emit(self.window.label_background.text(), self.window.lineEdit_title.text(), @@ -158,7 +158,7 @@ class Main(QtCore.QObject): self.window.textYSpinBox.value(), self.window.label_input.text(), self.window.label_output.text()) - + def progressBarUpdated(self, value): self.window.progressBar_create.setValue(value) @@ -186,7 +186,7 @@ class Main(QtCore.QObject): if __name__ == "__main__": app = QtGui.QApplication(sys.argv) window = uic.loadUi("main.ui") - + main = Main(window) atexit.register(main.cleanUp) diff --git a/preview_thread.py b/preview_thread.py index 9dc7e4c..5bad653 100644 --- a/preview_thread.py +++ b/preview_thread.py @@ -43,8 +43,17 @@ class Worker(QtCore.QObject): except Empty: continue + bgImage = self.core.parseBaseImage(\ + nextPreviewInformation["backgroundImage"], + preview=True + ) + if bgImage == []: + bgImage = '' + else: + bgImage = bgImage[0] + im = self.core.drawBaseImage( - nextPreviewInformation["backgroundImage"], + bgImage, nextPreviewInformation["titleText"], nextPreviewInformation["titleFont"], nextPreviewInformation["fontSize"], diff --git a/video_thread.py b/video_thread.py index 1d1d44b..6bad504 100644 --- a/video_thread.py +++ b/video_thread.py @@ -21,18 +21,26 @@ class Worker(QtCore.QObject): @pyqtSlot(str, str, QtGui.QFont, int, int, int, int, str, str) def createVideo(self, backgroundImage, titleText, titleFont, fontSize, alignment, xOffset, yOffset, inputFile, outputFile): # print('worker thread id: {}'.format(QtCore.QThread.currentThreadId())) - - imBackground = self.core.drawBaseImage( - backgroundImage, - titleText, - titleFont, - fontSize, - alignment, - xOffset, - yOffset) + def getBackgroundAtIndex(i): + return self.core.drawBaseImage( + backgroundFrames[i], + titleText, + titleFont, + fontSize, + alignment, + xOffset, + yOffset) + + backgroundFrames = self.core.parseBaseImage(backgroundImage) + if len(backgroundFrames) < 2: + # the base image is not a video so we can draw it now + imBackground = getBackgroundAtIndex(0) + else: + # base images will be drawn while drawing the audio bars + imBackground = None self.progressBarUpdate.emit(0) - + completeAudioArray = self.core.readAudioFile(inputFile) # test if user has libfdk_aac @@ -64,7 +72,7 @@ class Worker(QtCore.QObject): ffmpegCommand.append('-2') ffmpegCommand.append(outputFile) - + out_pipe = sp.Popen(ffmpegCommand, stdin=sp.PIPE,stdout=sys.stdout, stderr=sys.stdout) @@ -75,7 +83,7 @@ class Worker(QtCore.QObject): sampleSize = 1470 numpy.seterr(divide='ignore') - + bgI = 0 for i in range(0, len(completeAudioArray), sampleSize): # create video for output lastSpectrum = self.core.transformData( @@ -85,7 +93,12 @@ class Worker(QtCore.QObject): smoothConstantDown, smoothConstantUp, lastSpectrum) - im = self.core.drawBars(lastSpectrum, imBackground) + if imBackground != None: + im = self.core.drawBars(lastSpectrum, imBackground) + else: + im = self.core.drawBars(lastSpectrum, getBackgroundAtIndex(bgI)) + if bgI < len(backgroundFrames)-1: + bgI += 1 # write to out_pipe try: From 898ac591e36a0d959db8c34fb6c5960a7eee9789 Mon Sep 17 00:00:00 2001 From: tassaron Date: Thu, 18 May 2017 19:48:52 -0400 Subject: [PATCH 2/5] added back in spaces deleted by my editor --- main.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/main.py b/main.py index 391e4f6..69a01dd 100644 --- a/main.py +++ b/main.py @@ -35,13 +35,13 @@ class Main(QtCore.QObject): self.previewWorker.moveToThread(self.previewThread) self.previewWorker.imageCreated.connect(self.showPreviewImage) - + self.previewThread.start() self.timer = QtCore.QTimer(self) self.timer.timeout.connect(self.processTask.emit) self.timer.start(500) - + window.pushButton_selectInput.clicked.connect(self.openInputFileDialog) window.pushButton_selectOutput.clicked.connect(self.openOutputFileDialog) window.pushButton_createVideo.clicked.connect(self.createAudioVisualisation) @@ -69,7 +69,7 @@ class Main(QtCore.QObject): window.textYSpinBox.setValue(375) titleFont = self.settings.value("titleFont") - if not titleFont == None: + if not titleFont == None: window.fontComboBox.setCurrentFont(QFont(titleFont)) alignment = self.settings.value("alignment") @@ -113,7 +113,7 @@ class Main(QtCore.QObject): fileName = QtGui.QFileDialog.getOpenFileName(self.window, "Open Music File", inputDir, "Music Files (*.mp3 *.wav *.ogg *.flac)"); - if not fileName == "": + if not fileName == "": self.settings.setValue("inputDir", os.path.dirname(fileName)) self.window.label_input.setText(fileName) @@ -123,7 +123,7 @@ class Main(QtCore.QObject): fileName = QtGui.QFileDialog.getSaveFileName(self.window, "Set Output Video File", outputDir, "Video Files (*.mkv)"); - if not fileName == "": + if not fileName == "": self.settings.setValue("outputDir", os.path.dirname(fileName)) self.window.label_output.setText(fileName) @@ -131,9 +131,9 @@ class Main(QtCore.QObject): backgroundDir = self.settings.value("backgroundDir", expanduser("~")) fileName = QtGui.QFileDialog.getOpenFileName(self.window, - "Open Background Image", backgroundDir, "Image Files (*.jpg *.png);; Videos (*.mp4)"); + "Open Background Image", backgroundDir, "Image Files (*.jpg *.png);; Video Files (*.mp4)"); - if not fileName == "": + if not fileName == "": self.settings.setValue("backgroundDir", os.path.dirname(fileName)) self.window.label_background.setText(fileName) self.drawPreview() @@ -147,7 +147,7 @@ class Main(QtCore.QObject): self.videoWorker.moveToThread(self.videoThread) self.videoWorker.videoCreated.connect(self.videoCreated) self.videoWorker.progressBarUpdate.connect(self.progressBarUpdated) - + self.videoThread.start() self.videoTask.emit(self.window.label_background.text(), self.window.lineEdit_title.text(), @@ -158,7 +158,7 @@ class Main(QtCore.QObject): self.window.textYSpinBox.value(), self.window.label_input.text(), self.window.label_output.text()) - + def progressBarUpdated(self, value): self.window.progressBar_create.setValue(value) @@ -186,7 +186,7 @@ class Main(QtCore.QObject): if __name__ == "__main__": app = QtGui.QApplication(sys.argv) window = uic.loadUi("main.ui") - + main = Main(window) atexit.register(main.cleanUp) From cb04c950d48ac7c7fa9b95b3c39d9a8fb6c5bae0 Mon Sep 17 00:00:00 2001 From: tassaron Date: Thu, 18 May 2017 19:54:48 -0400 Subject: [PATCH 3/5] added back in spaces deleted by my editor --- core.py | 7 +++---- video_thread.py | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/core.py b/core.py index ea17edf..8fd95f9 100644 --- a/core.py +++ b/core.py @@ -56,9 +56,8 @@ class Core(): im = im.resize((1280, 720), Image.ANTIALIAS) self._image = ImageQt(im) - + self._image1 = QtGui.QImage(self._image) - painter = QPainter(self._image1) font = titleFont font.setPointSizeF(fontSize) @@ -97,7 +96,7 @@ class Core(): imBottom = imTop.transpose(Image.FLIP_TOP_BOTTOM) - + im = Image.new("RGB", (1280, 720), "black") im.paste(image, (0, 0)) im.paste(imTop, (0, 0), mask=imTop) @@ -114,7 +113,7 @@ class Core(): '-ac', '1', # mono (set to '2' for stereo) '-'] in_pipe = sp.Popen(command, stdout=sp.PIPE, stderr=sp.DEVNULL, bufsize=10**8) - + completeAudioArray = numpy.empty(0, dtype="int16") while True: diff --git a/video_thread.py b/video_thread.py index 6bad504..1c466fc 100644 --- a/video_thread.py +++ b/video_thread.py @@ -40,7 +40,7 @@ class Worker(QtCore.QObject): imBackground = None self.progressBarUpdate.emit(0) - + completeAudioArray = self.core.readAudioFile(inputFile) # test if user has libfdk_aac @@ -72,7 +72,7 @@ class Worker(QtCore.QObject): ffmpegCommand.append('-2') ffmpegCommand.append(outputFile) - + out_pipe = sp.Popen(ffmpegCommand, stdin=sp.PIPE,stdout=sys.stdout, stderr=sys.stdout) From fb5115f0b205adbcd8f5a2d4d29a98fbc79cec60 Mon Sep 17 00:00:00 2001 From: tassaron Date: Sun, 21 May 2017 20:07:07 -0400 Subject: [PATCH 4/5] fixed preview not updating when changing between two videos making the filename of preview.jpg different each time seems to work --- core.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core.py b/core.py index 8fd95f9..92b0d0e 100644 --- a/core.py +++ b/core.py @@ -176,7 +176,7 @@ class Core(): self.deleteTempDir() os.mkdir(self.tempDir) if firstOnly: - filename = 'preview.jpg' + filename = 'preview%s.jpg' % os.path.basename(videoPath).split('.', 1)[0] options = '-ss 10 -vframes 1' else: filename = '$frame%05d.jpg' From e77199219521ab819730574c17a819c7e2bfe84d Mon Sep 17 00:00:00 2001 From: tassaron Date: Sun, 21 May 2017 22:44:48 -0400 Subject: [PATCH 5/5] more loading feedback --- main.py | 4 ++++ main.ui | 5 ++++- video_thread.py | 15 ++++++++++----- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/main.py b/main.py index 69a01dd..ac7acbc 100644 --- a/main.py +++ b/main.py @@ -147,6 +147,7 @@ class Main(QtCore.QObject): self.videoWorker.moveToThread(self.videoThread) self.videoWorker.videoCreated.connect(self.videoCreated) self.videoWorker.progressBarUpdate.connect(self.progressBarUpdated) + self.videoWorker.progressBarSetText.connect(self.progressBarSetText) self.videoThread.start() self.videoTask.emit(self.window.label_background.text(), @@ -163,6 +164,9 @@ class Main(QtCore.QObject): def progressBarUpdated(self, value): self.window.progressBar_create.setValue(value) + def progressBarSetText(self, value): + self.window.progressBar_create.setFormat(value) + def videoCreated(self): self.videoThread.quit() self.videoThread.wait() diff --git a/main.ui b/main.ui index 5b71d1c..c500905 100644 --- a/main.ui +++ b/main.ui @@ -386,7 +386,10 @@ 24 - false + true + + + Qt::AlignCenter diff --git a/video_thread.py b/video_thread.py index 1c466fc..bd832be 100644 --- a/video_thread.py +++ b/video_thread.py @@ -11,6 +11,7 @@ class Worker(QtCore.QObject): videoCreated = pyqtSignal() progressBarUpdate = pyqtSignal(int) + progressBarSetText = pyqtSignal(str) def __init__(self, parent=None): QtCore.QObject.__init__(self) @@ -31,6 +32,10 @@ class Worker(QtCore.QObject): xOffset, yOffset) + progressBarValue = 0 + self.progressBarUpdate.emit(progressBarValue) + self.progressBarSetText.emit('Loading background image…') + backgroundFrames = self.core.parseBaseImage(backgroundImage) if len(backgroundFrames) < 2: # the base image is not a video so we can draw it now @@ -38,9 +43,8 @@ class Worker(QtCore.QObject): else: # base images will be drawn while drawing the audio bars imBackground = None - - self.progressBarUpdate.emit(0) - + + self.progressBarSetText.emit('Loading audio file…') completeAudioArray = self.core.readAudioFile(inputFile) # test if user has libfdk_aac @@ -79,9 +83,8 @@ class Worker(QtCore.QObject): smoothConstantDown = 0.08 smoothConstantUp = 0.8 lastSpectrum = None - progressBarValue = 0 sampleSize = 1470 - + numpy.seterr(divide='ignore') bgI = 0 for i in range(0, len(completeAudioArray), sampleSize): @@ -110,6 +113,7 @@ class Worker(QtCore.QObject): if progressBarValue + 1 <= (i / len(completeAudioArray)) * 100: progressBarValue = numpy.floor((i / len(completeAudioArray)) * 100) self.progressBarUpdate.emit(progressBarValue) + self.progressBarSetText.emit('%s%%' % str(int(progressBarValue))) numpy.seterr(all='print') @@ -121,4 +125,5 @@ class Worker(QtCore.QObject): out_pipe.wait() print("Video file created") self.progressBarUpdate.emit(100) + self.progressBarSetText.emit('100%') self.videoCreated.emit()