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

use node only

Browse Source
This commit is contained in:
jb-alvarado 2021-02-16 21:36:45 +01:00
parent c4ffdfe35c
commit bd76ebd3c7
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ffplayout/filters/a_volume.py
View File

@ -1,7 +1,7 @@
from ffplayout.utils import get_float, stdin_args from ffplayout.utils import get_float, stdin_args
def filter(probe, node=None): def filter(node):
""" """
set audio volume set audio volume
""" """

19
ffplayout/filters/default.py
View File

@ -241,14 +241,14 @@ def split_filter(filter_type):
return _filter return _filter
def custom_filter(probe, type, node): def custom_filter(type, node):
filter_dir = os.path.dirname(os.path.abspath(__file__)) filter_dir = os.path.dirname(os.path.abspath(__file__))
filters = [] filters = []
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')
link = filter_func(probe, node) link = filter_func(node)
if link is not None: if link is not None:
filters.append(link) filters.append(link)
@ -256,7 +256,7 @@ def custom_filter(probe, type, node):
return filters return filters
def build_filtergraph(node, node_last, node_next, duration, seek, out, probe): def build_filtergraph(node, node_last, node_next):
""" """
build final filter graph, with video and audio chain build final filter graph, with video and audio chain
""" """
@ -265,14 +265,19 @@ def build_filtergraph(node, node_last, node_next, duration, seek, out, probe):
ad_last = is_advertisement(node_last) ad_last = is_advertisement(node_last)
ad_next = is_advertisement(node_next) ad_next = is_advertisement(node_next)
duration = node['duration']
seek = node['seek']
out = node['out']
probe = node['probe']
video_chain = [] video_chain = []
audio_chain = [] audio_chain = []
if out > duration: if out > duration:
seek = 0 seek = 0
if probe.video[0]: if probe and probe.video[0]:
custom_v_filter = custom_filter(probe, 'v', node) custom_v_filter = custom_filter('v', node)
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)
@ -286,7 +291,7 @@ def build_filtergraph(node, node_last, node_next, duration, seek, out, probe):
audio_chain += add_audio(probe, out - seek) audio_chain += add_audio(probe, out - seek)
if not audio_chain: if not audio_chain:
custom_a_filter = custom_filter(probe, 'a', node) custom_a_filter = custom_filter('a', node)
audio_chain.append('[0:a]anull') audio_chain.append('[0:a]anull')
audio_chain += add_loudnorm(probe) audio_chain += add_loudnorm(probe)
@ -314,7 +319,7 @@ def build_filtergraph(node, node_last, node_next, duration, seek, out, probe):
audio_filter = [ audio_filter = [
'-filter_complex', f'{",".join(audio_chain)}{a_speed}{a_split}'] '-filter_complex', f'{",".join(audio_chain)}{a_speed}{a_split}']
if probe.video[0]: if probe and probe.video[0]:
return video_filter + audio_filter + video_map + audio_map return video_filter + audio_filter + video_map + audio_map
else: else:
return video_filter + video_map + ['-map', '1:a'] return video_filter + video_map + ['-map', '1:a']

4
ffplayout/filters/v_drawtext.py
View File

@ -4,12 +4,12 @@ import re
from ffplayout.utils import _text from ffplayout.utils import _text
def filter(probe, node=None): def filter(node):
""" """
extract title from file name and overlay it extract title from file name and overlay it
""" """
font = '' font = ''
source = os.path.basename(probe.src) source = os.path.basename(node.get('source'))
match = re.match(_text.regex, source) match = re.match(_text.regex, source)
title = match[1] if match else source title = match[1] if match else source