Merge branch 'master' of ssh://git.jerryyan.top:29022/q792602257/my-video-workflow

.gitignore

@@ -10,4 +10,6 @@ __pycache__
 venv
 build/
 dist/
-access_token
+access_token
+winsw.*
+*.json

config.py

@@ -17,6 +17,8 @@ DANMAKU_FONT_NAME = "Sarasa Term SC"
 DANMAKU_FONT_SIZE = 40
 # resolution
 VIDEO_RESOLUTION = "1280x720"
+# opacity
+DANMAKU_OPACITY = 100
 # [ffmpeg]
 # exec
 FFMPEG_EXEC = "ffmpeg"
@@ -28,8 +30,8 @@ FFMPEG_USE_NVIDIA_GPU = False
 FFMPEG_USE_INTEL_GPU = False
 # vaapi
 FFMPEG_USE_VAAPI = False
-# bitrate
+# crf
-VIDEO_BITRATE = "2.5M"
+VIDEO_CRF = 28
 # gop
 VIDEO_GOP = 60
 # [video]
@@ -71,13 +73,14 @@ def load_config():
     if config.has_section("danmaku"):
         section = config['danmaku']
         global DANMAKU_EXEC, DANMAKU_SPEED, DANMAKU_FONT_NAME, VIDEO_RESOLUTION, DANMAKU_FONT_SIZE, \
-            DANMAKU_USE_DANMU2ASS, DANMAKU_USE_DANMAKUFACTORY
+            DANMAKU_USE_DANMU2ASS, DANMAKU_USE_DANMAKUFACTORY, DANMAKU_OPACITY
         DANMAKU_USE_DANMU2ASS = section.getboolean('use_danmu2ass', DANMAKU_USE_DANMU2ASS)
         DANMAKU_USE_DANMAKUFACTORY = section.getboolean('use_danmakufactory', DANMAKU_USE_DANMAKUFACTORY)
         DANMAKU_EXEC = section.get('exec', DANMAKU_EXEC)
         DANMAKU_SPEED = section.getfloat('speed', DANMAKU_SPEED)
         DANMAKU_FONT_NAME = section.get('font', DANMAKU_FONT_NAME)
         DANMAKU_FONT_SIZE = section.getint('font_size', DANMAKU_FONT_SIZE)
+        DANMAKU_OPACITY = section.getint('opacity', DANMAKU_OPACITY)
         VIDEO_RESOLUTION = section.get('resolution', VIDEO_RESOLUTION)
     if config.has_section("video"):
         section = config['video']
@@ -94,14 +97,14 @@ def load_config():
         VIDEO_CLIP_OVERFLOW_SEC = section.getfloat('overflow_sec', VIDEO_CLIP_OVERFLOW_SEC)
     if config.has_section("ffmpeg"):
         section = config['ffmpeg']
-        global FFMPEG_EXEC, FFMPEG_USE_HEVC, FFMPEG_USE_NVIDIA_GPU, FFMPEG_USE_INTEL_GPU, VIDEO_BITRATE, \
+        global FFMPEG_EXEC, FFMPEG_USE_HEVC, FFMPEG_USE_NVIDIA_GPU, FFMPEG_USE_INTEL_GPU, VIDEO_CRF, \
             VIDEO_GOP, FFMPEG_USE_VAAPI
         FFMPEG_EXEC = section.get('exec', FFMPEG_EXEC)
         FFMPEG_USE_HEVC = section.getboolean('hevc', FFMPEG_USE_HEVC)
         FFMPEG_USE_NVIDIA_GPU = section.getboolean('nvidia_gpu', FFMPEG_USE_NVIDIA_GPU)
         FFMPEG_USE_INTEL_GPU = section.getboolean('intel_gpu', FFMPEG_USE_INTEL_GPU)
         FFMPEG_USE_VAAPI = section.getboolean('vaapi', FFMPEG_USE_VAAPI)
-        VIDEO_BITRATE = section.get('bitrate', VIDEO_BITRATE)
+        VIDEO_CRF = section.getfloat('crf', VIDEO_CRF)
         VIDEO_GOP = section.getfloat('gop', VIDEO_GOP)
     if config.has_section("recorder"):
         global BILILIVE_RECORDER_DIRECTORY, XIGUALIVE_RECORDER_DIRECTORY, VIDEO_OUTPUT_DIR
@@ -121,6 +124,7 @@ def get_config():
             'speed': DANMAKU_SPEED,
             'font': DANMAKU_FONT_NAME,
             'font_size': DANMAKU_FONT_SIZE,
+            'opacity': DANMAKU_OPACITY,
             'resolution': VIDEO_RESOLUTION,
         },
         'video': {
@@ -140,7 +144,7 @@ def get_config():
             'nvidia_gpu': FFMPEG_USE_NVIDIA_GPU,
             'intel_gpu': FFMPEG_USE_INTEL_GPU,
             'vaapi': FFMPEG_USE_VAAPI,
-            'bitrate': VIDEO_BITRATE,
+            'crf': VIDEO_CRF,
             'gop': VIDEO_GOP,
         },
         'recorder': {

requirements.txt

@@ -3,6 +3,7 @@ bs4~=0.0.1
 Flask~=2.1.2
 psutil~=5.9.0
 Flask-SQLAlchemy~=2.5.1
+SQLAlchemy<2
 lxml~=4.8
 requests~=2.28.1
 rsa~=4.8

templates/index.html

@@ -101,8 +101,8 @@
             <td :class="{warning: !config.ffmpeg.intel_gpu, success: config.ffmpeg.intel_gpu}"></td>
         </tr>
         <tr>
-            <td>视频比特率</td>
+            <td>视频CRF</td>
-            <td>{{ config.ffmpeg.bitrate }}</td>
+            <td>{{ config.ffmpeg.crf }}</td>
         </tr>
         <tr>
             <td>GOP</td>
@@ -141,6 +141,10 @@
             <td>字体大小</td>
             <td>{{ config.danmaku.font_size }}</td>
         </tr>
+        <tr>
+            <td>不透明度</td>
+            <td>{{ config.danmaku.opacity }}%</td>
+        </tr>
         <tr>
             <td>视频分辨率</td>
             <td>{{ config.danmaku.resolution }}</td>
@@ -304,6 +308,7 @@
                         speed: 0,
                         font: "",
                         font_size: 0,
+                        font_size: 100,
                         resolution: "",
                     },
                     video: {
@@ -323,7 +328,7 @@
                         nvidia_gpu: false,
                         intel_gpu: false,
                         vaapi: false,
-                        bitrate: "",
+                        crf: "",
                         gop: "",
                     },
                     recorder: {

workflow/danmaku.py

@@ -8,6 +8,7 @@ from typing import Union
 from bs4 import BeautifulSoup
 
 from config import DANMAKU_EXEC, VIDEO_RESOLUTION, DANMAKU_SPEED, DANMAKU_FONT_NAME, DANMAKU_FONT_SIZE, \
+    DANMAKU_OPACITY, \
     DANMAKU_USE_DANMU2ASS, DANMAKU_USE_DANMAKUFACTORY
 from exception.danmaku import NoDanmakuException, DanmakuFormatErrorException
 from util.file import check_file_exist
@@ -50,7 +51,7 @@ def danmaku_to_subtitle_use_danmaku_factory(file: Union[os.PathLike[str], str],
         DANMAKU_EXEC, "--ignore-warnings",
         "-r", str(VIDEO_RESOLUTION), "-s", str(DANMAKU_SPEED), "-f", "5",
         "-S", str(DANMAKU_FONT_SIZE), "-N", str(DANMAKU_FONT_NAME), "--showmsgbox", "FALSE",
-        "-O", "255", "-L", "1", "-D", "0",
+        "-O", "{:.0f}".format(DANMAKU_OPACITY*255/100), "-L", "1", "-D", "0",
         "-o", "ass", new_subtitle_name, "-i", file, "-t", str(time_shift)
     ))
 
@@ -58,7 +59,7 @@ def danmaku_to_subtitle_use_danmaku_factory(file: Union[os.PathLike[str], str],
 def danmaku_to_subtitle_use_danmu2ass(file: Union[os.PathLike[str], str], time_shift: float, new_subtitle_name: str):
     (_w, _h) = VIDEO_RESOLUTION.split("x")
     return subprocess.Popen((
-        DANMAKU_EXEC, "--force", "-a", "1", "-d", str(DANMAKU_SPEED), "--font", str(DANMAKU_FONT_NAME),
+        DANMAKU_EXEC, "--force", "-a", "{:.1f}".format(DANMAKU_OPACITY/100.0), "-d", str(DANMAKU_SPEED), "--font", str(DANMAKU_FONT_NAME),
         "--font-size", str(DANMAKU_FONT_SIZE), "--lane-size", str(DANMAKU_FONT_SIZE), "--width", _w, "--height", _h,
         "-o", new_subtitle_name, "-p", "1", "--time-offset", str(time_shift), "--width-ratio", "1", file
     ))

workflow/video.py

@@ -3,7 +3,7 @@ import subprocess
 from datetime import datetime, timedelta
 from typing import IO
 
-from config import FFMPEG_EXEC, FFMPEG_USE_HEVC, VIDEO_BITRATE, FFMPEG_USE_NVIDIA_GPU, VIDEO_CLIP_EACH_SEC, \
+from config import FFMPEG_EXEC, FFMPEG_USE_HEVC, VIDEO_CRF, FFMPEG_USE_NVIDIA_GPU, VIDEO_CLIP_EACH_SEC, \
     VIDEO_CLIP_OVERFLOW_SEC, \
     FFMPEG_USE_INTEL_GPU, VIDEO_OUTPUT_DIR, VIDEO_GOP, FFMPEG_USE_VAAPI
 from . import LOGGER
@@ -56,7 +56,7 @@ def get_encode_process_use_nvenc(orig_filename: str, subtitles: list[str], new_f
         FFMPEG_EXEC, *_common_ffmpeg_setting(),
         "-i", orig_filename, "-vf",
         ",".join("subtitles=%s" % i for i in subtitles) + ",hwupload_cuda",
-        "-c:v", "h264_nvenc",
+        "-c:v", "h264_nvenc", "-preset:v", "p7",
         *_common_ffmpeg_params(),
         # "-t", "10",
         new_filename
@@ -112,8 +112,8 @@ def get_encode_hevc_process_use_nvenc(orig_filename: str, subtitles: list[str],
     encode_process = subprocess.Popen([
         FFMPEG_EXEC, *_common_ffmpeg_setting(),
         "-i", orig_filename, "-vf",
-        "".join("subtitles=%s," % i for i in subtitles) + ",hwupload_cuda",
+        "".join("subtitles=%s," % i for i in subtitles) + "hwupload_cuda",
-        "-c:v", "hevc_nvenc",
+        "-c:v", "hevc_nvenc", "-preset:v", "p7",
         *_common_ffmpeg_params(),
         # "-t", "10",
         new_filename
@@ -237,8 +237,8 @@ def _common_ffmpeg_setting():
 
 def _common_ffmpeg_params():
     return (
-        "-f", "mp4", "-b:v", VIDEO_BITRATE, "-c:a", "aac",
+        "-vsync", "1", "-async", "1", "-avoid_negative_ts", "1",
-        "-preset:v", "fast", "-profile:v", "main", "-avoid_negative_ts", "1",
+        "-f", "mp4", "-c:a", "aac",
-        "-qmin", "18", "-qmax", "38", "-g:v", str(VIDEO_GOP),
+        "-crf", str(VIDEO_CRF), "-g:v", str(VIDEO_GOP),
         "-fflags", "+genpts", "-shortest"
     )