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

read exact size, change back to constant bitrate

Browse Source
This commit is contained in:
Jonathan Baecker 2019-05-28 09:58:34 +02:00
parent eef7507916
commit 13798768cd
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ffplayout.conf
View File

@ -62,6 +62,7 @@ log_level = INFO
width = 1024 width = 1024
height = 576 height = 576
fps = 25 fps = 25
v_bitrate = 50000
logo = logo.png logo = logo.png
logo_filter = overlay=W-w-12:12 logo_filter = overlay=W-w-12:12
live_protocols = ["http", "https", "ftp", "rtmp", "rtmpe", "rtmps", "rtp", "rtsp", "srt", "tcp", "udp"] live_protocols = ["http", "https", "ftp", "rtmp", "rtmpe", "rtmps", "rtp", "rtsp", "srt", "tcp", "udp"]

11
ffplayout.py
View File

@ -76,6 +76,8 @@ _pre_comp = SimpleNamespace(
aspect=cfg.getfloat( aspect=cfg.getfloat(
'PRE_COMPRESS', 'width') / cfg.getfloat('PRE_COMPRESS', 'height'), '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_bufsize=cfg.getint('PRE_COMPRESS', 'v_bitrate') / 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'),
@ -885,7 +887,11 @@ def play_clips(buffer, GetSourceIter):
else: else:
ff_pre_settings = filtergraph + [ ff_pre_settings = filtergraph + [
'-pix_fmt', 'yuv420p', '-r', str(_pre_comp.fps), '-pix_fmt', 'yuv420p', '-r', str(_pre_comp.fps),
'-c:v', 'mpeg2video', '-intra', '-q:v', '2', '-c:v', 'mpeg2video', '-intra',
'-b:v', '{}k'.format(_pre_comp.v_bitrate),
'-minrate', '{}k'.format(_pre_comp.v_bitrate),
'-maxrate', '{}k'.format(_pre_comp.v_bitrate),
'-bufsize', '{}k'.format(_pre_comp.v_bufsize),
'-c:a', 's302m', '-strict', '-2', '-ar', '48000', '-ac', '2', '-c:a', 's302m', '-strict', '-2', '-ar', '48000', '-ac', '2',
'-threads', '2', '-f', 'mpegts', '-' '-threads', '2', '-f', 'mpegts', '-'
] ]
@ -905,7 +911,8 @@ def play_clips(buffer, GetSourceIter):
stdout=PIPE stdout=PIPE
) )
for data in iter(decoder.stdout.readline, ''): while True:
data = decoder.stdout.read(188)
if not data: if not data:
break break