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

pass duration and out again to filter builder

Browse Source
This commit is contained in:
jb-alvarado 2021-02-06 21:14:15 +01:00
parent 1b5fa2d8b8
commit 927d3711b2
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ffplayout/filters/default.py
View File

@ -118,7 +118,7 @@ def fade_filter(duration, seek, out, track=''):
if seek > 0.0:
filter_chain.append(f'{track}fade=in:st=0:d=0.5')
if out != duration and out > seek - 1.0:
if out != duration:
filter_chain.append(f'{track}fade=out:st={out - seek - 1.0}:d=1.0')
return filter_chain
@ -257,13 +257,11 @@ def custom_filter(probe, type, node):
return filters
def build_filtergraph(node, node_last, node_next, seek, probe):
def build_filtergraph(node, node_last, node_next, duration, seek, out, probe):
"""
build final filter graph, with video and audio chain
"""
duration = get_float(node.get('duration'), 20)
out = get_float(node.get('out'), duration)
ad = is_advertisement(node)
ad_last = is_advertisement(node_last)
ad_next = is_advertisement(node_next)

3
ffplayout/playlist.py
View File

@ -84,7 +84,8 @@ class GetSourceFromPlaylist:
def set_filtergraph(self):
self.filtergraph = build_filtergraph(
self.node, self.node_last, self.node_next, self.seek, self.probe)
self.node, self.node_last, self.node_next,
self.duration, self.seek, self.out, self.probe)
def check_for_next_playlist(self):
if not self.next_playlist: