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

revert loop filter, change fps filter

Browse Source
This commit is contained in:
Jonathan Baecker 2019-12-02 16:41:26 +01:00
parent ccb0ea920b
commit 1fde52c2b4
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ffplayout.py
View File

@ -1031,7 +1031,7 @@ def fps_filter(probe):
filter_chain = []
if probe.video[0]['fps'] != _pre_comp.fps:
filter_chain.append('framerate=fps={}'.format(_pre_comp.fps))
filter_chain.append('fps={}'.format(_pre_comp.fps))
return filter_chain
@ -1082,14 +1082,16 @@ def overlay_filter(duration, ad, ad_last, ad_next):
logo_chain = []
opacity = 'format=rgba,colorchannelmixer=aa={}'.format(
_pre_comp.opacity)
logo_chain.append('movie={},{}'.format(_pre_comp.logo, opacity))
loop = 'loop=loop=-1:size=1:start=0'
logo_chain.append(
'movie={},{},{}'.format(_pre_comp.logo, loop, opacity))
if ad_last:
logo_chain.append('fade=in:st=0:d=1.0:alpha=1')
if ad_next:
logo_chain.append('fade=out:st={}:d=1.0:alpha=1'.format(
duration - 1))
logo_filter = '{}[l];[v][l]{}[logo]'.format(
logo_filter = '{}[l];[v][l]{}:shortest=1[logo]'.format(
','.join(logo_chain), _pre_comp.logo_filter)
return logo_filter
@ -1654,7 +1656,6 @@ def main():
while True:
buf = _ff.decoder.stdout.read(COPY_BUFSIZE)
if not buf:
messenger.debug('Buffer is empty')
break
_ff.encoder.stdin.write(buf)