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

add some informations, remove function variable

Browse Source
This commit is contained in:
jb_alvarado 2018-02-04 13:41:33 +01:00
parent b1f778b152
commit f0eb75fda5
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ffplayout.py
View File

@ -272,7 +272,7 @@ def prepare_input(src, duration, seek, out):
# last clip can be a filler # last clip can be a filler
# so we get the IN point and calculate the new duration # so we get the IN point and calculate the new duration
# if the new duration is smaller then 6 sec put a blank clip # if the new duration is smaller then 6 sec put a blank clip
def prepare_last_clip(in_node, start): def prepare_last_clip(in_node):
src = in_node.get('src') src = in_node.get('src')
duration = float(in_node.get('dur')) duration = float(in_node.get('dur'))
seek = float(in_node.get('in')) seek = float(in_node.get('in'))
@ -317,6 +317,7 @@ def iter_src_commands():
xml_root = ET.parse(open(xml_path, "r")).getroot() xml_root = ET.parse(open(xml_path, "r")).getroot()
clip_nodes = xml_root.findall('body/video') clip_nodes = xml_root.findall('body/video')
last_mod_time = mod_time last_mod_time = mod_time
logger.info('open: ' + xml_path)
# all clips in playlist except last one # all clips in playlist except last one
for clip_node in clip_nodes[:-1]: for clip_node in clip_nodes[:-1]:
@ -343,20 +344,23 @@ def iter_src_commands():
src_cmd = prepare_input(src, duration, seek, out) src_cmd = prepare_input(src, duration, seek, out)
last_time = begin last_time = begin
break break
# last clip in playlist
else: else:
begin = float(_playlist.start * 3600 - 5) # last clip in playlist
src_cmd = prepare_last_clip( src_cmd = prepare_last_clip(clip_nodes[-1])
clip_nodes[-1], begin
)
last_time = begin last_time = begin
list_date = get_date(True) list_date = get_date(True)
last_mod_time = 0.00 last_mod_time = 0.00
else: else:
# when we have no playlist for the current day,
# then we generate a black clip
# and calculate the seek in time, for when the playlist comes back
src_cmd = gen_dummy(300) src_cmd = gen_dummy(300)
last_time += 300 last_time += 300
last_mod_time = 0.00 last_mod_time = 0.00
# there is still material in the buffer,
# so we have to calculate the right seek time for the new playlist
# time_diff: is the real time what we have in buffer
if last_time > 86400: if last_time > 86400:
time_val = last_time - 86400 time_val = last_time - 86400
else: else: