djsundog/ffplayout
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add option to activate text from file

Browse Source
This commit is contained in:
jb-alvarado 2020-12-21 11:17:49 +01:00
parent ae5b998f04
commit 10761e740e
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ffplayout/filters/default.py
View File

@ -256,7 +256,10 @@ def custom_filter(probe, type):
for filter in glob(os.path.join(filter_dir, f'{type}_*')): for filter in glob(os.path.join(filter_dir, f'{type}_*')):
filter = os.path.splitext(os.path.basename(filter))[0] filter = os.path.splitext(os.path.basename(filter))[0]
filter_func = locate(f'ffplayout.filters.{filter}.filter') filter_func = locate(f'ffplayout.filters.{filter}.filter')
filters.append(filter_func(probe)) link = filter_func(probe)
if link is not None:
filters.append(link)
return filters return filters
@ -272,26 +275,30 @@ def build_filtergraph(duration, seek, out, ad, ad_last, ad_next, probe, msg):
seek = 0 seek = 0
if probe.video[0]: if probe.video[0]:
custom_v_filter = custom_filter(probe, 'v')
video_chain += text_filter() video_chain += text_filter()
video_chain += deinterlace_filter(probe) video_chain += deinterlace_filter(probe)
video_chain += pad_filter(probe) video_chain += pad_filter(probe)
video_chain += fps_filter(probe) video_chain += fps_filter(probe)
video_chain += scale_filter(probe) video_chain += scale_filter(probe)
video_chain += extend_video(probe, duration, out - seek) video_chain += extend_video(probe, duration, out - seek)
video_chain += custom_filter(probe, 'v') if custom_v_filter:
video_chain += custom_v_filter
video_chain += fade_filter(duration, seek, out) video_chain += fade_filter(duration, seek, out)
audio_chain += add_audio(probe, out - seek, msg) audio_chain += add_audio(probe, out - seek, msg)
if not audio_chain: if not audio_chain:
custom_a_filter = custom_filter(probe, 'a')
audio_chain.append('[0:a]anull') audio_chain.append('[0:a]anull')
audio_chain += add_loudnorm(probe) audio_chain += add_loudnorm(probe)
audio_chain += extend_audio(probe, out - seek) audio_chain += extend_audio(probe, out - seek)
audio_chain += custom_filter(probe, 'a') if custom_a_filter:
audio_chain += custom_a_filter
audio_chain += fade_filter(duration, seek, out, 'a') audio_chain += fade_filter(duration, seek, out, 'a')
if video_chain: if video_chain:
print(video_chain)
video_filter = '{}[v]'.format(','.join(video_chain)) video_filter = '{}[v]'.format(','.join(video_chain))
else: else:
video_filter = 'null[v]' video_filter = 'null[v]'

3
ffplayout/filters/v_drawtext.py
View File

@ -16,4 +16,5 @@ def filter(probe):
if _text.fontfile and os.path.isfile(_text.fontfile): if _text.fontfile and os.path.isfile(_text.fontfile):
font = f":fontfile='{_text.fontfile}'" font = f":fontfile='{_text.fontfile}'"
return f"drawtext=text='{title}':{_text.style}{font}" if _text.text_from_filename:
return f"drawtext=text='{title}':{_text.style}{font}"

1
ffplayout/utils.py
View File

@ -206,6 +206,7 @@ def load_config():
_text.over_pre = cfg['text']['over_pre'] _text.over_pre = cfg['text']['over_pre']
_text.address = cfg['text']['bind_address'] _text.address = cfg['text']['bind_address']
_text.fontfile = cfg['text']['fontfile'] _text.fontfile = cfg['text']['fontfile']
_text.text_from_filename = cfg['text']['text_from_filename']
_text.style = cfg['text']['style'] _text.style = cfg['text']['style']
_text.regex = cfg['text']['regex'] _text.regex = cfg['text']['regex']