Bunch of fixes

vidcutter/libs/config.py

@@ -23,6 +23,7 @@
 #######################################################################
 
 from enum import Enum
+from typing import Dict, List
 
 from PyQt5.QtCore import QSize
 
@@ -40,41 +41,41 @@ def filter_settings() -> Munch:
         )
 
     @property
-    def thumbnails(self) -> dict:
+    def thumbnails(self) -> Dict[str, QSize]:
         return {'INDEX': QSize(100, 70), 'TIMELINE': QSize(105, 60)}
 
     @property
-    def video_codecs(self) -> list:
+    def video_codecs(self) -> List[str]:
         return ['flv', 'h263', 'libvpx', 'libx264', 'libx265', 'libxvid', 'mpeg2video', 'mpeg4', 'msmpeg4', 'wmv2']
 
     @property
-    def audio_codecs(self) -> list:
+    def audio_codecs(self) -> List[str]:
         return ['aac', 'ac3', 'libfaac', 'libmp3lame', 'libvo_aacenc', 'libvorbis', 'mp2', 'wmav2']
 
     @property
-    def formats(self) -> list:
+    def formats(self) -> List[str]:
         return [
             '3g2', '3gp', 'aac', 'ac3', 'avi', 'dv', 'flac', 'flv', 'm4a', 'm4v', 'mka', 'mkv', 'mov', 'mp3',
             'mp4', 'mpg', 'ogg', 'vob', 'wav', 'webm', 'wma', 'wmv'
         ]
 
     @property
-    def mpeg_formats(self) -> list:
+    def mpeg_formats(self) -> List[str]:
         return [
             'h264', 'hevc', 'mpeg4', 'divx', 'xvid', 'webm', 'ivf', 'vp9', 'mpeg2video', 'mpg2', 'mp2', 'mp3',
             'aac'
         ]
 
     @property
-    def encoding(self) -> dict:
+    def encoding(self) -> Dict[str, List[str]]:
         return {
-            'hevc': 'libx265 -tune zerolatency -preset ultrafast -x265-params crf=23 -qp 4 -flags +cgop',
-            'h264': 'libx264 -tune film -preset ultrafast -x264-params crf=23 -qp 0 -flags +cgop',
-            'vp9': 'libvpx-vp9 -deadline best -quality best'
+            'hevc': ['libx265', '-tune', 'zerolatency', '-preset', 'ultrafast', '-x265-params', 'crf=23', '-qp', '4', '-flags', '+cgop'],
+            'h264': ['libx264', '-tune', 'film', '-preset', 'ultrafast', '-x264-params', 'crf=18', '-qp', '0', '-flags', '+cgop'],
+            'vp9': ['libvpx-vp9', '-deadline', 'best', '-quality', 'best'],
         }
 
     @property
