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

fix missing filler when playlist is to short

Browse Source
This commit is contained in:
jb-alvarado 2019-11-01 11:16:10 +01:00
parent 31b08d186d
commit 87492726ca
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ffplayout.py
View File

@ -845,6 +845,10 @@ def build_filtergraph(first, duration, seek, out, ad, ad_last, ad_next, dummy,
audio_chain += add_audio(probe, out - seek) audio_chain += add_audio(probe, out - seek)
if not audio_chain:
audio_chain.append('[0:a]anull')
audio_chain += extend_audio(probe, out - seek)
if video_chain: if video_chain:
video_filter = '{}[v]'.format(','.join(video_chain)) video_filter = '{}[v]'.format(','.join(video_chain))
else: else:
@ -855,12 +859,9 @@ def build_filtergraph(first, duration, seek, out, ad, ad_last, ad_next, dummy,
'-filter_complex', '[0:v]{};{}'.format( '-filter_complex', '[0:v]{};{}'.format(
video_filter, logo_filter)] video_filter, logo_filter)]
if not audio_chain: if audio_chain:
audio_chain.append('[0:a]anull')
audio_chain += extend_audio(probe, out - seek)
audio_chain += fade_filter(first, duration, seek, out, 'a') audio_chain += fade_filter(first, duration, seek, out, 'a')
if audio_chain:
audio_filter = [ audio_filter = [
'-filter_complex', '{}[a]'.format(','.join(audio_chain))] '-filter_complex', '{}[a]'.format(','.join(audio_chain))]
audio_map = ['-map', '[a]'] audio_map = ['-map', '[a]']
@ -1215,7 +1216,7 @@ class GetSourceIter(object):
if filler: if filler:
self.src_cmd = gen_filler_loop(self.duration) self.src_cmd = gen_filler_loop(self.duration)
if _storage.filler: if _storage.filler and os.path.isfile(_storage.filler):
self.is_dummy = False self.is_dummy = False
self.duration += 1 self.duration += 1
else: else: