* Adding #633 download for stable version of ffmpeg by default on Windows (thanks to Maddie Davis)

Author: cdgriffith

.gitignore

@@ -123,3 +123,4 @@ icons.py
 test.html
 iso-639-3.*
 build-dir/
+benchmarking/

CHANGES

@@ -5,6 +5,7 @@
 * Adding QP mode for FFmpeg Nvenc encoding
 * Adding more preview positions
 * Adding ultra high quality mode for ffmpeg nvenc encoder
+* Adding #633 download for stable version of ffmpeg by default on Windows (thanks to Maddie Davis)
 * Fixing #611 Extension type not being selected properly from profiles if encoders isn't switched (thanks to Hankuu)
 * Fixing #628 Custom QP/CRF saved in profile may not be restored correctly (thanks to Gregorio O. DeMojeca)
 * Fixing #631 VVC Level can't be set to 0 anymore (thanks to GT500org)

fastflix/data/languages.yaml

@@ -1677,21 +1677,6 @@ Download Cancelled:
   ukr: Завантажити Скасовано
   kor: 다운로드 취소
   ron: Descărcați Anulat
-Download Newest FFmpeg:
-  deu: Neuestes FFmpeg herunterladen
-  eng: Download Newest FFmpeg
-  fra: Télécharger le dernier FFmpeg
-  ita: Scarica il nuovo FFmpeg
-  spa: Descargar el nuevo FFmpeg
-  chs: 下载最新版FFmpeg
-  jpn: 最新のFFmpegをダウンロードする
-  rus: Скачать новейший FFmpeg
-  por: Fazer o download do FFmpeg mais recente
-  swe: Hämta Nyaste FFmpeg
-  pol: Pobierz Najnowszy FFmpeg
-  ukr: Завантажити останню версію FFmpeg
-  kor: 최신 FFmpeg 다운로드
-  ron: Descărcați cel mai nou FFmpeg
 Downloading FFmpeg:
   deu: Herunterladen von FFmpeg
   eng: Downloading FFmpeg
@@ -7442,7 +7427,8 @@ Drag and Drop to reorder - All items need to be same dimensions:
   eng: Drag and Drop to reorder - All items need to be same dimensions
   fra: Glissez et déposez pour réorganiser - Tous les éléments doivent avoir les mêmes
     dimensions.
-  ita: Per riordinare trascina e rilascia  - tutti gli elementi devono avere le stesse dimensioni
+  ita: Per riordinare trascina e rilascia  - tutti gli elementi devono avere le stesse
+    dimensioni
   spa: Arrastrar y soltar para reordenar - Todos los elementos deben tener las mismas
     dimensiones
   chs: 拖放来重新排序 - 所有项目的尺寸都需要相同
@@ -8824,8 +8810,8 @@ Remove GUI logs and compress conversion logs older than 30 days at exit:
     die älter als 30 Tage sind, beim Beenden
   fra: Suppression des journaux de l'interface graphique et compression des journaux
     de conversion de plus de 30 jours à la sortie.
-  ita: Rimuovi registri eventi GUI e comprimeri registri eventi conversione
-    più vecchi di 30 giorni all'uscita.
+  ita: Rimuovi registri eventi GUI e comprimeri registri eventi conversione più vecchi
+    di 30 giorni all'uscita.
   spa: Elimina los registros GUI y comprime los registros de conversión de más de
     30 días al salir.
   chs: 在退出时删除GUI日志并压缩超过30天的转换日志
@@ -10685,3 +10671,59 @@ Pattern Match:
   ukr: Збіг за зразком
   kor: 패턴 일치
   ron: Potrivire model
+Download Stable FFmpeg:
+  eng: Download Stable FFmpeg
+  deu: Stable FFmpeg herunterladen
+  fra: Télécharger Stable FFmpeg
+  ita: Scarica FFmpeg stabile
+  spa: Descargar FFmpeg estable
+  jpn: 安定したFFmpegをダウンロード
+  rus: Скачать стабильный FFmpeg
+  por: Descarregar o Stable FFmpeg
+  swe: Ladda ner stabil FFmpeg
+  pol: Pobierz Stable FFmpeg
+  chs: 下载稳定版 FFmpeg
+  ukr: Завантажити стабільний FFmpeg
+  kor: 안정적인 FFmpeg 다운로드
+  ron: Descarcă Stable FFmpeg
+Download Nightly FFmpeg:
+  eng: Download Nightly FFmpeg
+  deu: Neuestes FFmpeg herunterladen
+  fra: Télécharger le dernier FFmpeg
+  ita: Scarica il nuovo FFmpeg
+  spa: Descargar el nuevo FFmpeg
+  chs: 下载最新版FFmpeg
+  jpn: 最新のFFmpegをダウンロードする
+  rus: Скачать новейший FFmpeg
+  por: Fazer o download do FFmpeg mais recente
+  swe: Hämta Nyaste FFmpeg
+  pol: Pobierz Najnowszy FFmpeg
+  ukr: Завантажити останню версію FFmpeg
+  kor: 최신 FFmpeg 다운로드
+  ron: Descărcați cel mai nou FFmpeg
+hq - High Quality, uhq - Ultra High Quality, ll - Low Latency, ull - Ultra Low Latency:
+  eng: hq - High Quality, uhq - Ultra High Quality, ll - Low Latency, ull - Ultra
+    Low Latency
+  deu: hq - Hohe Qualität, uhq - Ultrahohe Qualität, ll - Niedrige Latenzzeit, ull
+    - Ultra-niedrige Latenzzeit
+  fra: hq - Haute qualité, uhq - Ultra haute qualité, ll - Faible latence, ull - Ultra
+    faible latence
+  ita: hq - Alta qualità, uhq - Ultra alta qualità, ll - Bassa latenza, ull - Ultra
+    bassa latenza
+  spa: hq - Alta calidad, uhq - Calidad ultra alta, ll - Baja latencia, ull - Latencia
+    ultra baja
+  jpn: hq - 高画質、uhq - 超高画質、ll - 低遅延、ull - 超低遅延
+  rus: hq - высокое качество, uhq - сверхвысокое качество, ll - низкая задержка, ull
+    - сверхнизкая задержка
+  por: hq - Alta Qualidade, uhq - Ultra Alta Qualidade, ll - Baixa Latência, ull -
+    Ultra Baixa Latência
+  swe: hq - Hög kvalitet, uhq - Ultrahög kvalitet, ll - Låg latens, ull - Ultra låg
+    latens
+  pol: hq - wysoka jakość, uhq - bardzo wysoka jakość, ll - niskie opóźnienie, ull
+    - bardzo niskie opóźnienie
+  chs: hq - 高质量，uhq - 超高质量，ll - 低延迟，ull - 超低延迟
+  ukr: hq - висока якість, uhq - надвисока якість, ll - низька затримка, ull - наднизька
+    затримка
+  kor: hq - 고품질, uhq - 초고화질, ll - 저지연, ull - 초저지연
+  ron: hq - calitate înaltă, uhq - calitate ultra înaltă, ll - latență redusă, ull
+    - latență ultra redusă

fastflix/encoders/ffmpeg_hevc_nvenc/settings_panel.py

@@ -134,7 +134,7 @@ def init_tune(self):
         return self._add_combo_box(
             label="Tune",
             widget_name="tune",
-            tooltip="Tune the settings for a particular type of source or situation\nhq - High Quality, uqh - Ultra High Quality, ll - Low Latency, ull - Ultra Low Latency",
+            tooltip="Tune the settings for a particular type of source or situation\nhq - High Quality, uhq - Ultra High Quality, ll - Low Latency, ull - Ultra Low Latency",
             options=["hq", "uhq", "ll", "ull", "lossless"],
             opt="tune",
         )

fastflix/encoders/vvc/settings_panel.py

