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

add apad and tpad (needs ffmpeg 4.2)

Browse Source
This commit is contained in:
jb-alvarado 2019-09-04 21:27:38 +02:00
parent dcba17e5ca
commit f92369336e
1 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
ffplayout.py
View File

@ -739,6 +739,33 @@ def add_audio(probe, duration):
return line return line
def extend_audio(probe, duration):
"""
check audio duration, is it shorter then clip duration - pad it
"""
pad_filter = []
if probe.audio and 'duration' in probe.audio[0] and \
duration > float(probe.audio[0]['duration']) + 0.3:
pad_filter.append('apad=whole_dur={}'.format(duration))
return pad_filter
def extend_video(probe, duration):
"""
check video duration, is is shorter then clip duration - pad it
"""
pad_filter = []
if 'duration' in probe.video[0] and \
duration > float(probe.video[0]['duration']) + 0.3:
pad_filter.append('tpad=stop_mode=add:stop_duration={}'.format(
duration - float(probe.video[0]['duration'])))
return pad_filter
def build_filtergraph(first, duration, seek, out, ad, ad_last, ad_next, dummy, def build_filtergraph(first, duration, seek, out, ad, ad_last, ad_next, dummy,
probe): probe):
""" """
@ -756,6 +783,7 @@ def build_filtergraph(first, duration, seek, out, ad, ad_last, ad_next, dummy,
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, out - seek)
video_chain += fade_filter(first, duration, seek, out) video_chain += fade_filter(first, duration, seek, out)
audio_chain += add_audio(probe, out - seek) audio_chain += add_audio(probe, out - seek)
@ -772,6 +800,7 @@ def build_filtergraph(first, duration, seek, out, ad, ad_last, ad_next, dummy,
if not audio_chain: if not audio_chain:
audio_chain.append('[0:a]anull') 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: if audio_chain:
@ -901,8 +930,8 @@ class GetSource:
self.last_played.append(clip) self.last_played.append(clip)
self.probe.load(clip) self.probe.load(clip)
filtergraph = build_filtergraph( filtergraph = build_filtergraph(
False, float(self.probe.video[0]['duration']), 0.0, False, float(self.probe.format['duration']), 0.0,
float(self.probe.video[0]['duration']), False, False, float(self.probe.format['duration']), False, False,
False, False, self.probe) False, False, self.probe)
yield ['-i', clip] + filtergraph yield ['-i', clip] + filtergraph
@ -911,8 +940,8 @@ class GetSource:
while self.index < len(self._media.store): while self.index < len(self._media.store):
self.probe.load(self._media.store[self.index]) self.probe.load(self._media.store[self.index])
filtergraph = build_filtergraph( filtergraph = build_filtergraph(
False, float(self.probe.video[0]['duration']), 0.0, False, float(self.probe.format['duration']), 0.0,
float(self.probe.video[0]['duration']), False, False, float(self.probe.format['duration']), False, False,
False, False, self.probe) False, False, self.probe)
yield [ yield [