exu/configs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow handling more generic content

Browse Source
This commit is contained in:
RealStickman 2022-12-17 17:04:38 +01:00
parent 1b26cb5605
commit 3b1a6a8329
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
easyffmpeg/main.py
View File

@ -106,7 +106,7 @@ parser.add_argument(
parser.add_argument( parser.add_argument(
"-aj", "-aj",
"--audio-japanese", "--audio-japanese",
required=True, required=False,
type=str, type=str,
help="Stream identifier for japanese audio", help="Stream identifier for japanese audio",
) )
@ -120,12 +120,12 @@ parser.add_argument(
# Subtitle stuff # Subtitle stuff
parser.add_argument( parser.add_argument(
"-sn", "--subtitle-name", required=True, type=str, help="Name for subtitles" "-sn", "--subtitle-name", required=False, type=str, help="Name for subtitles"
) )
parser.add_argument( parser.add_argument(
"-si", "-si",
"--subtitle-stream", "--subtitle-stream",
required=True, required=False,
type=str, type=str,
help="Stream identifier for subtitles", help="Stream identifier for subtitles",
) )
@ -183,7 +183,11 @@ else:
outputfile = args.output_file outputfile = args.output_file
japaneseaudio = args.audio_japanese # Map japanese audio, if set
if args.audio_japanese is None:
japaneseaudio = ""
else:
japaneseaudio = "-map " + args.audio_japanese
# Map english audio, if set # Map english audio, if set
if args.audio_english is None: if args.audio_english is None:
@ -191,6 +195,12 @@ if args.audio_english is None:
else: else:
englishaudio = "-map " + args.audio_english englishaudio = "-map " + args.audio_english
# Audiometadata
if args.audio_japanese is None:
audiometa = "-metadata:s:a:0 title='English' -metadata:s:a:0 language=eng"
else:
audiometa = "-metadata:s:a:0 title='Japanese' -metadata:s:a:0 language=jpn -metadata:s:a:1 title='English' -metadata:s:a:1 language=eng"
subtitle = args.subtitle_name subtitle = args.subtitle_name
subtitlestream = args.subtitle_stream subtitlestream = args.subtitle_stream
@ -208,11 +218,11 @@ ff = ffmpy.FFmpeg(
" " " "
"-c:v {videocodec} -crf {crf} {tune} -preset {preset} -map 0:v:0 -metadata:s:v:0 title='Video' -disposition:v:0 default" "-c:v {videocodec} -crf {crf} {tune} -preset {preset} -map 0:v:0 -metadata:s:v:0 title='Video' -disposition:v:0 default"
" " " "
"-c:a {audiocodec} -b:a {audiobitrate} -map {jpnaudiostream}? {engaudiomap}" "-c:a {audiocodec} -b:a {audiobitrate} {jpnaudiomap} {engaudiomap}"
" " " "
"-metadata:s:a:0 title='Japanese' -metadata:s:a:0 language=jpn -metadata:s:a:1 title='English' -metadata:s:a:1 language=eng -disposition:a:0 default" "{audiometa} -disposition:a:0 default"
" " " "
"-c:s copy -map {substream} -metadata:s:s:0 title='{subtitle}' -metadata:s:s:0 language=eng -disposition:s:0 default" "-c:s copy -map {substream}? -metadata:s:s:0 title='{subtitle}' -metadata:s:s:0 language=eng -disposition:s:0 default"
" ".format( " ".format(
title=title, title=title,
videocodec=videocodec, videocodec=videocodec,
@ -221,8 +231,9 @@ ff = ffmpy.FFmpeg(
preset=preset, preset=preset,
audiocodec=audiocodec, audiocodec=audiocodec,
audiobitrate=audiobitrate, audiobitrate=audiobitrate,
jpnaudiostream=japaneseaudio, jpnaudiomap=japaneseaudio,
engaudiomap=englishaudio, engaudiomap=englishaudio,
audiometa=audiometa,
substream=subtitlestream, substream=subtitlestream,
subtitle=subtitle, subtitle=subtitle,
) )