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

less import

Browse Source
This commit is contained in:
jb-alvarado 2020-02-03 20:49:55 +01:00
parent 3516ac3858
commit 1a4b3a5302
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ffplayout.py
View File

@ -24,9 +24,7 @@ from threading import Thread
from ffplayout.folder import GetSourceFromFolder, MediaStore, MediaWatcher from ffplayout.folder import GetSourceFromFolder, MediaStore, MediaWatcher
from ffplayout.playlist import GetSourceFromPlaylist from ffplayout.playlist import GetSourceFromPlaylist
from ffplayout.utils import (COPY_BUFSIZE, DEC_PREFIX, ENC_PREFIX, _ff, _log, from ffplayout.utils import (_ff, _log, _playlist, _playout, _pre_comp, _text,
_playlist, _playout, _pre_comp, _text,
decoder_logger, encoder_logger,
ffmpeg_stderr_reader, get_date, messenger, ffmpeg_stderr_reader, get_date, messenger,
pre_audio_codec, stdin_args, terminate_processes) pre_audio_codec, stdin_args, terminate_processes)
@ -37,6 +35,9 @@ try:
except ImportError: except ImportError:
print('colorama import failed, no colored console output on windows...') print('colorama import failed, no colored console output on windows...')
_WINDOWS = os.name == 'nt'
COPY_BUFSIZE = 1024 * 1024 if _WINDOWS else 64 * 1024
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
# main functions # main functions
@ -86,8 +87,7 @@ def main():
stdin=PIPE, stderr=PIPE) stdin=PIPE, stderr=PIPE)
enc_err_thread = Thread(target=ffmpeg_stderr_reader, enc_err_thread = Thread(target=ffmpeg_stderr_reader,
args=(_ff.encoder.stderr, encoder_logger, args=(_ff.encoder.stderr, False))
ENC_PREFIX))
enc_err_thread.daemon = True enc_err_thread.daemon = True
enc_err_thread.start() enc_err_thread.start()
@ -116,9 +116,7 @@ def main():
stdout=PIPE, stderr=PIPE) as _ff.decoder: stdout=PIPE, stderr=PIPE) as _ff.decoder:
dec_err_thread = Thread(target=ffmpeg_stderr_reader, dec_err_thread = Thread(target=ffmpeg_stderr_reader,
args=(_ff.decoder.stderr, args=(_ff.decoder.stderr, True))
decoder_logger,
DEC_PREFIX))
dec_err_thread.daemon = True dec_err_thread.daemon = True
dec_err_thread.start() dec_err_thread.start()

12
ffplayout/utils.py
View File

@ -123,9 +123,6 @@ _playout = SimpleNamespace()
_init = SimpleNamespace(load=True) _init = SimpleNamespace(load=True)
_ff = SimpleNamespace(decoder=None, encoder=None) _ff = SimpleNamespace(decoder=None, encoder=None)
_WINDOWS = os.name == 'nt'
COPY_BUFSIZE = 1024 * 1024 if _WINDOWS else 64 * 1024
def str_to_sec(s): def str_to_sec(s):
if s in ['now', '', None, 'none']: if s in ['now', '', None, 'none']:
@ -590,7 +587,14 @@ def terminate_processes(watcher=None):
watcher.stop() watcher.stop()
def ffmpeg_stderr_reader(std_errors, logger, prefix): def ffmpeg_stderr_reader(std_errors, decoder):
if decoder:
logger = decoder_logger
prefix = DEC_PREFIX
else:
logger = encoder_logger
prefix = ENC_PREFIX
try: try:
for line in std_errors: for line in std_errors:
if _log.ff_level == 'INFO': if _log.ff_level == 'INFO':