From d655b9d1764a847b9077f81865d4a7473fe1588c Mon Sep 17 00:00:00 2001 From: Chris Griffith Date: Tue, 15 Sep 2020 15:22:54 -0500 Subject: [PATCH] Version 2.6.1 (#64) * Fixing #62 VP9 and GIF crashing due to label bug (thanks to -L0Lock-) * Adding HEVC crf suggestions back --- CHANGES | 8 +++++- fastflix/plugins/gif/settings_panel.py | 6 ++--- fastflix/plugins/hevc_x265/settings_panel.py | 27 ++++++++++++-------- fastflix/plugins/vp9/settings_panel.py | 6 ++--- fastflix/version.py | 2 +- pyproject.toml | 2 +- 6 files changed, 32 insertions(+), 19 deletions(-) diff --git a/CHANGES b/CHANGES index 75018fe5..33f33eaa 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,12 @@ Changelog --------- +Version 2.6.1 +~~~~~~~~~~~~~ + +* Adding HEVC crf suggestions back +* Fixing #62 VP9 and GIF crashing due to label bug (thanks to -L0Lock-) + Version 2.6.0 ~~~~~~~~~~~~~ @@ -8,7 +14,7 @@ Version 2.6.0 * Adding HEVC x265 setting for profile * Changing plugins to include library used for encoding * Changing HEVC default speed to "medium" and crf to 28 to match x265 defaults -* Changing command builders to specify stream instead of video track for codec +* Fixing command builders to specify stream instead of video track for codec * Fixing FPS not showing correctly when dealing with higher numbers * Fixing #60 video track not selected properly (thanks to -L0Lock-) * Fixing crash on SVT-AV1 due to HDR label issue diff --git a/fastflix/plugins/gif/settings_panel.py b/fastflix/plugins/gif/settings_panel.py index f6ce760a..c6807a18 100644 --- a/fastflix/plugins/gif/settings_panel.py +++ b/fastflix/plugins/gif/settings_panel.py @@ -36,11 +36,11 @@ def init_fps(self): def init_remove_hdr(self): layout = QtWidgets.QHBoxLayout() - remove_hdr_level = QtWidgets.QLabel("Remove HDR") - remove_hdr_level.setToolTip( + self.remove_hdr_label = QtWidgets.QLabel("Remove HDR") + self.remove_hdr_label.setToolTip( "Convert BT2020 colorspace into bt709\n " "WARNING: This will take much longer and result in a larger file" ) - layout.addWidget(remove_hdr_level) + layout.addWidget(self.remove_hdr_label) self.widgets.remove_hdr = QtWidgets.QComboBox() self.widgets.remove_hdr.addItems(["No", "Yes"]) self.widgets.remove_hdr.setCurrentIndex(0) diff --git a/fastflix/plugins/hevc_x265/settings_panel.py b/fastflix/plugins/hevc_x265/settings_panel.py index 81ba6b70..b32521dc 100644 --- a/fastflix/plugins/hevc_x265/settings_panel.py +++ b/fastflix/plugins/hevc_x265/settings_panel.py @@ -21,19 +21,23 @@ "18000k (3840x2160p @ 50,60)", "Custom", ] +"24 (480p)", +"23 (720p)", +"22 (1080p)", +"21 (1440p)", recommended_crfs = [ - "28", + "28 (x265 default - lower quality)", "27", "26", "25", - "24", - "23", - "22", - "21", - "20", + "24 (480p)", + "23 (720p)", + "22 (1080p)", + "21 (1440p)", + "20 (2160p)", "19", - "18", + "18 (very high quality)", "Custom", ] @@ -212,15 +216,18 @@ def init_modes(self): bitrate_box_layout.addWidget(QtWidgets.QLabel("Custom:")) bitrate_box_layout.addWidget(self.widgets.custom_bitrate) + crf_help = ("CRF is extremely source dependant,
" + "the resolution-to-crf are mere suggestions!

" + "Quality also depends on encoding speed.
" + "For example, SLOW CRF 22 will have a result near FAST CRF 20.") crf_radio = QtWidgets.QRadioButton("CRF") crf_radio.setChecked(True) crf_radio.setFixedWidth(80) - crf_radio.setToolTip("28 is x265's default
" - "24 is \"Visually Indistinguishable\"
" - "22 is near what I use for 4K Videos") + crf_radio.setToolTip(crf_help) self.widgets.mode.addButton(crf_radio) self.widgets.crf = QtWidgets.QComboBox() + self.widgets.crf.setToolTip(crf_help) self.widgets.crf.setFixedWidth(250) self.widgets.crf.addItems(recommended_crfs) self.widgets.crf.setCurrentIndex(0) diff --git a/fastflix/plugins/vp9/settings_panel.py b/fastflix/plugins/vp9/settings_panel.py index 9fc8c6e7..43d972c9 100644 --- a/fastflix/plugins/vp9/settings_panel.py +++ b/fastflix/plugins/vp9/settings_panel.py @@ -79,11 +79,11 @@ def __init__(self, parent, main): def init_remove_hdr(self): layout = QtWidgets.QHBoxLayout() - remove_hdr_level = QtWidgets.QLabel("Remove HDR") - remove_hdr_level.setToolTip( + self.remove_hdr_label = QtWidgets.QLabel("Remove HDR") + self.remove_hdr_label.setToolTip( "Convert BT2020 colorspace into bt709\n " "WARNING: This will take much longer and result in a larger file" ) - layout.addWidget(remove_hdr_level) + layout.addWidget(self.remove_hdr_label) self.widgets.remove_hdr = QtWidgets.QComboBox() self.widgets.remove_hdr.addItems(["No", "Yes"]) self.widgets.remove_hdr.setCurrentIndex(0) diff --git a/fastflix/version.py b/fastflix/version.py index c85687bc..b9a5f6ba 100644 --- a/fastflix/version.py +++ b/fastflix/version.py @@ -1,4 +1,4 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -__version__ = "2.6.0" +__version__ = "2.6.1" __author__ = "Chris Griffith" diff --git a/pyproject.toml b/pyproject.toml index b9887008..52bf09a4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "fastflix" -version = "2.6.0" +version = "2.6.1" description = "Easy to use video encoder GUI wrapper" authors = ["Chris Griffith "] license = "MIT"