* Adding audio normalization (thanks to Xoanon88)

* Adding ability to add subtitle or audio track

Author: cdgriffith

CHANGES

@@ -3,6 +3,8 @@
 ## Version 5.12.0
 
 * Adding automatic downloads for rigaya encoders on Windows
+* Adding audio normalization (thanks to Xoanon88)
+* Adding ability to add subtitle or audio track
 * Fixing custom_crf not being found (thanks to Norbert)
 
 ## Version 5.11.0

fastflix/application.py

@@ -83,6 +83,7 @@ def init_encoders(app: FastFlixApp, **_):
     from fastflix.encoders.vaapi_hevc import main as vaapi_hevc_plugin
     from fastflix.encoders.vaapi_vp9 import main as vaapi_vp9_plugin
     from fastflix.encoders.vaapi_mpeg2 import main as vaapi_mpeg2_plugin
+    from fastflix.encoders.modify import main as modify_plugin
 
     encoders = [
         hevc_plugin,
@@ -103,6 +104,7 @@ def init_encoders(app: FastFlixApp, **_):
         vaapi_vp9_plugin,
         vaapi_mpeg2_plugin,
         copy_plugin,
+        modify_plugin,
     ]
 
     if DEVMODE:

fastflix/data/icons/loading.gif

@@ -10787,3 +10787,13 @@ Enable either auto split or parallel encoding mode.:
   ukr: Увімкніть режим автоматичного розділення або паралельного кодування.
   kor: 자동 분할 또는 병렬 인코딩 모드를 활성화합니다.
   ron: Activați divizarea automată sau modul de codare paralelă.
+Update Rigaya's Encoders:
+  eng: Update Rigaya's Encoders
+Detect GPUs:
+  eng: Detect GPUs
+Run Audio Normalize:
+  eng: Run Audio Normalize
+Add Audio Track:
+  eng: Add Audio Track
+Add Text Based Subtitle Track:
+  eng: Add Text Based Subtitle Track

fastflix/data/languages.yaml

@@ -15,7 +15,7 @@
 enable_subtitles = True
 enable_audio = True
 enable_attachments = True
-
+enable_advanced = False
 
 from fastflix.encoders.copy.command_builder import build
 from fastflix.encoders.copy.settings_panel import Copy as settings_panel

fastflix/encoders/copy/main.py

@@ -0,0 +1,77 @@
+# -*- coding: utf-8 -*-
+import re
+from pprint import pprint
+from fastflix.encoders.common.helpers import Command, generate_all
+from fastflix.models.fastflix import FastFlix
+from fastflix.shared import clean_file_string
+
+
+def build(fastflix: FastFlix):
+    beginning, ending, output_fps = generate_all(fastflix, "copy", disable_filters=True, audio=False, subs=False)
+    start_time = fastflix.current_video.video_settings.start_time
+    fast_seek = fastflix.current_video.video_settings.fast_seek
+    end_time = fastflix.current_video.video_settings.end_time
+    video_title = fastflix.current_video.video_settings.video_title
+    video_track_title = fastflix.current_video.video_settings.video_track_title
+    ffmpeg = fastflix.config.ffmpeg
+    source = fastflix.current_video.source
+
+    time_settings = f'{f"-ss {start_time}" if start_time else ""} {f"-to {end_time}" if end_time else ""} '
+    time_one = time_settings if fast_seek else ""
+    time_two = time_settings if not fast_seek else ""
+
+    if video_title:
+        video_title = video_title.replace('"', '\\"')
+    title = f'-metadata title="{video_title}"' if video_title else ""
+    source = clean_file_string(source)
+    ffmpeg = clean_file_string(ffmpeg)
+    if video_track_title:
+        video_track_title = video_track_title.replace('"', '\\"')
+    track_title = f'-metadata:s:v:0 title="{video_track_title}"'
+
+    beginning = " ".join(
+        [
+            f'"{ffmpeg}"',
+            "-y",
+            time_one,
+            f'-i "{source}"',
+            time_two,
+            title,
+            f"{track_title if video_track_title else ''}",
+            " ",  # Leave space after commands
+        ]
+    )
+
+    audio = fastflix.current_video.video_settings.video_encoder_settings.add_audio_track
+    subs = fastflix.current_video.video_settings.video_encoder_settings.add_subtitle_track
+
+    if audio and subs:
+        audio_path_clean = clean_file_string(audio)
+        subs_path_clean = clean_file_string(subs)
+        return [
+            Command(
+                command=f'{beginning} -i "{audio_path_clean}" -i "{subs_path_clean}" -map 0 -map 1:a -map 2:s -c copy {fastflix.current_video.video_settings.video_encoder_settings.extra} {ending}',
+                name="Add audio and subtitle track",
+                exe="ffmpeg",
+            )
+        ]
+
+    if audio:
+        audio_path_clean = clean_file_string(audio)
+        return [
+            Command(
+                command=f'{beginning} -i "{audio_path_clean}" -map 0 -map 1:a -c copy {fastflix.current_video.video_settings.video_encoder_settings.extra} {ending}',
+                name="Add audio track",
+                exe="ffmpeg",
+            )
+        ]
+
+    if subs:
+        subs_path_clean = clean_file_string(subs)
+        return [
+            Command(
+                command=f'{beginning} -i "{subs_path_clean}" -map 0 -map 1:s -c copy {fastflix.current_video.video_settings.video_encoder_settings.extra} {ending}',
+                name="Add subtitle track",
+                exe="ffmpeg",
+            )
+        ]

fastflix/encoders/modify/__init__.py

@@ -0,0 +1,21 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+__author__ = "Chris Griffith"
+import importlib.resources
+
+name = "Modify"
+
+video_extensions = [".mkv", ".mp4", ".ts", ".mov", ".webm", ".avi", ".mts", ".m2ts", ".m4v", ".gif", ".avif", ".webp"]
+video_dimension_divisor = 1
+
+ref = importlib.resources.files("fastflix") / "data/icons/black/onyx-advanced.svg"
+with importlib.resources.as_file(ref) as icon_file:
+    icon = str(icon_file.resolve())
+
+enable_subtitles = False
+enable_audio = False
+enable_attachments = False
+enable_advanced = False
+
+from fastflix.encoders.modify.command_builder import build
+from fastflix.encoders.modify.settings_panel import Modify as settings_panel

fastflix/encoders/modify/command_builder.py

@@ -0,0 +1,98 @@
+# -*- coding: utf-8 -*-
+import logging
+import os
+from pathlib import Path
+
+from PySide6 import QtWidgets, QtGui, QtCore
+
+from fastflix.encoders.common.setting_panel import SettingPanel
+from fastflix.language import t
+from fastflix.models.encode import ModifySettings
+from fastflix.models.fastflix_app import FastFlixApp
+from fastflix.shared import message
+from fastflix.widgets.background_tasks import AudioNoramlize
+from fastflix.resources import loading_movie, get_icon
+
+logger = logging.getLogger("fastflix")
+
+
+class Modify(SettingPanel):
+    profile_name = "modify_settings"
+    signal = QtCore.Signal(str)
+
+    def __init__(self, parent, main, app: FastFlixApp):
+        super().__init__(parent, main, app)
+        self.main = main
+        self.app = app
+        self.signal.connect(self.audio_norm_done)
+
+        self.extract_label = QtWidgets.QLabel(self)
+        self.extract_label.hide()
+        self.movie = QtGui.QMovie(loading_movie)
+        self.movie.setScaledSize(QtCore.QSize(25, 25))
+        self.extract_label.setMovie(self.movie)
+
+        grid = QtWidgets.QGridLayout()
+
+        grid.addWidget(QtWidgets.QLabel(""), 1, 0)
+        self.audio_normalize = QtWidgets.QPushButton(t("Run Audio Normalize"))
+        self.audio_normalize.clicked.connect(self.select_run_audio_normalize)
+        grid.addWidget(self.audio_normalize, 2, 0, 1, 1)
+        grid.addWidget(self.extract_label, 2, 2, 1, 1)
+
+        add_audio_track = QtWidgets.QPushButton(t("Add Audio Track"))
+        add_audio_track.clicked.connect(self.select_audio_file)
+        self.add_audio_track_file_path = QtWidgets.QLineEdit()
+        grid.addWidget(add_audio_track, 3, 0, 1, 1)
+        grid.addWidget(self.add_audio_track_file_path, 3, 2, 1, 1)
+
+        add_sub_track = QtWidgets.QPushButton(t("Add Text Based Subtitle Track"))
+        add_sub_track.clicked.connect(self.select_subtitle_file)
+        self.add_sub_track_file_path = QtWidgets.QLineEdit()
+        grid.addWidget(add_sub_track, 4, 0, 1, 1)
+        grid.addWidget(self.add_sub_track_file_path, 4, 2, 1, 1)
+
+        grid.addWidget(QtWidgets.QWidget(), 6, 0, 6, 1)
+        grid.addLayout(self._add_custom(disable_both_passes=True), 11, 0, 1, 6)
+        self.setLayout(grid)
+        self.hide()
+
+    def update_video_encoder_settings(self):
+        self.app.fastflix.current_video.video_settings.video_encoder_settings = ModifySettings(
+            audio_normalize=self.audio_normalize.isChecked(),
+            add_audio_track=self.add_audio_track_file_path.text() or None,
+            add_subtitle_track=self.add_sub_track_file_path.text() or None,
+        )
+        self.app.fastflix.current_video.video_settings.video_encoder_settings.extra = self.ffmpeg_extras
+        self.app.fastflix.current_video.video_settings.video_encoder_settings.extra_both_passes = False
+
+    def select_audio_file(self):
+        file_path, _ = QtWidgets.QFileDialog.getOpenFileName(
+            self, t("Select Audio Track"), "", t("Audio Files (*.mp3 *.aac *.wav *.flac);;All Files (*)")
+        )
+        if file_path:
+            logger.info(f"Selected audio track: {file_path}")
+            self.add_audio_track_file_path.setText(file_path)
+        self.main.build_commands()
+
+    def select_subtitle_file(self):
+        file_path, _ = QtWidgets.QFileDialog.getOpenFileName(
+            self, t("Select Subtitle Track"), "", t("Subtitle Files (*.srt *.ass *.vtt *.ssa);;All Files (*)")
+        )
+        if file_path:
+            logger.info(f"Selected subtitle track: {file_path}")
+            self.add_sub_track_file_path.setText(file_path)
+        self.main.build_commands()
+
+    def select_run_audio_normalize(self):
+        self.norm_thread = AudioNoramlize(self.app, self.main, self.signal)
+        self.norm_thread.start()
+        self.movie.start()
+        self.extract_label.show()
+        self.audio_normalize.setDisabled(True)
+
+    def audio_norm_done(self, status):
+        self.movie.stop()
+        self.extract_label.hide()
+        self.audio_normalize.setDisabled(False)
+        message(f"Audio normalization done: {status}")

fastflix/encoders/modify/main.py

@@ -617,6 +617,13 @@ class CopySettings(EncoderSettings):
     name: str = "Copy"
 
 
+class ModifySettings(EncoderSettings):
+    name: str = "Modify"
+    audio_normalize: bool = False
+    add_audio_track: str | None = None
+    add_subtitle_track: str | None = None
+
+
 class VAAPIH264Settings(EncoderSettings):
     name: str = "VAAPI H264"  # must be same as encoder name in main
 
@@ -685,6 +692,7 @@ class VAAPIMPEG2Settings(EncoderSettings):
     "gif": GIFSettings,
     "webp": WebPSettings,
     "copy_settings": CopySettings,
+    "modify_settings": ModifySettings,
     "ffmpeg_hevc_nvenc": FFmpegNVENCSettings,
     "qsvencc_hevc": QSVEncCSettings,
     "qsvencc_av1": QSVEncCAV1Settings,