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

fix long length calc

Browse Source
This commit is contained in:
Jonathan Baecker 2019-11-05 09:40:27 +01:00
parent 07f2eea5eb
commit 95f768064c
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ffplayout.py
View File

@ -777,22 +777,23 @@ def gen_input(src, begin, dur, seek, out, first, last):
return None, 0, 0, True return None, 0, 0, True
elif begin + out + time_delta > ref_time or last: elif begin + out + time_delta > ref_time or last:
new_out = ref_time - (begin + time_delta) new_length = ref_time - (begin + time_delta)
new_out = out
if seek > 0:
new_out = seek + new_length
# prevent looping # prevent looping
if new_out > dur: if new_out > dur:
new_out = dur new_out = dur
new_length = new_out - seek
messenger.info( messenger.info(
'We are over time, new length is: {0:.2f}'.format(new_length)) 'We are over time, new length is: {0:.2f}'.format(new_length))
# When calculated length from clip is longer then 4 seconds, # When calculated length from clip is longer then 3 seconds,
# we use the clip. When the length is less then 4 and bigger then 1 # we use the clip. When the length is less then 3 and bigger then 1
# second we generate a black clip and when is less the a seconds # second we generate a black clip and when is less the a seconds
# we skip the clip. # we skip the clip.
if new_length > 4.0: if new_length > 3.0:
src_cmd = src_or_dummy(src, dur, seek, new_out) src_cmd = src_or_dummy(src, dur, seek, new_out)
elif new_length > 1.0: elif new_length > 1.0:
src_cmd = gen_dummy(new_length) src_cmd = gen_dummy(new_length)
@ -801,7 +802,7 @@ def gen_input(src, begin, dur, seek, out, first, last):
'Last clip less then a second long, skip:\n{}'.format(src)) 'Last clip less then a second long, skip:\n{}'.format(src))
src_cmd = None src_cmd = None
else: else:
missing_secs = abs(ref_time - new_length) missing_secs = abs(new_length - dur)
messenger.error( messenger.error(
'Playlist is not long enough:' 'Playlist is not long enough:'
'\n{0:.2f} seconds needed.'.format(missing_secs)) '\n{0:.2f} seconds needed.'.format(missing_secs))