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

fix overlay in copy mode, calculation pre bitrate, cleanup

Browse Source
This commit is contained in:
jb-alvarado 2019-08-09 17:31:39 +02:00
parent be5e373fd1
commit d619cd3c8b
1 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ffplayout.py
View File

@ -75,18 +75,16 @@ _log = SimpleNamespace(
) )
_pre_comp = SimpleNamespace( _pre_comp = SimpleNamespace(
copy=cfg.getboolean('PRE_COMPRESS', 'copy_mode'),
w=cfg.getint('PRE_COMPRESS', 'width'), w=cfg.getint('PRE_COMPRESS', 'width'),
h=cfg.getint('PRE_COMPRESS', 'height'), h=cfg.getint('PRE_COMPRESS', 'height'),
aspect=cfg.getfloat( aspect=cfg.getfloat('PRE_COMPRESS', 'aspect'),
'PRE_COMPRESS', 'width') / cfg.getfloat('PRE_COMPRESS', 'height'),
fps=cfg.getint('PRE_COMPRESS', 'fps'), fps=cfg.getint('PRE_COMPRESS', 'fps'),
v_bitrate=cfg.getint('PRE_COMPRESS', 'v_bitrate'), v_bitrate=cfg.getint('PRE_COMPRESS', 'width') * 50,
v_bufsize=cfg.getint('PRE_COMPRESS', 'v_bitrate') / 2, v_bufsize=cfg.getint('PRE_COMPRESS', 'width') * 50 / 2,
logo=cfg.get('PRE_COMPRESS', 'logo'), logo=cfg.get('PRE_COMPRESS', 'logo'),
logo_filter=cfg.get('PRE_COMPRESS', 'logo_filter'), logo_filter=cfg.get('PRE_COMPRESS', 'logo_filter'),
protocols=cfg.get('PRE_COMPRESS', 'live_protocols'), protocols=cfg.get('PRE_COMPRESS', 'live_protocols')
copy=cfg.getboolean('PRE_COMPRESS', 'copy_mode'),
copy_settings=json.loads(cfg.get('PRE_COMPRESS', 'ffmpeg_copy_settings'))
) )
stime = cfg.get('PLAYLIST', 'day_start').split(':') stime = cfg.get('PLAYLIST', 'day_start').split(':')
@ -351,13 +349,8 @@ def check_length(json_nodes, total_play_time):
timedelta(seconds=total_play_time))) timedelta(seconds=total_play_time)))
# validate json values in new Thread # validate json values in new thread
# and test if file path exist # and test if source paths exist
# TODO: we need better and unique validation,
# now it is messy - the file get readed twice
# and values get multiple time evaluate
# IDEA: open one time the playlist,
# not in a thread and build from it a new clean dictionary
def validate_thread(clip_nodes): def validate_thread(clip_nodes):
def check_json(json_nodes): def check_json(json_nodes):
error = '' error = ''
@ -564,6 +557,7 @@ def gen_input(has_begin, src, begin, dur, seek, out, last):
# blend logo and fade in / fade out # blend logo and fade in / fade out
# TODO: simple deinterlace, pad and fps conversion, if is necessary
def build_filtergraph(first, duration, seek, out, ad, ad_last, ad_next, dummy): def build_filtergraph(first, duration, seek, out, ad, ad_last, ad_next, dummy):
length = out - seek - 1.0 length = out - seek - 1.0
logo_chain = [] logo_chain = []
@ -1043,9 +1037,10 @@ class GetSourceIter(object):
def main(): def main():
year = get_date(False).split('-')[0] year = get_date(False).split('-')[0]
overlay = []
if _pre_comp.copy: if _pre_comp.copy:
ff_pre_settings = _pre_comp.copy_settings ff_pre_settings = ["-c", "copy", "-f", "mpegts", "-"]
else: else:
ff_pre_settings = [ ff_pre_settings = [
'-pix_fmt', 'yuv420p', '-r', str(_pre_comp.fps), '-pix_fmt', 'yuv420p', '-r', str(_pre_comp.fps),
@ -1068,8 +1063,6 @@ def main():
_text.fontsize, _text.fontcolor, _text.fontfile, _text.fontsize, _text.fontcolor, _text.fontfile,
_text.textfile, _text.x, _text.y) _text.textfile, _text.x, _text.y)
] ]
else:
overlay = []
try: try:
if _playout.preview: if _playout.preview: