支持透明度调整
This commit is contained in:
parent
82b40e3b5d
commit
9d7f54d1dc
2
.gitignore
vendored
2
.gitignore
vendored
@ -11,3 +11,5 @@ venv
|
|||||||
build/
|
build/
|
||||||
dist/
|
dist/
|
||||||
access_token
|
access_token
|
||||||
|
winsw.*
|
||||||
|
*.json
|
@ -17,6 +17,8 @@ DANMAKU_FONT_NAME = "Sarasa Term SC"
|
|||||||
DANMAKU_FONT_SIZE = 40
|
DANMAKU_FONT_SIZE = 40
|
||||||
# resolution
|
# resolution
|
||||||
VIDEO_RESOLUTION = "1280x720"
|
VIDEO_RESOLUTION = "1280x720"
|
||||||
|
# opacity
|
||||||
|
DANMAKU_OPACITY = 100
|
||||||
# [ffmpeg]
|
# [ffmpeg]
|
||||||
# exec
|
# exec
|
||||||
FFMPEG_EXEC = "ffmpeg"
|
FFMPEG_EXEC = "ffmpeg"
|
||||||
@ -68,13 +70,14 @@ def load_config():
|
|||||||
if config.has_section("danmaku"):
|
if config.has_section("danmaku"):
|
||||||
section = config['danmaku']
|
section = config['danmaku']
|
||||||
global DANMAKU_EXEC, DANMAKU_SPEED, DANMAKU_FONT_NAME, VIDEO_RESOLUTION, DANMAKU_FONT_SIZE, \
|
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_DANMU2ASS = section.getboolean('use_danmu2ass', DANMAKU_USE_DANMU2ASS)
|
||||||
DANMAKU_USE_DANMAKUFACTORY = section.getboolean('use_danmakufactory', DANMAKU_USE_DANMAKUFACTORY)
|
DANMAKU_USE_DANMAKUFACTORY = section.getboolean('use_danmakufactory', DANMAKU_USE_DANMAKUFACTORY)
|
||||||
DANMAKU_EXEC = section.get('exec', DANMAKU_EXEC)
|
DANMAKU_EXEC = section.get('exec', DANMAKU_EXEC)
|
||||||
DANMAKU_SPEED = section.getfloat('speed', DANMAKU_SPEED)
|
DANMAKU_SPEED = section.getfloat('speed', DANMAKU_SPEED)
|
||||||
DANMAKU_FONT_NAME = section.get('font', DANMAKU_FONT_NAME)
|
DANMAKU_FONT_NAME = section.get('font', DANMAKU_FONT_NAME)
|
||||||
DANMAKU_FONT_SIZE = section.getint('font_size', DANMAKU_FONT_SIZE)
|
DANMAKU_FONT_SIZE = section.getint('font_size', DANMAKU_FONT_SIZE)
|
||||||
|
DANMAKU_OPACITY = section.getint('opacity', DANMAKU_OPACITY)
|
||||||
VIDEO_RESOLUTION = section.get('resolution', VIDEO_RESOLUTION)
|
VIDEO_RESOLUTION = section.get('resolution', VIDEO_RESOLUTION)
|
||||||
if config.has_section("video"):
|
if config.has_section("video"):
|
||||||
section = config['video']
|
section = config['video']
|
||||||
@ -118,6 +121,7 @@ def get_config():
|
|||||||
'speed': DANMAKU_SPEED,
|
'speed': DANMAKU_SPEED,
|
||||||
'font': DANMAKU_FONT_NAME,
|
'font': DANMAKU_FONT_NAME,
|
||||||
'font_size': DANMAKU_FONT_SIZE,
|
'font_size': DANMAKU_FONT_SIZE,
|
||||||
|
'opacity': DANMAKU_OPACITY,
|
||||||
'resolution': VIDEO_RESOLUTION,
|
'resolution': VIDEO_RESOLUTION,
|
||||||
},
|
},
|
||||||
'video': {
|
'video': {
|
||||||
|
@ -146,6 +146,10 @@
|
|||||||
<td>字体大小</td>
|
<td>字体大小</td>
|
||||||
<td>{{ config.danmaku.font_size }}</td>
|
<td>{{ config.danmaku.font_size }}</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td>不透明度</td>
|
||||||
|
<td>{{ config.danmaku.opacity }}%</td>
|
||||||
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td>视频分辨率</td>
|
<td>视频分辨率</td>
|
||||||
<td>{{ config.danmaku.resolution }}</td>
|
<td>{{ config.danmaku.resolution }}</td>
|
||||||
@ -310,6 +314,7 @@
|
|||||||
speed: 0,
|
speed: 0,
|
||||||
font: "",
|
font: "",
|
||||||
font_size: 0,
|
font_size: 0,
|
||||||
|
font_size: 100,
|
||||||
resolution: "",
|
resolution: "",
|
||||||
},
|
},
|
||||||
video: {
|
video: {
|
||||||
|
@ -8,6 +8,7 @@ from typing import Union
|
|||||||
from bs4 import BeautifulSoup
|
from bs4 import BeautifulSoup
|
||||||
|
|
||||||
from config import DANMAKU_EXEC, VIDEO_RESOLUTION, DANMAKU_SPEED, DANMAKU_FONT_NAME, DANMAKU_FONT_SIZE, \
|
from config import DANMAKU_EXEC, VIDEO_RESOLUTION, DANMAKU_SPEED, DANMAKU_FONT_NAME, DANMAKU_FONT_SIZE, \
|
||||||
|
DANMAKU_OPACITY, \
|
||||||
DANMAKU_USE_DANMU2ASS, DANMAKU_USE_DANMAKUFACTORY
|
DANMAKU_USE_DANMU2ASS, DANMAKU_USE_DANMAKUFACTORY
|
||||||
from exception.danmaku import NoDanmakuException, DanmakuFormatErrorException
|
from exception.danmaku import NoDanmakuException, DanmakuFormatErrorException
|
||||||
from util.file import check_file_exist
|
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",
|
DANMAKU_EXEC, "--ignore-warnings",
|
||||||
"-r", str(VIDEO_RESOLUTION), "-s", str(DANMAKU_SPEED), "-f", "5",
|
"-r", str(VIDEO_RESOLUTION), "-s", str(DANMAKU_SPEED), "-f", "5",
|
||||||
"-S", str(DANMAKU_FONT_SIZE), "-N", str(DANMAKU_FONT_NAME), "--showmsgbox", "FALSE",
|
"-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)
|
"-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):
|
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")
|
(_w, _h) = VIDEO_RESOLUTION.split("x")
|
||||||
return subprocess.Popen((
|
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,
|
"--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
|
"-o", new_subtitle_name, "-p", "1", "--time-offset", str(time_shift), "--width-ratio", "1", file
|
||||||
))
|
))
|
||||||
|
Loading…
x
Reference in New Issue
Block a user