@@ -121,7 +121,7 @@ def init_levels(self):
             tooltip="Set the IDC level",
             widget_name="levelidc",
             options=[
-                t("auto"),
+                t("Auto"),
                 "1",
                 "2",
                 "2.1",

fastflix/program_downloads.py

@@ -5,6 +5,7 @@
 import shutil
 import sys
 from pathlib import Path
+import re
 
 import requests
 import reusables
@@ -43,8 +44,16 @@ def ask_for_ffmpeg():
         sys.exit(1)
 
 
-def latest_ffmpeg(signal, stop_signal, **_):
+ffmpeg_version_re = re.compile(r"ffmpeg-n(\d+\.\d+)-latest-win64-gpl-")
+
+
+def grab_stable_ffmpeg(signal, stop_signal, **_):
+    return latest_ffmpeg(signal, stop_signal, ffmpeg_version="stable")
+
+
+def latest_ffmpeg(signal, stop_signal, ffmpeg_version="latest", **_):
     stop = False
+    logger.debug(f"Downloading {ffmpeg_version} FFmpeg")
 
     def stop_me():
         nonlocal stop
@@ -76,13 +85,18 @@ def stop_me():
         return
 
     gpl_ffmpeg = None
-    for asset in data["assets"]:
-        if "master-latest-win64-gpl.zip" in asset["name"]:
-            gpl_ffmpeg = asset
-            break
-        elif asset["name"].startswith("ffmpeg-N-") and asset["name"].endswith("win64-gpl.zip"):
-            gpl_ffmpeg = asset
-            break
+
+    if ffmpeg_version == "latest":
+        for asset in data["assets"]:
+            if "master-latest-win64-gpl.zip" in asset["name"]:
+                gpl_ffmpeg = asset
+                break
+    else:
+        versions = []
+        for asset in data["assets"]:
+            if ver_match := ffmpeg_version_re.search(asset["name"]):
+                versions.append((float(ver_match.group(1)), asset))
+        gpl_ffmpeg = sorted(versions, key=lambda x: x[0], reverse=True)[0][1]
 
     if not gpl_ffmpeg:
         shutil.rmtree(extract_folder, ignore_errors=True)
@@ -93,6 +107,8 @@ def stop_me():
         )
         raise Exception()
 
+    logger.debug(f"Downloading version {gpl_ffmpeg['name']}")
+
     req = requests.get(gpl_ffmpeg["browser_download_url"], stream=True)
 
     filename = ffmpeg_folder / "ffmpeg-full.zip"

fastflix/widgets/container.py

@@ -16,7 +16,7 @@
 from fastflix.language import t
 from fastflix.models.config import setting_types, get_preset_defaults
 from fastflix.models.fastflix_app import FastFlixApp
-from fastflix.program_downloads import latest_ffmpeg
+from fastflix.program_downloads import latest_ffmpeg, grab_stable_ffmpeg
 from fastflix.resources import main_icon, get_icon, changes_file, local_changes_file, local_package_changes_file
 from fastflix.shared import clean_logs, error_message, latest_fastflix, message, yes_no_message
 from fastflix.widgets.about import About
@@ -244,7 +244,10 @@ def init_menu(self):
         )
         version_action.triggered.connect(lambda: latest_fastflix(show_new_dialog=True, app=self.app))
 
-        ffmpeg_update_action = QAction(self.si(QtWidgets.QStyle.SP_ArrowDown), t("Download Newest FFmpeg"), self)
+        ffmpeg_update_stable_action = QAction(self.si(QtWidgets.QStyle.SP_ArrowDown), t("Download Stable FFmpeg"), self)
+        ffmpeg_update_stable_action.triggered.connect(self.download_stable_ffmpeg)
+
+        ffmpeg_update_action = QAction(self.si(QtWidgets.QStyle.SP_ArrowDown), t("Download Nightly FFmpeg"), self)
         ffmpeg_update_action.triggered.connect(self.download_ffmpeg)
 
         clean_logs_action = QAction(self.si(QtWidgets.QStyle.SP_DialogResetButton), t("Clean Old Logs"), self)
@@ -263,6 +266,7 @@ def init_menu(self):
         help_menu.addSeparator()
         help_menu.addAction(version_action)
         if reusables.win_based:
+            help_menu.addAction(ffmpeg_update_stable_action)
             help_menu.addAction(ffmpeg_update_action)
         help_menu.addSeparator()
         help_menu.addAction(about_action)
@@ -331,13 +335,19 @@ def open_issues(self):
     def show_log_dir(self):
         OpenFolder(self, str(self.app.fastflix.log_path)).run()
 
-    def download_ffmpeg(self):
+    def download_stable_ffmpeg(self):
+        self.download_ffmpeg(ffmpeg_version="stable")
+
+    def download_ffmpeg(self, ffmpeg_version="latest"):
         ffmpeg_folder = Path(user_data_dir("FFmpeg", appauthor=False, roaming=True)) / "bin"
         ffmpeg = ffmpeg_folder / "ffmpeg.exe"
         ffprobe = ffmpeg_folder / "ffprobe.exe"
         try:
             self.pb = ProgressBar(
-                self.app, [Task(t("Downloading FFmpeg"), latest_ffmpeg)], signal_task=True, can_cancel=True
+                self.app,
+                [Task(t("Downloading FFmpeg"), grab_stable_ffmpeg if ffmpeg_version == "stable" else latest_ffmpeg)],
+                signal_task=True,
+                can_cancel=True,
             )
         except FastFlixInternalException:
             pass