-    def binaries(self) -> dict:
+    def binaries(self) -> Dict[str, Dict[str, List[str]]]:
         return {
             'nt': {  # Windows
                 'ffmpeg': ['ffmpeg.exe'],
@@ -89,7 +90,7 @@ def binaries(self) -> dict:
         }
 
     @property
-    def filters(self) -> dict:
+    def filters(self) -> Dict[str, List[str]]:
         return {
             'all': [
                 '3g2', '3gp', 'amv', 'asf', 'asx', 'avi', 'bin', 'dat', 'div', 'divx', 'f4v', 'flv',

vidcutter/mediainfo.py

@@ -94,7 +94,7 @@ def __init__(self, media, parent=None, flags=Qt.Dialog | Qt.WindowCloseButtonHin
         okButton.accepted.connect(self.close)
         button_layout = QHBoxLayout()
         mediainfo_version = self.parent.videoService.cmdExec(self.parent.videoService.backends.mediainfo,
-                                                             '--version', True)
+                                                             ['--version'], True)
         if len(mediainfo_version) >= 2:
             mediainfo_version = mediainfo_version.split('\n')[1]
             mediainfo_label = QLabel('<div style="font-size:11px;"><b>Media information by:</b><br/>%s @ '

vidcutter/videocutter.py

@@ -125,8 +125,8 @@ def __init__(self, parent: QMainWindow):
         self.videoService.addScenes.connect(self.addScenes)
 
         self.project_files = {
-            'edl': re.compile(r'(\d+(?:\.?\d+)?)\t(\d+(?:\.?\d+)?)\t([01])'),
-            'vcp': re.compile(r'(\d+(?:\.?\d+)?)\t(\d+(?:\.?\d+)?)\t([01])\t(".*")$')
+            'edl': re.compile(r'(\d+(?:\.\d+)?)\t(\d+(?:\.\d+)?)\t([01])'),
+            'vcp': re.compile(r'(\d+(?:\.\d+)?)\t(\d+(?:\.\d+)?)\t([01])(?:\t"(.*)")?$')
         }
 
         self._initIcons()
@@ -437,7 +437,7 @@ def __init__(self, parent: QMainWindow):
         if sys.platform != 'darwin':
             controlsLayout.addSpacing(5)
 
-        layout = QVBoxLayout()  
+        layout = QVBoxLayout()
         layout.setSpacing(0)
         layout.setContentsMargins(10, 10, 10, 0)
         layout.addLayout(self.videoLayout)
@@ -864,8 +864,7 @@ def openProject(self, checked: bool = False, project_file: str = None) -> Option
                             clip_start = self.delta2QTime(float(start))
                             clip_end = self.delta2QTime(float(stop))
                             clip_image = self.captureImage(self.currentMedia, clip_start)
-                            if project_type == 'vcp' and self.createChapters and len(chapter):
-                                chapter = chapter[1:len(chapter) - 1]
+                            if project_type == 'vcp' and self.createChapters and chapter is not None:
                                 if not len(chapter):
                                     chapter = None
                             else:
@@ -941,19 +940,19 @@ def saveProject(self, reboot: bool = False) -> None:
                                      'Cannot save project file at {0}:\n\n{1}'.format(project_save, file.errorString()))
                 return
             qApp.setOverrideCursor(Qt.WaitCursor)
-            if ptype == 'VidCutter Project (*.vcp)':
+            if ptype == 'VidCutter Project (*.vcp)' or ptype == 'VidCutter Project':
                 # noinspection PyUnresolvedReferences
                 QTextStream(file) << '{}\n'.format(self.currentMedia)
             for clip in self.clipTimes:
                 start_time = timedelta(hours=clip[0].hour(), minutes=clip[0].minute(), seconds=clip[0].second(),
                                        milliseconds=clip[0].msec())
                 stop_time = timedelta(hours=clip[1].hour(), minutes=clip[1].minute(), seconds=clip[1].second(),
                                       milliseconds=clip[1].msec())
-                if ptype == 'VidCutter Project (*.vcp)':
+                if ptype == 'VidCutter Project (*.vcp)' or ptype == 'VidCutter Project':
                     if self.createChapters:
                         chapter = '"{}"'.format(clip[4]) if clip[4] is not None else '""'
                     else:
-                        chapter = ''
+                        chapter = '""'
                     # noinspection PyUnresolvedReferences
                     QTextStream(file) << '{0}\t{1}\t{2}\t{3}\n'.format(self.delta2String(start_time),
                                                                        self.delta2String(stop_time), 0, chapter)
@@ -1360,6 +1359,13 @@ def saveMedia(self) -> None:
                 self.videoService.smartinit(clips)
                 self.smartcutter(file, source_file, source_ext)
                 return
+            videoWithForcedKeyframes = f'{source_file}-forced{source_ext}'
+            self.videoService.forceKeyframes(
+                source='{0}{1}'.format(source_file, source_ext),
+                clipTimes=self.clipTimes,
+                fps=eval(self.videoService.streams.video.avg_frame_rate),
+                output=videoWithForcedKeyframes)
+
             steps = 3 if clips > 1 else 2
             self.seekSlider.showProgress(steps)
             self.parent.lock_gui(True)
@@ -1375,7 +1381,8 @@ def saveMedia(self) -> None:
                         filename = os.path.join(self.workFolder, os.path.basename(filename))
                     filename = QDir.toNativeSeparators(filename)
                     filelist.append(filename)
-                    if not self.videoService.cut(source='{0}{1}'.format(source_file, source_ext),
+                    # if not self.videoService.cut(source='{0}{1}'.format(source_file, source_ext),
+                    if not self.videoService.cut(source=videoWithForcedKeyframes,
                                                  output=filename,
                                                  frametime=clip[0].toString(self.timeformat),
                                                  duration=duration,
@@ -1391,6 +1398,13 @@ def saveMedia(self) -> None:
 
     def smartcutter(self, file: str, source_file: str, source_ext: str) -> None:
         self.smartcut_monitor = Munch(clips=[], results=[], externals=0)
+        videoWithForcedKeyframes = f'{source_file}-forced{source_ext}'
+        self.videoService.forceKeyframes(
+            source='{0}{1}'.format(source_file, source_ext),
+            clipTimes=self.clipTimes,
+            fps=eval(self.videoService.streams.video.avg_frame_rate),
+            output=videoWithForcedKeyframes)
+        keyframes = self.videoService.getKeyframes(videoWithForcedKeyframes)
         for index, clip in enumerate(self.clipTimes):
             if len(clip[3]):
                 self.smartcut_monitor.clips.append(clip[3])
@@ -1403,11 +1417,14 @@ def smartcutter(self, file: str, source_file: str, source_ext: str) -> None:
                     filename = os.path.join(self.workFolder, os.path.basename(filename))
                 filename = QDir.toNativeSeparators(filename)
                 self.smartcut_monitor.clips.append(filename)
+
+                # source='{0}{1}'.format(source_file, source_ext)
                 self.videoService.smartcut(index=index,
-                                           source='{0}{1}'.format(source_file, source_ext),
+                                           source=videoWithForcedKeyframes,
                                            output=filename,
                                            start=VideoCutter.qtime2delta(clip[0]),
                                            end=VideoCutter.qtime2delta(clip[1]),
+                                           keyframes=keyframes,
                                            allstreams=True)
 
     @pyqtSlot(bool, str)