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

hard coded buffer length -> less confusion for the user

Browse Source
This commit is contained in:
jb-alvarado 2019-05-26 20:59:01 +02:00
parent 9ec831a0af
commit c5f8ebc7a7
2 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ffplayout.conf
View File

@ -102,28 +102,16 @@ day_start = 06:00:00.000
time_shift = 35 time_shift = 35
map_extension = map_extension =
# buffer settings # buffer settings
# this is a system processs witch run between pre-compression # this is a system processs witch run between pre-compression
# and final compression, this makes the magic to playout multiple files # and final compression, this makes the magic to playout multiple files
# without interrupt the stream # without interrupt the stream
# buffer_length: length in seconds of the buffer
# this is the time what the playout have, to change from one clip to the next
# be liberal with this value but dont exaggerate
# # buffer size gets calculate with: (v_bitrate * 0.125 + 281.25) * buffer_length
# by rawvideo calculation would be:
# (width x height * 3 / 2 * fps * buffer_length / 1024) + ((a_sample * 16 * 2 * buffer_length) / 8 / 1024)
# Size is in KB
# buffer_tolerance: ffmpeg holds material to in buffer, for this is the tolerance value
# a 1024x576 stream have around 2.5 seconds extra in buffer
# buffer_cli: the prefert buffer tool, needs to be installed on your system # buffer_cli: the prefert buffer tool, needs to be installed on your system
# buffer_cmd: need to end with the buffer size command, full command would look: # buffer_cmd: need to end with the buffer size command, full command would look:
# /usr/bin/pv -q -B; or: /usr/bin/mbuffer -q -c -m; or pipebuffer -s # /usr/bin/pv -q -B; or: /usr/bin/mbuffer -q -c -m; or pipebuffer -s
[BUFFER] [BUFFER]
buffer_length = 5
buffer_tolerance = 2.5
buffer_cli = /usr/local/bin/pipebuffer buffer_cli = /usr/local/bin/pipebuffer
buffer_cmd = ["-s"] buffer_cmd = ["-s"]

20
ffplayout.py
View File

@ -99,8 +99,6 @@ _playlist.start = float(_playlist.t[0]) * 3600 + float(_playlist.t[1]) * 60 \
+ float(_playlist.t[2]) + float(_playlist.t[2])
_buffer = SimpleNamespace( _buffer = SimpleNamespace(
length=cfg.getint('BUFFER', 'buffer_length'),
tol=cfg.getfloat('BUFFER', 'buffer_tolerance'),
cli=cfg.get('BUFFER', 'buffer_cli'), cli=cfg.get('BUFFER', 'buffer_cli'),
cmd=literal_eval(cfg.get('BUFFER', 'buffer_cmd')) cmd=literal_eval(cfg.get('BUFFER', 'buffer_cmd'))
) )
@ -317,12 +315,13 @@ def calc_buffer_size():
logger.debug('File for calculating buffer size not exist') logger.debug('File for calculating buffer size not exist')
bite_rate = 1300 bite_rate = 1300
return int(bite_rate * 0.125 * _buffer.length) return int(bite_rate * 0.125 * 5)
else: else:
logger.debug('Playist for calculating buffer size not exist') logger.debug('Playist for calculating buffer size not exist')
return 5000 return 5000
else: else:
return int((_pre_comp.v_bitrate * 0.125 + 281.25) * _buffer.length) # we calculate the buffer size for 5 seconds
return int((_pre_comp.v_bitrate * 0.125 + 281.25) * 5)
# check if processes a well # check if processes a well
@ -351,14 +350,15 @@ def check_sync(begin):
if _pre_comp.copy: if _pre_comp.copy:
tolerance = 80 tolerance = 80
else: else:
tolerance = _buffer.tol # around 2.5 seconds is in ffmpeg buffer
tolerance = 2.5
time_distance = begin - time_now - (_buffer.length + tolerance) time_distance = begin - time_now - (5 + tolerance)
if 0 <= time_now < _playlist.start and not begin == _playlist.start: if 0 <= time_now < _playlist.start and not begin == _playlist.start:
time_distance -= 86400.0 time_distance -= 86400.0
# check that we are in tolerance time # check that we are in tolerance time
if abs(time_distance) > _buffer.length + tolerance: if abs(time_distance) > 5 + tolerance:
mailer.warning( mailer.warning(
'Playlist is not sync!\n{} seconds async'.format(time_distance)) 'Playlist is not sync!\n{} seconds async'.format(time_distance))
logger.warning('Playlist is {} seconds async!'.format(time_distance)) logger.warning('Playlist is {} seconds async!'.format(time_distance))
@ -538,7 +538,7 @@ def gen_input(src, begin, dur, seek, out, last):
time += day_in_sec time += day_in_sec
# calculate time difference to see if we are sync # calculate time difference to see if we are sync
time_diff = _buffer.length + _buffer.tol + out - seek + time time_diff = 7.5 + out - seek + time
if (time_diff <= ref_time or begin < day_in_sec) and not last: if (time_diff <= ref_time or begin < day_in_sec) and not last:
# when we are in the 24 houre range, get the clip # when we are in the 24 houre range, get the clip
@ -546,7 +546,7 @@ def gen_input(src, begin, dur, seek, out, last):
elif time_diff < ref_time and last: elif time_diff < ref_time and last:
# when last clip is passed and we still have too much time left # when last clip is passed and we still have too much time left
# check if duration is larger then out - seek # check if duration is larger then out - seek
time_diff = _buffer.length + _buffer.tol + dur + time time_diff = 7.5 + dur + time
new_len = dur - (time_diff - ref_time) new_len = dur - (time_diff - ref_time)
logger.info('we are under time, new_len is: {}'.format(new_len)) logger.info('we are under time, new_len is: {}'.format(new_len))
@ -827,7 +827,7 @@ class GetSourceIter:
if 0 <= time < _playlist.start: if 0 <= time < _playlist.start:
time += day_in_sec time += day_in_sec
time_diff = _buffer.length + _buffer.tol + self.out - self.seek + time time_diff = 7.5 + self.out - self.seek + time
new_len = self.out - self.seek - (time_diff - ref_time) new_len = self.out - self.seek - (time_diff - ref_time)
if new_len <= 1800: if new_len <= 1800: