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

rewrite gen_input function

Browse Source
This commit is contained in:
Jonathan Baecker 2019-10-29 17:43:51 +01:00
parent 3268fe0b0e
commit a630b6a777
1 changed files with 60 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
ffplayout.py
View File

@ -638,62 +638,71 @@ def gen_input(src, begin, dur, seek, out, last):
check begin and length from clip check begin and length from clip
return clip only if we are in 24 hours time range return clip only if we are in 24 hours time range
""" """
day_in_sec = 86400.0
ref_time = day_in_sec
current_time = get_time('full_sec')
if _playlist.start: if not _playlist.start:
ref_time = day_in_sec + _playlist.start return src_or_dummy(src, dur, seek, out), None
else:
ref_time = 86400.0 + _playlist.start
new_seek = 0
if 0 <= current_time < _playlist.start: if begin + (out - seek) < ref_time:
current_time += day_in_sec if not last:
# calculate time difference to see if we are sync
time_diff = out - seek + current_time
if ((time_diff <= ref_time or begin < day_in_sec) and not last) \
or not _playlist.start:
# when we are in the 24 houre range, get the clip # when we are in the 24 houre range, get the clip
return src_or_dummy(src, dur, seek, out), None return src_or_dummy(src, dur, seek, out), None
elif time_diff < ref_time and last: else:
# when last clip is passed and we still have too much time left # when last clip is reached and we under ref_time,
# check if duration is larger then out - seek # check if out/duration is long enough
time_diff = dur + current_time if out >= dur and begin + out > ref_time:
new_len = dur - (time_diff - ref_time) new_len = begin + out - ref_time
elif begin + dur > ref_time:
new_len = begin + dur - ref_time
else:
missing_secs = abs(begin + out - ref_time)
messenger.error(
'Playlist is not long enough:'
'\n{0:.2f} seconds needed.'.format(missing_secs))
src_cmd = src_or_dummy(src, dur, 0, dur)
return src_cmd, missing_secs
if time_diff >= ref_time:
messenger.info('we are under time, new_len is: {0:.2f}'.format( messenger.info('we are under time, new_len is: {0:.2f}'.format(
new_len)) new_len))
src_cmd = src_or_dummy(src, dur, 0, new_len)
else:
src_cmd = src_or_dummy(src, dur, 0, dur)
messenger.error( if seek > 0:
'Playlist is not long enough:\n{0:.2f} seconds needed.'.format( new_seek = out - new_len
new_len)) new_len = out
return src_cmd, new_len - dur src_cmd = src_or_dummy(src, dur, new_seek, new_len)
return src_cmd, 0.0
elif time_diff > ref_time: elif begin > ref_time:
new_len = out - seek - (time_diff - ref_time) messenger.info(
'start time is over 24 hours, skip clip:\n{}'.format(src))
return None, 0.0
elif begin + (out - seek) > ref_time:
# when we over the 24 hours range, trim clip # when we over the 24 hours range, trim clip
messenger.info('we are over time, new_len is: {0:.2f}'.format(new_len)) new_len = begin + (out - seek) - ref_time
# When calculated length from last clip is longer then 5 seconds, # When calculated length from last clip is longer then 5 seconds,
# we use the clip. When the length is less then 5 and bigger then 1 # we use the clip. When the length is less then 5 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_len > 5.0: if new_len > 5.0:
messenger.info(
'we are over time, new_len is: {0:.2f}'.format(new_len))
new_seek = 0 new_seek = 0
if seek > 0: if seek > 0:
new_len = out
new_seek = out - new_len new_seek = out - new_len
new_len = out
src_cmd = src_or_dummy(src, dur, new_seek, new_len) src_cmd = src_or_dummy(src, dur, new_seek, new_len)
elif new_len > 1.0: elif new_len > 1.0:
src_cmd = gen_dummy(new_len) src_cmd = gen_dummy(new_len)
else: else:
messenger.info(
'last clip less then a second long, skip:\n{}'.format(src))
src_cmd = None src_cmd = None
return src_cmd, 0.0 return src_cmd, 0.0